Launchpad itself

Merge lp://staging/~sinzui/launchpad/webkit-css into lp://staging/launchpad

  1. webkit-css
  2. Merge into devel
Proposed by Curtis Hovey
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~sinzui/launchpad/webkit-css
Merge into: lp://staging/launchpad
Diff against target: 172 lines (+23/-50)
7 files modified
lib/canonical/launchpad/icing/style-3-0.css (+19/-1)
lib/canonical/launchpad/icing/style.css (+0/-16)
lib/lp/bugs/templates/bugtarget-bugs.pt (+0/-2)
lib/lp/bugs/templates/bugtask-edit.pt (+0/-9)
lib/lp/bugs/templates/bugtask-view.pt (+0/-18)
lib/lp/bugs/templates/cveset-all.pt (+0/-4)
lib/lp/registry/templates/object-timeline-graph.pt (+4/-0)
To merge this branch: bzr merge lp://staging/~sinzui/launchpad/webkit-css
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+16388@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :
Download full text (3.9 KiB)

This is my branch fix the CSS rules for webkit and remove obsolete styles.

    lp:~sinzui/launchpad/webkit-css
    Diff size: 168
    Launchpad bug: https://bugs.launchpad.net/bugs/498574
                   https://bugs.launchpad.net/bugs/498581
                   https://bugs.launchpad.net/bugs/435768
                   https://bugs.launchpad.net/bugs/185306
    Test command: None.
    Pre-implementation: danilo/bac for 1, salgado for 2, beuno 3. no one 4.
    Target release: 3.1.13

= fix the CSS rules for webkit =

Bug #498574 [page layout broken in webkit]
    The CSS rules needed by webkit were broken when the obsolete CSS was
    removed from style-3.0.css--something was not obsolete.

Bug #498581 [restore the timeline stylesheet]
    The timeline was broken in a recent landing because the CSS was removed.
    It was loading the wrong CSS file. It needs the new CSS macro to center
    the timeline and fix zoom in / zoom out.

Bug #435768 [footer font size is too large "This site is running ..."]
    The "This site is running pre-release code ..." message is 13px, but the
    rest of the footer is 11px. This may be fixable by removing the styles so
    that re default styles of the footer takes precedence.

Bug #185306 [portlets, portlets_one, and portlets_two slots are redundant]
    These slots are not used by base-layout, they are not being used.

== Rules ==

Bug #498574 [page layout broken in webkit]
    Restore one of the old #maincontent rules.

Bug #498581 [restore the timeline stylesheet]
    Use the new stylesheet macro to fix the formatting of the timeline
    elements that are created by the script.

Bug #435768 [footer font size is too large "This site is running ..."]
    Remove the font-size instruction.

Bug #185306 [portlets, portlets_one, and portlets_two slots are redundant]
    Remove the unused slots.

== QA ==

Bug #498574 [page layout broken in webkit]
    * View a project page in gecko and webkit and verify that both pages
      show the portlets in the correct place to the right.

Bug #498581 [restore the timeline stylesheet]
    * View a project.
      * Verify the timeline content is centered in its portlet.
      * Verify you see the zoom control when your mouse is over the timeline.

Bug #435768 [footer font size is too large "This site is running ..."]
    * View any page on edge or staging
      * Verify that the site message is the same size as the tour text.

Bug #185306 [portlets, portlets_one, and portlets_two slots are redundant]
    * None, the content is not used.

== Lint ==

Lint reported an obsolete slot in a bug template I was looking at. I removed
all occurrences of the pageheading and portlet slots from main-template.pt
(which was removed last month).

Linting changed files:
  lib/canonical/launchpad/icing/style-3-0.css
  lib/canonical/launchpad/icing/style.css
  lib/lp/bugs/templates/bugtarget-bugs.pt
  lib/lp/bugs/templates/bugtask-edit.pt
  lib/lp/bugs/templates/bugtask-view.pt
  lib/lp/bugs/templates/cveset-all.pt
  lib/lp/registry/templates/object-timeline-graph.pt

== Test ==

None. This changes are visual, or in the case of obsolete content, not
visual.

== Implementation ==

   ...

Read more...

Revision history for this message
Brad Crittenden (bac) wrote :

Curtis thanks for this branch and thanks for taking the time to work with me as we tried to identify the problems. Glad we got it figured out and you discovered the dastardly 'em' problem.

The changes look good to me and they seem to behave properly in Safari and Webkit.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
2--- lib/canonical/launchpad/icing/style-3-0.css 2009-12-12 03:25:27 +0000
3+++ lib/canonical/launchpad/icing/style-3-0.css 2009-12-21 23:19:13 +0000
4@@ -5,9 +5,14 @@
5 .yui-t4 .yui-b {
6 width: 21%;
7 }
8+.yui-t4 .yui-main {
9+ clear: both;
10+ float: left;
11+ margin-right: -25%;
12+ }
13 .yui-t4 .yui-main .yui-b {
14 width: auto;
15- margin-right: 24%;
16+ margin-right: 25%;
17 }
18 .footer {
19 clear: both;
20@@ -29,6 +34,10 @@
21 .footer .lp-arcana .search-icon {
22 background: url(icon-sprites) 100% -191px no-repeat;
23 }
24+.footer .sitemessage {
25+ text-align: right;
26+}
27+
28 .footer .colophon {
29 margin: 3em 3em 1em 3em;
30 text-align: center;
31@@ -782,6 +791,15 @@
32 padding: 1em 1em 1em 0;
33 }
34
35+/* Timeline Graph */
36+div.yui-timelinegraph-content .yui-timelinegraph-zoom-box {
37+ visibility: hidden;
38+}
39+
40+div.yui-timelinegraph-content:hover .yui-timelinegraph-zoom-box {
41+ visibility: visible;
42+}
43+
44 /* == Sprites == */
45 .sprite {
46 padding: 2px 0 5px 18px;
47
48=== modified file 'lib/canonical/launchpad/icing/style.css'
49--- lib/canonical/launchpad/icing/style.css 2009-12-16 19:59:06 +0000
50+++ lib/canonical/launchpad/icing/style.css 2009-12-21 23:19:13 +0000
51@@ -472,13 +472,6 @@
52
53 /* === Universal page layout === */
54
55-/* All pages include the sitemessage in the footer if one is defined
56- in the config. */
57-.sitemessage {
58- font-size: 13px;
59- text-align: right;
60-}
61-
62 /* === Login control === */
63 /* At the top right of the page is a link to log in or a button to log out: */
64 #logincontrol {
65@@ -822,15 +815,6 @@
66 margin-top: 1em;
67 }
68
69-/* Timeline Graph */
70-div.yui-timelinegraph-content .yui-timelinegraph-zoom-box {
71- visibility: hidden;
72-}
73-
74-div.yui-timelinegraph-content:hover .yui-timelinegraph-zoom-box {
75- visibility: visible;
76-}
77-
78 .product.series, .series {margin-bottom: 1em;}
79 #packages h1, #projects h1 {margin-top: 1.2em;}
80
81
82=== modified file 'lib/lp/bugs/templates/bugtarget-bugs.pt'
83--- lib/lp/bugs/templates/bugtarget-bugs.pt 2009-11-26 17:28:13 +0000
84+++ lib/lp/bugs/templates/bugtarget-bugs.pt 2009-12-21 23:19:13 +0000
85@@ -13,8 +13,6 @@
86 <script type="text/javascript" src="/+icing/FormatAndColor.js"></script>
87 <script type="text/javascript" src="/+icing/PlotKit_Packed.js"></script>
88 </metal:block>
89- <metal:portlets fill-slot="portlets">
90- </metal:portlets>
91 <body>
92 <tal:side metal:fill-slot="side">
93 <div id="involvement" class="portlet involvement">
94
95=== modified file 'lib/lp/bugs/templates/bugtask-edit.pt'
96--- lib/lp/bugs/templates/bugtask-edit.pt 2009-09-08 09:25:58 +0000
97+++ lib/lp/bugs/templates/bugtask-edit.pt 2009-12-21 23:19:13 +0000
98@@ -10,15 +10,6 @@
99 i18n:domain="malone"
100 >
101 <body>
102- <metal:heading fill-slot="pageheading">
103- <div>
104- <tal:icon replace="structure context/image:icon" />
105- <a tal:attributes="href context/fmt:url"
106- >Bug #<tal:bug replace="context/bug/id">3252543</tal:bug></a>:
107- </div>
108- <h1 tal:content="context/bug/title">Foo doesn't work</h1>
109- </metal:heading>
110-
111 <div metal:fill-slot="main">
112 <p tal:condition="view/is_question" class="error message">
113 This bug was converted into a question. It cannot be edited.
114
115=== modified file 'lib/lp/bugs/templates/bugtask-view.pt'
116--- lib/lp/bugs/templates/bugtask-view.pt 2009-09-08 09:25:58 +0000
117+++ lib/lp/bugs/templates/bugtask-view.pt 2009-12-21 23:19:13 +0000
118@@ -8,24 +8,6 @@
119 metal:use-macro="view/macro:page/main_only"
120 >
121 <body>
122- <metal:heading fill-slot="pageheading">
123- <div>
124- <img alt="" src="/@@/bug" />
125- <a tal:attributes="href context/bug/fmt:url"
126- >Bug #<tal:bug replace="context/bug/id">3252543</tal:bug></a>:
127- </div>
128- <h1 tal:content="context/bug/title">Foo doesn't work</h1>
129- </metal:heading>
130-
131- <metal:leftportlets fill-slot="portlets_one">
132- <div tal:replace="structure context/@@+portlet-status-details" />
133- </metal:leftportlets>
134-
135- <metal:rightportlets fill-slot="portlets_two">
136- <div tal:replace="structure context/@@+portlet-search" />
137- <div tal:replace="structure context/@@+portlet-alsoreportedin" />
138- </metal:rightportlets>
139-
140 <div metal:fill-slot="main">
141 <p tal:condition="context/bug/duplicateof" class="informational message">
142 This bug is a duplicate of
143
144=== modified file 'lib/lp/bugs/templates/cveset-all.pt'
145--- lib/lp/bugs/templates/cveset-all.pt 2009-09-10 09:30:59 +0000
146+++ lib/lp/bugs/templates/cveset-all.pt 2009-12-21 23:19:13 +0000
147@@ -10,10 +10,6 @@
148 i18n:domain="malone"
149 >
150 <body>
151- <metal:heading fill-slot="pageheading">
152- <h1>All registered CVEs</h1>
153- </metal:heading>
154-
155 <div metal:fill-slot="main"
156 tal:define="batchnav view/getAllBatched;
157 batch batchnav/currentBatch">
158
159=== modified file 'lib/lp/registry/templates/object-timeline-graph.pt'
160--- lib/lp/registry/templates/object-timeline-graph.pt 2009-12-16 19:59:06 +0000
161+++ lib/lp/registry/templates/object-timeline-graph.pt 2009-12-21 23:19:13 +0000
162@@ -13,6 +13,10 @@
163 use-macro="context/@@+base-layout-macros/load-javascript" />
164 <metal:lp-client-cache
165 use-macro="context/@@+base-layout-macros/lp-client-cache" />
166+
167+ <metal:launchpad-stylesheet
168+ use-macro="context/@@+base-layout-macros/launchpad-stylesheet-3-0" />
169+
170 </head>
171
172 <body style="margin: 0; padding: 0">