Merge pull request #64 from jmdkastro/master

Made background image static and added preliminary work for footer.
camelot-project · May 16, 2015 · 09dee52 · 09dee52
2 parents 0bc128e + 6832077
commit 09dee52
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 1 deletion.
diff --git a/static/css/theme.css b/static/css/theme.css
@@ -77,3 +77,14 @@ h1{
 	transform: rotate(180deg);
 }
 
+#footer{
+	height: 50px;
+	margin-top: 50px;
+	background: white;
+}
+
+body { 
+    background-image: url('/static/bg.jpg');
+    background-repeat: no-repeat;
+    background-attachment: fixed;
+}
diff --git a/templates/base.html b/templates/base.html
@@ -37,7 +37,7 @@
 		</script>
 		{% endblock %}
 	</head>
-	<body background="/static/bg.jpg">
+	<body>
 		<div class="container" id="menu">
 		{% block body %}
 	<div>

diff --git a/templates/index.html b/templates/index.html
@@ -35,6 +35,7 @@ <h1 class="title">CAMELOT</h1>
 </center>
 </div>
 </div>
+<div id='footer'></div>
 </body>
 {% endblock %}
 

diff --git a/templates/parse_file.html b/templates/parse_file.html
@@ -84,4 +84,5 @@ <h1 class="title">CAMELOT Parse file {{filename}}</h1>
         </form>
     </div>
 </div>
+<div id='footer'></div>
 {% endblock %}
diff --git a/templates/query_form.html b/templates/query_form.html
@@ -77,5 +77,6 @@ <h1 class="title">CAMELOT Query form</h1>
         </form>
     </div>
 </div>
+<div id='footer'></div>
 
 {% endblock %}
diff --git a/templates/show_plot.html b/templates/show_plot.html
@@ -29,6 +29,7 @@ <h1 class="title">CAMELOT Query output</h1>
         </div>
      </div>
      <div id="includedTable"></div>
+    <div id='footer'></div>
   </body>
 </html>
 

diff --git a/templates/upload_form.html b/templates/upload_form.html
@@ -52,4 +52,5 @@ <h1 class="title">CAMELOT Upload form</h1>
         </form>
     </div>
 </div>
+<div id='footer'></div>
 {% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ <h1 class="title">CAMELOT</h1> @@
     </center>
     </div>
     </div>
+    <div id='footer'></div>
     </body>
     {% endblock %}
@@ Expand Down @@