From f7c72433cd6e96c52f1dd2cc87cf9e669b60cec6 Mon Sep 17 00:00:00 2001
From: Jayaram R Pai
Date: Sat, 4 Oct 2014 17:30:23 +0530
Subject: started compressing css/js/html
---
static/website/css/main.css | 3 ---
static/website/templates/base.html | 12 +++++++++++-
static/website/templates/home.html | 10 +++++++++-
3 files changed, 20 insertions(+), 5 deletions(-)
(limited to 'static/website')
diff --git a/static/website/css/main.css b/static/website/css/main.css
index ff89ce4..0840e59 100644
--- a/static/website/css/main.css
+++ b/static/website/css/main.css
@@ -7,7 +7,6 @@
}
body {
background-color: #f3f1ea;
- background-image: url('../images/ecailles.png');
}
#page-wrapper {
max-width: 960px;
@@ -42,7 +41,6 @@ body {
}
#header{
height: 300px;
- background: url("../images/jumbo_bg.jpg");
background-attachment: fixed;
color: #ffffff;
}
@@ -132,7 +130,6 @@ body {
}
#page-header {
height: 100px;
- background: url("../images/jumbo_bg.jpg");
background-attachment: fixed;
color: #ffffff;
}
diff --git a/static/website/templates/base.html b/static/website/templates/base.html
index 9d02164..64febfd 100755
--- a/static/website/templates/base.html
+++ b/static/website/templates/base.html
@@ -1,4 +1,5 @@
{% load static %}
+{% load compress %}
{% load dajaxice_templatetags %}
{% load tags %}
@@ -8,7 +9,15 @@
SciPy India 2014
+ {% compress css %}
+
+
+ {% endcompress %}
{% dajaxice_js_import %}
@@ -95,8 +104,9 @@
-
+{% compress js %}
+{% endcompress %}
-