Commits

Albert O'Connor committed 4820245

update to django 1.3.1 and update the css.

  • Participants
  • Parent commits 9ab6f18

Comments (0)

Files changed (3)

File requirements.txt

-django==1.3
+django==1.3.1
 -e hg+https://amjoconn@bitbucket.org/amjoconn/viscount#egg=viscount
 -e hg+https://amjoconn@bitbucket.org/amjoconn/django-analytics#egg=django-analytics
 -e hg+https://bitbucket.org/ubernostrum/django-contact-form/#egg=django-contact-form

File wlsite/main/static/css/wildernesslabs.css

 div#container {
     background-image: url(../img/bgtext3.png);
     background-repeat: repeat;
-    min-width: 950px;
+    min-width: 1000px;
 }
 
-/*html, body {height: 100%;}
-
-div#container {min-height: 100%;}
-
 div#main {
-        overflow:auto;
-	padding-bottom: 150px;}  
-
-footer {position: relative;
-	margin-top: -150px;
-	height: 150px;
-	clear:both;}*/
+    width: 950px;
+    margin: auto;
+}
 
 a {
     color: #CCC;
 
 header {
     padding-bottom: 1em;
+    width: 950px;
+    margin: auto;
 }
 
 header h1 {
     height: 32px;
     width: 385px;
     margin-bottom: 15px;
-    margin-right: 5em;
+    margin-right: 1em;
     background: #04361e; /*#1D4032;*/
-    position: absolute;
     top: -1px;
     left: 550px;
+    float: right;
     
     -moz-border-radius-bottomleft: 15px;
     -moz-border-radius-bottomright: 15px;
     background-color: #fffbe7; /*#ececec;*/
     color: #666;
     font-weight: bold;
-    position: absolute;
+    float: right;
     font-size: 14pt;
-    left: 695px;
     padding: 1em;
     
     -moz-border-radius: 15px;
 }
 
 article {
-    clear: both;
     margin-left: 25px;
     padding-bottom: 20px;
     
     height: 125px;
 }
 
+footer div#footer_wrap {
+    width: 950px;
+    margin: auto;
+}
+
 footer nav {
     margin-top: 15px;
 }
 }
 
 div.object_list {
-    clear:both;
     margin-bottom: 1em;
 }
 

File wlsite/templates/base.html

 
 {% block title %}Wilderness Labs{% endblock %}
 
+{% block viewport %}
+    <meta name="viewport" content="width=1000">
+{% endblock %}
+
 {% block head_css %}
   <link rel="stylesheet" href="{% get_static_prefix %}css/wildernesslabs.css">
 {% endblock %}
     </a>
     <div class="next">
         Next Event<br/>
-        Nov 11th to 13th, 2011 
+        March 2012 
     </div>
     <div class="social">
         <ul>
                     <a href="http://www.facebook.com/pages/Wilderness-Labs/212712882090464">Facebook</a>
                 </div>
             </li>
-            <li>
-                <img alt="convore" src="{% get_static_prefix %}img/convore.png">
-                <div class="link">
-                    <a href="https://convore.com/wilderness-labs-1/">Convore</a>
-                </div>
-            </li>
         </ul>
     </div>
 </aside>
 
 {% block footer %}
 <div id="footer_content">
+<div id="footer_wrap">
 <h1>Wilderness Labs</h1>
 
 <nav>
 </a>
 </div>
 </div>
+</div>
 {% endblock footer %}