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

Proposed by Stuart Langridge on 2012-03-23
Status: Needs review
Proposed branch: lp:~sil/summit/redo-mobile-summit
Merge into: lp:~cjohnston/summit/action-item-links
Diff against target: 81 lines (+17/-6)
3 files modified
summit/common/templates/common/index.html (+1/-1)
summit/schedule/templates/schedule/daily.html (+4/-1)
summit/schedule/templates/schedule/summit.html (+12/-4)
To merge this branch: bzr merge lp:~sil/summit/redo-mobile-summit
Reviewer Review Type Date Requested Status
Chris Johnston 2012-03-23 Pending
Review via email: mp+99138@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Unmerged revisions

329. By Stuart Langridge on 2012-03-23

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/common/templates/common/index.html'
2--- summit/common/templates/common/index.html 2012-03-18 19:53:58 +0000
3+++ summit/common/templates/common/index.html 2012-03-23 23:54:19 +0000
4@@ -8,7 +8,7 @@
5 <style>
6 /* Mobile-friendly styles */
7 @media screen and (max-width: 481px) {
8- 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 {
9+ 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 {
10 width: auto;
11 margin: 0; padding: 0;
12 }
13
14=== modified file 'summit/schedule/templates/schedule/daily.html'
15--- summit/schedule/templates/schedule/daily.html 2012-03-18 15:48:27 +0000
16+++ summit/schedule/templates/schedule/daily.html 2012-03-23 23:54:19 +0000
17@@ -87,7 +87,7 @@
18 @media screen and (max-width: 481px) {
19 /* turn off a bunch of stuff */
20 nav#top-related, header#page-header, aside#page-related, footer#page-footer { display: none; }
21- section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container {
22+ section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container, .wrapper, .inner-wrapper, .span-9 {
23 width: auto;
24 margin: 0; padding: 0;
25 }
26@@ -151,6 +151,9 @@
27 float: left;
28 margin-right: 4px;
29 }
30+
31+ header a.logo-ubuntu img { display: none; }
32+
33 }
34
35 </style>
36
37=== modified file 'summit/schedule/templates/schedule/summit.html'
38--- summit/schedule/templates/schedule/summit.html 2012-03-23 16:28:03 +0000
39+++ summit/schedule/templates/schedule/summit.html 2012-03-23 23:54:19 +0000
40@@ -31,17 +31,19 @@
41 <style>
42 /* Mobile-friendly styles */
43 @media screen and (max-width: 481px) {
44- 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 {
45- width: auto;
46+ 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 {
47+ width: 100%;
48 margin: 0; padding: 0;
49 }
50 #page-header { text-align: center; }
51 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
52 #top-logo { display: none; }
53- table.column { width: 100%; }
54- table.column td { display: block; width: 100%; }
55+ table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
56+ table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
57 table.column td ul {
58 width: 100%;
59+ margin: 0;
60+ padding: 0;
61 }
62 article.main-content { width: 100%; }
63 table.column td ul li {
64@@ -55,11 +57,17 @@
65 width: 100%;
66 display: block;
67 padding: 4px 0;
68+ margin: 0;
69 }
70 .double-side-content {
71 text-align: center;
72 }
73 .side-content { display: none; }
74+ #fb-root * { width: auto; }
75+ header h2 a {
76+ max-width: 85px;
77+ margin-top: -10px;
78+ }
79 }
80 </style>
81 {% endblock %}

Subscribers

People subscribed via source and target branches