Merge lp:~sil/summit/redo-mobile-summit into lp:~cjohnston/summit/action-item-links

[Stuart Langridge]

Reapply mobile changes after ubuntu_website theme change.

The "developer summit" header is weird; can't seem to get it to work right. Still, this is an improvement, it's mostly back to where it was.

Test by making your browser narrower than 480px.

Unmerged revisions

329. By Stuart Langridge on 2012-03-23

re-apply mobile changes. developer summit header is still weird; can't fix it

=== modified file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html	2012-03-18 19:53:58 +0000
+++ summit/common/templates/common/index.html	2012-03-23 23:54:19 +0000
@@ -8,7 +8,7 @@
 <style>
 /* Mobile-friendly styles */
 @media screen and (max-width: 481px) {
-    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .minor-content, #page-footer div.container { 
+    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .minor-content, #page-footer div.container, .wrapper, .inner-wrapper { 
         width: auto;
         margin: 0; padding: 0;
     }

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-03-18 15:48:27 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-03-23 23:54:19 +0000
@@ -87,7 +87,7 @@
 @media screen and (max-width: 481px) {
     /* turn off a bunch of stuff */
     nav#top-related, header#page-header, aside#page-related, footer#page-footer { display: none; }
-    section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container { 
+    section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container, .wrapper, .inner-wrapper, .span-9 { 
         width: auto; 
         margin: 0; padding: 0;
     }
@@ -151,6 +151,9 @@
         float: left;
         margin-right: 4px;
     }
+
+    header a.logo-ubuntu img { display: none; }
+
 }
 
 </style>

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-03-23 16:28:03 +0000
+++ summit/schedule/templates/schedule/summit.html	2012-03-23 23:54:19 +0000
@@ -31,17 +31,19 @@
 <style>
 /* Mobile-friendly styles */
 @media screen and (max-width: 481px) {
-    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .double-side-content, #page-footer div.container, #sub-nav-container, .side-content { 
-        width: auto;
+    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .double-side-content, #page-footer div.container, #sub-nav-container, .side-content, .wrapper, .inner-wrapper, .span-9, article { 
+        width: 100%;
         margin: 0; padding: 0;
     }
     #page-header { text-align: center; }
     #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
     #top-logo { display: none; }
-    table.column { width: 100%; }
-    table.column td { display: block; width: 100%; }
+    table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
     table.column td ul {
         width: 100%;
+        margin: 0;
+        padding: 0;
     }
     article.main-content { width: 100%; }
     table.column td ul li {
@@ -55,11 +57,17 @@
         width: 100%;
         display: block;
         padding: 4px 0;
+        margin: 0;
     }
     .double-side-content {
         text-align: center;
     }
     .side-content { display: none; }
+    #fb-root * { width: auto; }
+    header h2 a {
+        max-width: 85px;
+        margin-top: -10px;
+    }
 }
 </style>
 {% endblock %}