Merge lp:~cjohnston/ubuntu-community-webthemes/960px into lp:ubuntu-community-webthemes/light-django-theme

[Chris Johnston]

Adds 960px css file

[Tarmac WebDev (tarmac-webdev)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Michael Hall (mhall119)]

Adding it to the base template will turn it on for all sites currently using this theme, and require that they specifically deactivate it. This is not the desired behavior. Instead let each site add that line to their own template when they want 960px.

review: Needs Fixing

[lp:~cjohnston/ubuntu-community-webthemes/960px]

39. By Chris Johnston on 2011-07-20

Removes from ubuntu_website_base

=== added file 'media/css/960.css'
--- media/css/960.css	1970-01-01 00:00:00 +0000
+++ media/css/960.css	2011-07-20 21:34:41 +0000
@@ -0,0 +1,42 @@
+/*
+ * 960.css
+ *
+ * Style to allow the option of adding a 960px width to the 
+ * header and the footer of your Ubuntu Themed django app
+ * while maintaining the ability to turn it off on certain
+ * pages.
+ *
+ * To add the 960px to your app, add:
+ * {% block 960css %}<link rel="stylesheet" type="text/css" href="{{ubuntu_website_media}}/css/960.css" />{% endblock %}
+ * to your base.html
+ * 
+ * To turn it off on a particular page, add:
+ * {% block 960css %}{% endblock %}
+ * to the page that you do not want to be 960px.
+ *
+ *  Author: Chris Johnston      ( cjohnston )
+ * 
+ */
+
+aside#top-nav {
+    width:           980px;
+}
+
+header#page-header {
+    width:           960px;
+    margin:          0px auto;
+    padding:         0px 10px;
+    position:        relative;
+}
+
+footer#page-footer {
+    width:           960px;
+    margin:          0px auto;
+    padding:         0px 10px;
+    position:        relative;
+}
+
+#page-footer div.container { 
+    width: 940px; 
+}
+