Merge lp:~cjohnston/summit/mobile-use-summit into lp:summit

[Chris Johnston]

This updates Summit for mobile browsing

[Chris Johnston (cjohnston)]

review: Approve

[Tarmac WebDev (tarmac-webdev)]

The prerequisite lp:~dooferlad/summit/linaro-small-theme has not yet been merged into lp:summit.

[Tarmac WebDev (tarmac-webdev)]

No proposals found for merge of lp:~dooferlad/summit/linaro-small-theme into lp:summit.

=== modified file 'summit/common/templates/base.html'
--- summit/common/templates/base.html	2012-04-22 20:12:19 +0000
+++ summit/common/templates/base.html	2012-04-23 14:24:21 +0000
@@ -37,7 +37,7 @@
     {% menu main_menu %}
     <ul class="clearfix">
     {% for item in menuitems %}
-        <li{% if item.current %} class='active'{% endif %}><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>
+        <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>
     {% endfor %}
     </ul>
 {% endblock %}
@@ -49,11 +49,11 @@
 
 
 {% block messages %}
-	{% if messages %}
-	  {% for message in messages %}
-	    <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
-	  {% endfor %}
-	{% endif %}
+    {% if messages %}
+      {% for message in messages %}
+        <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
+      {% endfor %}
+    {% endif %}
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html	2012-03-31 03:30:20 +0000
+++ summit/common/templates/common/index.html	2012-04-23 14:24:21 +0000
@@ -20,3 +20,16 @@
 </article>
 </div>
 {% endblock %}
+{% block closure %}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 960px) {
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    #fb-root * { width: auto; }
+}
+</style>
+{% endblock %}
+

=== modified file 'summit/media/css/site.css'
--- summit/media/css/site.css	2012-04-22 19:55:59 +0000
+++ summit/media/css/site.css	2012-04-23 14:24:21 +0000
@@ -82,101 +82,6 @@
     font-size: 0.7pc;
 }
 
-
-/* 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 { 
-        width: auto;
-        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; }
-    .minor-content { text-align: center; }
-    .double-side-content {
-        text-align: center;
-    }
-    .side-content { display: none; }
-    #top-login { display: block; }
-    aside#top-nav {
-        display: block;
-        text-align: center;
-        font-size: 16px;
-        min-height: 24px;
-    }
-    .schedule-head > a { display: none; } /* qr code */
-    div.schedule-head .schedule-date { 
-        display: block;
-        overflow: auto;
-        font-size: 16px;
-        text-align: center;
-        margin: 0;
-    }
-    div.schedule-head .schedule-qrcode { display: none; }
-    div.schedule-head .schedule-date a {
-        display: block;
-        float: right;
-        background: #eee;
-        width: 33%;
-        text-align: center;
-    }
-    div.schedule-head .schedule-date a:nth-child(1) {
-        float: left;
-    }
-    table.basic {
-        margin-top: 0;
-        width: 100%;
-    }
-    table.basic span.main-agenda-item-tracks {
-        display: none;
-    }
-    table.column { width: 100%; }
-    table.column td { display: block; width: 100%; }
-    table.column td ul {
-        width: 100%;
-    }
-    article.main-content { width: 100%; }
-    table.column td ul li {
-        background: #efefef;
-        border-bottom: 1px solid black;
-        list-style: none;
-        text-align: center;
-        font-size: 24px;
-        line-height: 24px;
-        min-height: 24px;
-        width: 100%;
-        display: block;
-        padding: 4px 0;
-    }
-    div.agenda-details {
-        background-color: #eee;
-        border-width: 0;
-        color: black;
-        font-size: 1em;
-        position: static;
-        max-width: 100%;
-        min-width: 100%;
-        width: 100%;
-        padding: 5px;
-        margin: 0;
-        border-radius: 0;
-    }
-    div.agenda-details ul {
-        background: #101010;
-        padding-left: 4px;
-    }
-    .main-agenda-item-name {
-        display: block;
-        min-height: 24px;
-    }
-    .main-agenda-item-name img.icon {
-        height: 24px;
-        width: 24px;
-        float: left;
-        margin-right: 4px;
-    }
-}
-
 .row-full-grey {
     margin-left: -20px;
     padding-left: 20px;
@@ -220,3 +125,36 @@
     font-size: 100% !important; /* Override Twitter's inline style */
     float: none;
 }
+
+/* Reset default unordered list display style to remove bulleting/spacing */
+#column-schedule ul {
+    list-style: none;
+}
+/* Stack LI elements horizontally instead of the default vertical orientation */
+#column-schedule li {
+    float: left;
+    margin-right: 1em;
+}
+
+/* Reset default unordered list display style to remove bulleting/spacing */
+#column-schedule-inner ul {
+    list-style: disc;
+    /*border-right: dotted;
+    border-right-width: 1px;*/
+}
+/* Stack LI elements horizontally instead of the default vertical orientation */
+#column-schedule-inner li {
+    float: none;
+    margin-right: 1em;
+    padding: 0em;
+    line-height: 1.5em;
+    margin-bottom: 0px;
+    margin-top: 0px;
+}
+
+/* Social widgets */
+.social-widget {
+    float: left;
+    display: inline-block;
+    margin-right: 2px;
+}

=== modified file 'summit/schedule/templates/schedule/by_room.html'
--- summit/schedule/templates/schedule/by_room.html	2012-04-22 00:39:32 +0000
+++ summit/schedule/templates/schedule/by_room.html	2012-04-23 14:24:21 +0000
@@ -6,10 +6,6 @@
 {% endblock %}
 
 {% block extrahead %}
-
-{% if linaro %}
-    <base target="_blank" />
-{% endif %}
 {{ block.super }}
 {% endblock %}
 
@@ -94,6 +90,45 @@
 </div>
 
 {% block closure %}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 960px) {
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary, .schedule-qrcode { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    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;
+    }
+    table.column td ul li {
+        background: #efefef;
+        border-bottom: 1px solid black;
+        list-style: none;
+        text-align: center;
+        font-size: 24px;
+        line-height: 24px;
+        min-height: 24px;
+        width: 100%;
+        display: block;
+        padding: 4px 0;
+        margin: 0;
+    }
+    #fb-root * { width: auto; }
+    div.schedule-head .schedule-date {
+        font-weight: normal;
+        font-size: 36px;
+        margin: 0;
+        display: block;
+        text-align: center;
+        width: 100%;
+    }
+}
+</style>
 <script language="JavaScript">
 
 function show_agenda_details(agenda_id, index_id) {

=== modified file 'summit/schedule/templates/schedule/by_track.html'
--- summit/schedule/templates/schedule/by_track.html	2012-04-22 00:04:51 +0000
+++ summit/schedule/templates/schedule/by_track.html	2012-04-23 14:24:21 +0000
@@ -86,6 +86,45 @@
 </div>
 
 {% block closure %}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 960px) {
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary, .schedule-qrcode { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    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;
+    }
+    table.column td ul li {
+        background: #efefef;
+        border-bottom: 1px solid black;
+        list-style: none;
+        text-align: center;
+        font-size: 24px;
+        line-height: 24px;
+        min-height: 24px;
+        width: 100%;
+        display: block;
+        padding: 4px 0;
+        margin: 0;
+    }
+    #fb-root * { width: auto; }
+    div.schedule-head .schedule-date {
+        font-weight: normal;
+        font-size: 36px;
+        margin: 0;
+        display: block;
+        text-align: center;
+        width: 100%;
+    }
+}
+</style>
 <script language="JavaScript">
 
 function show_agenda_details(agenda_id, index_id) {

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-04-22 00:39:32 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-04-23 14:24:21 +0000
@@ -108,6 +108,56 @@
 </div>
 
 {% block closure %}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 960px) {
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary, .schedule-qrcode { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    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;
+    }
+    table.column td ul li {
+        background: #efefef;
+        border-bottom: 1px solid black;
+        list-style: none;
+        text-align: center;
+        font-size: 24px;
+        line-height: 24px;
+        min-height: 24px;
+        width: 100%;
+        display: block;
+        padding: 4px 0;
+        margin: 0;
+    }
+    #fb-root * { width: auto; }
+        .schedule-head > a { display: none; } /* qr code */
+    div.schedule-head .schedule-date a:nth-child(1) {
+        float: left;
+    }
+    div.schedule-head .schedule-date {
+        font-weight: normal;
+        font-size: 36px;
+        margin: 0;
+        display: block;
+        text-align: center;
+    }
+    div.schedule-head .schedule-date a {
+        display: block;
+        float: right;
+        background: #eee;
+        width: 25%;
+        text-align: center;
+    }
+}
+</style>
+
 <script language="JavaScript">
 
 function show_agenda_details(agenda_id, index_id) {

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-04-23 14:24:21 +0000
+++ summit/schedule/templates/schedule/summit.html	2012-04-23 14:24:21 +0000
@@ -101,3 +101,28 @@
     </article>    
 </div>
 {% endblock %}
+{% block closure %}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 960px) {
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    #column-schedule ul li {
+        background: #efefef;
+        border-bottom: 1px dotted #cccccc;
+        list-style: none;
+        text-align: center;
+        font-size: 24px;
+        line-height: 24px;
+        min-height: 24px;
+        width: 100%;
+        display: block;
+        padding: 0;
+        margin: 0;
+    }
+    #fb-root * { width: auto; }
+}
+</style>
+{% endblock %}