Summit

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

  1. mobile-use-summit
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 364
Merged at revision: 365
Proposed branch: lp:~cjohnston/summit/mobile-use-summit
Merge into: lp:summit
Prerequisite: lp:~dooferlad/summit/linaro-small-theme
Diff against target: 398 lines (+205/-105)
7 files modified
summit/common/templates/base.html (+6/-6)
summit/common/templates/common/index.html (+13/-0)
summit/media/css/site.css (+33/-95)
summit/schedule/templates/schedule/by_room.html (+39/-4)
summit/schedule/templates/schedule/by_track.html (+39/-0)
summit/schedule/templates/schedule/daily.html (+50/-0)
summit/schedule/templates/schedule/summit.html (+25/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/mobile-use-summit
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+103105@code.launchpad.net

Commit message

This updates Summit for mobile browsing

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

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

Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
37 {% menu main_menu %}37 {% menu main_menu %}
38 <ul class="clearfix">38 <ul class="clearfix">
39 {% for item in menuitems %}39 {% for item in menuitems %}
40 <li{% if item.current %} class='active'{% endif %}><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>40 <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>
41 {% endfor %}41 {% endfor %}
42 </ul>42 </ul>
43{% endblock %}43{% endblock %}
@@ -49,11 +49,11 @@
4949
5050
51{% block messages %}51{% block messages %}
52 {% if messages %}52 {% if messages %}
53 {% for message in messages %}53 {% for message in messages %}
54 <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>54 <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
55 {% endfor %}55 {% endfor %}
56 {% endif %}56 {% endif %}
57{% endblock %}57{% endblock %}
5858
59{% block content %}59{% block content %}
6060
=== 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 @@
20</article>20</article>
21</div>21</div>
22{% endblock %}22{% endblock %}
23{% block closure %}
24<style>
25/* Mobile-friendly styles */
26@media screen and (max-width: 960px) {
27 .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
28 #page-header { text-align: center; }
29 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
30 .span-8, .span-9, .span-3, .span-12 { width: 100%; }
31 #fb-root * { width: auto; }
32}
33</style>
34{% endblock %}
35
2336
=== 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 @@
82 font-size: 0.7pc;82 font-size: 0.7pc;
83}83}
8484
85
86/* Mobile-friendly styles */
87@media screen and (max-width: 481px) {
88 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 {
89 width: auto;
90 margin: 0; padding: 0;
91 }
92 #page-header { text-align: center; }
93 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
94 #top-logo { display: none; }
95 .minor-content { text-align: center; }
96 .double-side-content {
97 text-align: center;
98 }
99 .side-content { display: none; }
100 #top-login { display: block; }
101 aside#top-nav {
102 display: block;
103 text-align: center;
104 font-size: 16px;
105 min-height: 24px;
106 }
107 .schedule-head > a { display: none; } /* qr code */
108 div.schedule-head .schedule-date {
109 display: block;
110 overflow: auto;
111 font-size: 16px;
112 text-align: center;
113 margin: 0;
114 }
115 div.schedule-head .schedule-qrcode { display: none; }
116 div.schedule-head .schedule-date a {
117 display: block;
118 float: right;
119 background: #eee;
120 width: 33%;
121 text-align: center;
122 }
123 div.schedule-head .schedule-date a:nth-child(1) {
124 float: left;
125 }
126 table.basic {
127 margin-top: 0;
128 width: 100%;
129 }
130 table.basic span.main-agenda-item-tracks {
131 display: none;
132 }
133 table.column { width: 100%; }
134 table.column td { display: block; width: 100%; }
135 table.column td ul {
136 width: 100%;
137 }
138 article.main-content { width: 100%; }
139 table.column td ul li {
140 background: #efefef;
141 border-bottom: 1px solid black;
142 list-style: none;
143 text-align: center;
144 font-size: 24px;
145 line-height: 24px;
146 min-height: 24px;
147 width: 100%;
148 display: block;
149 padding: 4px 0;
150 }
151 div.agenda-details {
152 background-color: #eee;
153 border-width: 0;
154 color: black;
155 font-size: 1em;
156 position: static;
157 max-width: 100%;
158 min-width: 100%;
159 width: 100%;
160 padding: 5px;
161 margin: 0;
162 border-radius: 0;
163 }
164 div.agenda-details ul {
165 background: #101010;
166 padding-left: 4px;
167 }
168 .main-agenda-item-name {
169 display: block;
170 min-height: 24px;
171 }
172 .main-agenda-item-name img.icon {
173 height: 24px;
174 width: 24px;
175 float: left;
176 margin-right: 4px;
177 }
178}
179
180.row-full-grey {85.row-full-grey {
181 margin-left: -20px;86 margin-left: -20px;
182 padding-left: 20px;87 padding-left: 20px;
@@ -220,3 +125,36 @@
220 font-size: 100% !important; /* Override Twitter's inline style */125 font-size: 100% !important; /* Override Twitter's inline style */
221 float: none;126 float: none;
222}127}
128
129/* Reset default unordered list display style to remove bulleting/spacing */
130#column-schedule ul {
131 list-style: none;
132}
133/* Stack LI elements horizontally instead of the default vertical orientation */
134#column-schedule li {
135 float: left;
136 margin-right: 1em;
137}
138
139/* Reset default unordered list display style to remove bulleting/spacing */
140#column-schedule-inner ul {
141 list-style: disc;
142 /*border-right: dotted;
143 border-right-width: 1px;*/
144}
145/* Stack LI elements horizontally instead of the default vertical orientation */
146#column-schedule-inner li {
147 float: none;
148 margin-right: 1em;
149 padding: 0em;
150 line-height: 1.5em;
151 margin-bottom: 0px;
152 margin-top: 0px;
153}
154
155/* Social widgets */
156.social-widget {
157 float: left;
158 display: inline-block;
159 margin-right: 2px;
160}
223161
=== 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 @@
6{% endblock %}6{% endblock %}
77
8{% block extrahead %}8{% block extrahead %}
9
10{% if linaro %}
11 <base target="_blank" />
12{% endif %}
13{{ block.super }}9{{ block.super }}
14{% endblock %}10{% endblock %}
1511
@@ -94,6 +90,45 @@
94</div>90</div>
9591
96{% block closure %}92{% block closure %}
93<style>
94/* Mobile-friendly styles */
95@media screen and (max-width: 960px) {
96 .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary, .schedule-qrcode { display: none; }
97 #page-header { text-align: center; }
98 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
99 .span-8, .span-9, .span-3, .span-12 { width: 100%; }
100 table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
101 table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
102 table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
103 table.column td ul {
104 width: 100%;
105 margin: 0;
106 padding: 0;
107 }
108 table.column td ul li {
109 background: #efefef;
110 border-bottom: 1px solid black;
111 list-style: none;
112 text-align: center;
113 font-size: 24px;
114 line-height: 24px;
115 min-height: 24px;
116 width: 100%;
117 display: block;
118 padding: 4px 0;
119 margin: 0;
120 }
121 #fb-root * { width: auto; }
122 div.schedule-head .schedule-date {
123 font-weight: normal;
124 font-size: 36px;
125 margin: 0;
126 display: block;
127 text-align: center;
128 width: 100%;
129 }
130}
131</style>
97<script language="JavaScript">132<script language="JavaScript">
98133
99function show_agenda_details(agenda_id, index_id) {134function show_agenda_details(agenda_id, index_id) {
100135
=== 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 @@
86</div>86</div>
8787
88{% block closure %}88{% block closure %}
89<style>
90/* Mobile-friendly styles */
91@media screen and (max-width: 960px) {
92 .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary, .schedule-qrcode { display: none; }
93 #page-header { text-align: center; }
94 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
95 .span-8, .span-9, .span-3, .span-12 { width: 100%; }
96 table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
97 table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
98 table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
99 table.column td ul {
100 width: 100%;
101 margin: 0;
102 padding: 0;
103 }
104 table.column td ul li {
105 background: #efefef;
106 border-bottom: 1px solid black;
107 list-style: none;
108 text-align: center;
109 font-size: 24px;
110 line-height: 24px;
111 min-height: 24px;
112 width: 100%;
113 display: block;
114 padding: 4px 0;
115 margin: 0;
116 }
117 #fb-root * { width: auto; }
118 div.schedule-head .schedule-date {
119 font-weight: normal;
120 font-size: 36px;
121 margin: 0;
122 display: block;
123 text-align: center;
124 width: 100%;
125 }
126}
127</style>
89<script language="JavaScript">128<script language="JavaScript">
90129
91function show_agenda_details(agenda_id, index_id) {130function show_agenda_details(agenda_id, index_id) {
92131
=== 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 @@
108</div>108</div>
109109
110{% block closure %}110{% block closure %}
111<style>
112/* Mobile-friendly styles */
113@media screen and (max-width: 960px) {
114 .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary, .schedule-qrcode { display: none; }
115 #page-header { text-align: center; }
116 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
117 .span-8, .span-9, .span-3, .span-12 { width: 100%; }
118 table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
119 table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
120 table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
121 table.column td ul {
122 width: 100%;
123 margin: 0;
124 padding: 0;
125 }
126 table.column td ul li {
127 background: #efefef;
128 border-bottom: 1px solid black;
129 list-style: none;
130 text-align: center;
131 font-size: 24px;
132 line-height: 24px;
133 min-height: 24px;
134 width: 100%;
135 display: block;
136 padding: 4px 0;
137 margin: 0;
138 }
139 #fb-root * { width: auto; }
140 .schedule-head > a { display: none; } /* qr code */
141 div.schedule-head .schedule-date a:nth-child(1) {
142 float: left;
143 }
144 div.schedule-head .schedule-date {
145 font-weight: normal;
146 font-size: 36px;
147 margin: 0;
148 display: block;
149 text-align: center;
150 }
151 div.schedule-head .schedule-date a {
152 display: block;
153 float: right;
154 background: #eee;
155 width: 25%;
156 text-align: center;
157 }
158}
159</style>
160
111<script language="JavaScript">161<script language="JavaScript">
112162
113function show_agenda_details(agenda_id, index_id) {163function show_agenda_details(agenda_id, index_id) {
114164
=== 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 @@
101 </article> 101 </article>
102</div>102</div>
103{% endblock %}103{% endblock %}
104{% block closure %}
105<style>
106/* Mobile-friendly styles */
107@media screen and (max-width: 960px) {
108 .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
109 #page-header { text-align: center; }
110 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
111 .span-8, .span-9, .span-3, .span-12 { width: 100%; }
112 #column-schedule ul li {
113 background: #efefef;
114 border-bottom: 1px dotted #cccccc;
115 list-style: none;
116 text-align: center;
117 font-size: 24px;
118 line-height: 24px;
119 min-height: 24px;
120 width: 100%;
121 display: block;
122 padding: 0;
123 margin: 0;
124 }
125 #fb-root * { width: auto; }
126}
127</style>
128{% endblock %}

Subscribers

People subscribed via source and target branches