bzr-website

Merge lp:~emmajane/bzr-website/utility-nav into lp:bzr-website

  1. utility-nav
  2. Merge into trunk
Proposed by EmmaJane
Status: Superseded
Proposed branch: lp:~emmajane/bzr-website/utility-nav
Merge into: lp:bzr-website
Diff against target: 101 lines
3 files modified
css/regions.css (+3/-6)
en/index.html (+8/-10)
en/search.html (+7/-9)
To merge this branch: bzr merge lp:~emmajane/bzr-website/utility-nav
Reviewer Review Type Date Requested Status
Bazaar Developers Pending
Review via email: mp+13038@code.launchpad.net

This proposal has been superseded by a proposal from 2009-10-08.

To post a comment you must log in.
Revision history for this message
EmmaJane (emmajane) wrote :

Changing utility navigation from the 960 grid layout to buttons that are based on the size of the words. Eliminates the problem of "Contribute" being too big at larger font sizes. "Docs" has also been renamed to "Documentation."

lp:~emmajane/bzr-website/utility-nav updated
121. By EmmaJane

Adding the new icon from the graphic designer for 'Get Going'

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/regions.css'
2--- css/regions.css 2009-10-05 02:17:48 +0000
3+++ css/regions.css 2009-10-08 04:35:17 +0000
4@@ -1,7 +1,4 @@
5-.container_12 {
6- /* background: #fff url(../960/img/12_col.gif) repeat-y;*/
7- /*margin-bottom: 20px;*/
8-}
9+/* Custom styles for specific regions */
10
11 /* Banner */
12 #banner {
13@@ -72,10 +69,10 @@
14
15 #nav-utility a {
16 background: transparent url(button-edges.gif) repeat-y 0 0;
17- padding: 10px 10px 7px 10px;
18+ padding: 10px 20px 7px 20px;
19 margin: 0;
20 text-align: center;
21- display: block;
22+ float: left;
23 }
24
25 #nav-utility li.first {
26
27=== modified file 'en/index.html'
28--- en/index.html 2009-10-06 01:02:38 +0000
29+++ en/index.html 2009-10-08 04:35:17 +0000
30@@ -28,18 +28,17 @@
31 </div>
32
33 <div id="nav-utility">
34-<div class="container_12">
35- <ul class="grid_7 alpha">
36- <li class="first"><a class="grid_1 alpha" href=".">Home</a></li>
37- <li><a class="grid_1" href="http://doc.bazaar-vcs.org/en/">Docs</a></li>
38- <li><a class="grid_1" href="http://bazaar-vcs.org/Download">Download</a></li>
39- <li><a class="grid_1" href="http://bazaar-vcs.org/BzrExtras">Extras</a></li>
40- <li><a class="grid_1" href="http://doc.bazaar-vcs.org/developers/">Contribute</a></li>
41- <li class="last"><a class="grid_1 omega" href="http://bazaar-vcs.org/BzrSupport">Help</a></li>
42+ <ul>
43+ <li class="first"><a href=".">Home</a></li>
44+ <li><a href="http://doc.bazaar-vcs.org/en/">Documentation</a></li>
45+ <li><a href="http://bazaar-vcs.org/Download">Download</a></li>
46+ <li><a href="http://bazaar-vcs.org/BzrExtras">Extras</a></li>
47+ <li><a href="http://doc.bazaar-vcs.org/developers/">Contribute</a></li>
48+ <li class="last"><a href="http://bazaar-vcs.org/BzrSupport">Help</a></li>
49 </ul>
50
51 <!-- Google Custom Search Element -->
52-<div id="cse" class="grid_4 omega">
53+<div id="cse">
54 <script type="text/javascript">
55 document.write('\
56 <form action="http://bazaar-vcs.org/en/search.html" id="cse-search-box">\
57@@ -65,7 +64,6 @@
58 </form>
59 </noscript>
60 </div>
61-</div>
62 <div class="clear"></div>
63 </div>
64
65
66=== modified file 'en/search.html'
67--- en/search.html 2009-10-05 05:24:21 +0000
68+++ en/search.html 2009-10-08 04:35:17 +0000
69@@ -28,18 +28,17 @@
70 </div>
71
72 <div id="nav-utility">
73-<div class="container_12">
74- <ul class="grid_7 alpha">
75- <li><a class="grid_1 alpha first" href=".">Home</a></li>
76- <li><a class="grid_1" href="http://doc.bazaar-vcs.org/en/">Docs</a></li>
77- <li><a class="grid_1" href="http://bazaar-vcs.org/Download">Download</a></li>
78- <li><a class="grid_1" href="http://bazaar-vcs.org/BzrExtras">Extras</a></li>
79- <li><a class="grid_1" href="http://doc.bazaar-vcs.org/developers/">Contribute</a></li>
80+ <ul>
81+ <li class="first"><a href=".">Home</a></li>
82+ <li><a href="http://doc.bazaar-vcs.org/en/">Documentation</a></li>
83+ <li><a href="http://bazaar-vcs.org/Download">Download</a></li>
84+ <li><a href="http://bazaar-vcs.org/BzrExtras">Extras</a></li>
85+ <li><a href="http://doc.bazaar-vcs.org/developers/">Contribute</a></li>
86 <li class="last"><a class="grid_1 omega" href="http://bazaar-vcs.org/BzrSupport">Help</a></li>
87 </ul>
88
89 <!-- Google Custom Search Element -->
90-<div id="cse" class="grid_4 omega">
91+<div id="cse">
92 <script type="text/javascript">
93 document.write('\
94 <form action="http://bazaar-vcs.org/en/search.html" id="cse-search-box">\
95@@ -65,7 +64,6 @@
96 </form>
97 </noscript>
98 </div>
99-</div>
100 <div class="clear"></div>
101 </div>
102

Subscribers

People subscribed via source and target branches