css placement

sirrice · Apr 5, 2012 · 7edaeb0 · 7edaeb0
1 parent 2c5fa0a
commit 7edaeb0
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 23 deletions.
diff --git a/static/css/base.css b/static/css/base.css
@@ -11,6 +11,12 @@ html, body, div, p, table{
 	margin-bottom: 30px;
 }
 
+hr
+{
+	height: 2px;
+	margin: 0;
+}
+
 h1 { font-family: 'Monsieur La Doulaise', cursive; font-size:65px; font-weight:400; line-height: 60px;	margin-bottom:0px;}
 
 h2 { font-family: Quicksand, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight:400; font-size:20px; margin:0px;}

diff --git a/templates/base.html b/templates/base.html
@@ -27,30 +27,35 @@
     <div class="span1">&nbsp;</div>
     <div class="span12">
 
-	<h1>Anonymoose</h1>
-
-	<span style="float:right">
-		{% if not hide_toolbar %}
-			<a href="/moose/">Home</a>
-			{% if user.is_authenticated %}
-				| {% trans "Logged in" %}: {{ user.username }} 
-			{% endif %}
-		{% endif %}
-	</span>
+	<div class="row">
+		<div class="span12">
+			<h1>Anonymoose</h1>
+			<span style="float:right;">
+				{% if not hide_toolbar %}
+					<a href="/moose/">Home</a>
+					{% if user.is_authenticated %}
+						| {% trans "Logged in" %}: {{ user.username }} 
+					{% endif %}
+				{% endif %}
+			</span>
+		</div>
+	</div>
 
 	<hr>
 
-	<span style="float:right">
+	<div class="row" style="text-align:right;">
+		<div class="span12">
 		{% if not hide_toolbar %}
 			{% if user.is_authenticated %}
 				(<a href="{% url auth_logout %}?next=/">{% trans "Log out" %}</a> | 
 				<a href="{% url auth_password_change %}">{% trans "Change password" %}</a>)
 
 			{% endif %}
 		{% endif %}
-	</span>
+		</div>
+	</div>
 
-    <div id="contentold">
+    <div id="contentold" style="padding-top:30px; padding-bottom:30px;">
         {% block content %}{% endblock %}
     </div>
 
@@ -72,11 +77,13 @@ <h1>Anonymoose</h1>
 
 	</div><!--close row-->
 
-    <div id="footer">
-        {% block footer %}
-
-        {% endblock %}
-    </div>
+	<div class="row" style="text-align:right;">
+		<div class="span12">
+		<div id="footer">
+			{% include 'footer.html' %}
+		</div>
+		</div>
+	</div>
 </body>
 
 </html>
diff --git a/templates/dashboard.html b/templates/dashboard.html
@@ -40,6 +40,7 @@ <h2 class="col">Add a question</h2>
 </style>
 
 </div>
+
 <!--
 <div id="left">
 <h2 class="col">Open Questions</h2>

diff --git a/templates/index.html b/templates/index.html
@@ -22,7 +22,9 @@
 
 </script>
 
-<div id="ileft">
+<div class="row">
+
+<div class="span7">
 <h2 class="col">1. Pose a question</h2>
 <p class="inst">
 	one-off: "What do you think of this talk?",
@@ -42,11 +44,9 @@ <h2 class="col">3. Receive anonymous feedback</h2>
 <br/>
 </div>
 
-<div id="imiddle">
-	&nbsp;
-</div>
+<div class="span1">&nbsp;</div>
 
-<div id="iright">
+<div class="span4">
 <h2>Sign in</h2>
 <br/>
 
@@ -70,4 +70,6 @@ <h2>Sign in</h2>
 
 </div>
 
+</div><!--end row-->
+
 {% endblock %}