summaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
Diffstat (limited to 'static')
-rw-r--r--static/CACHE/.notempty0
-rw-r--r--static/website/css/main.css3
-rwxr-xr-xstatic/website/templates/base.html12
-rwxr-xr-xstatic/website/templates/home.html10
4 files changed, 20 insertions, 5 deletions
diff --git a/static/CACHE/.notempty b/static/CACHE/.notempty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/CACHE/.notempty
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 %}
<!DOCTYPE html>
@@ -8,7 +9,15 @@
<title>SciPy India 2014</title>
<link rel="shortcut icon" type="image/png" href="{% static 'website/images/favicon.ico'%}"/>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+ {% compress css %}
<link rel="stylesheet" href="{% static 'website/css/main.css'%}">
+ <!-- style rules that require relative image paths -->
+ <style>
+ body { background-image: url("{% static 'website/images/ecailles.png' %}"); }
+ #header{ background: url("{% static 'website/images/jumbo_bg.jpg' %}"); }
+ #page-header { background: url("{% static 'website/images/jumbo_bg.jpg' %}"); }
+ </style>
+ {% endcompress %}
{% dajaxice_js_import %}
</head>
<body>
@@ -95,8 +104,9 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="{% static 'dajax/jquery.dajax.core.js' %}"></script>
-<script src="{% static 'website/js/holder.js' %}"></script>
+{% compress js %}
<script src="{% static 'website/js/main.js' %}"></script>
+{% endcompress %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index 6ac8603..132927b 100755
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -1,4 +1,5 @@
{% load static %}
+{% load compress %}
{% load tags %}
<!DOCTYPE html>
<html lang="en">
@@ -7,7 +8,15 @@
<title>SciPy India 2014</title>
<link rel="shortcut icon" type="image/png" href="{% static 'website/images/favicon.ico'%}"/>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+ {% compress css %}
<link rel="stylesheet" href="{% static 'website/css/main.css'%}">
+ <!-- style rules that require relative image paths -->
+ <style>
+ body { background-image: url("{% static 'website/images/ecailles.png' %}"); }
+ #header{ background: url("{% static 'website/images/jumbo_bg.jpg' %}"); }
+ #page-header { background: url("{% static 'website/images/jumbo_bg.jpg' %}"); }
+ </style>
+ {% endcompress %}
</head>
<body>
<div id="page-wrapper">
@@ -246,7 +255,6 @@
</div> <!-- /#social -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-<script src="{% static 'website/js/holder.js' %}"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),