Ubuntu Accomplishments Web Gallery

Merge lp:~robin-gloster/ubuntu-accomplishments-web/secondary-nav into lp:ubuntu-accomplishments-web

  1. secondary-nav
  2. Merge into trunk
Proposed by Robin Gloster
Status: Merged
Merged at revision: 237
Proposed branch: lp:~robin-gloster/ubuntu-accomplishments-web/secondary-nav
Merge into: lp:ubuntu-accomplishments-web
Diff against target: 127 lines (+38/-10)
4 files modified
common/static/css/webgallery.css (+18/-3)
ubuntu_theme/static/css/bootstrap.min.css (+3/-2)
ubuntu_theme/static/css/style.css (+16/-4)
ubuntu_theme/templates/website_base.html (+1/-1)
To merge this branch: bzr merge lp:~robin-gloster/ubuntu-accomplishments-web/secondary-nav
Reviewer Review Type Date Requested Status
Janos Gyerik Approve
Review via email: mp+140251@code.launchpad.net

Description of the change

CSS secondary nav fixes.
I think I failed getting the trunk correctly. I hope it is mergeable otherwise I'll add my changes to trunk again.

To post a comment you must log in.
Revision history for this message
Janos Gyerik (janos-gyerik) wrote :

What do you mean, you think you failed to get the trunk correctly?

I cannot merge now, but I noticed in the diff that you changed bootstrap.min.css. I think it would be better to preserve that file without any editing. Can you please revert those changes and them to style.css instead? That way if we upgrade bootstrap, we can simply replace that file with the latest version and our customization will still remain intact in style.css.

Thanks!

Revision history for this message
Janos Gyerik (janos-gyerik) wrote :

Nevermind, I did it myself and merged the branch, thanks a lot, looking great!

review: Approve
Revision history for this message
Robin Gloster (robin-gloster) wrote :

Great, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/static/css/webgallery.css'
2--- common/static/css/webgallery.css 2012-12-15 08:23:26 +0000
3+++ common/static/css/webgallery.css 2012-12-17 17:10:30 +0000
4@@ -103,16 +103,31 @@
5
6 nav .lang select {
7 width: inherit;
8- margin: 0;
9+ margin: 0 .625em 0 0;
10+ float: left;
11+ display: block;
12 }
13-
14 nav .lang input[type="submit"] {
15+ background:url(../images/patterns/search_submit_bg_2.png) 0 2px no-repeat;
16+ border:0;
17+ cursor:pointer;
18+ display: block;
19+ margin-top: 7px;
20+ height:24px;
21+ text-indent:-999em;
22+ /* top:4px; */
23+ width:24px
24+}
25+nav .lang input[type="submit"]:hover {
26+ background-position:0 -22px
27+}
28+/* nav .lang input[type="submit"] {
29 padding: 2px;
30 margin: inherit;
31 margin-top: inherit;
32 font-size: inherit;
33 display: inline;
34-}
35+} */
36
37 nav .lang {
38 border-right: 1px solid white;
39
40=== modified file 'ubuntu_theme/static/css/bootstrap.min.css'
41--- ubuntu_theme/static/css/bootstrap.min.css 2012-12-14 22:32:54 +0000
42+++ ubuntu_theme/static/css/bootstrap.min.css 2012-12-17 17:10:30 +0000
43@@ -179,12 +179,13 @@
44 fieldset{padding:0;margin:0;border:0;}
45 legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:13.5px;color:#999999;}
46 label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;}
47-input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
48+input,button,select,textarea{font-family:Ubuntu, Arial, 'libra sans', sans-serif;}
49 label{display:block;margin-bottom:5px;}
50 select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;}
51 input,textarea{width:210px;}
52 textarea{height:auto;}
53-textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);}
54+textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
55+/* textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted 9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} */
56 input[type="radio"],input[type="checkbox"]{margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;}
57 input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;}
58 .uneditable-textarea{width:auto;height:auto;}
59
60=== modified file 'ubuntu_theme/static/css/style.css'
61--- ubuntu_theme/static/css/style.css 2012-12-15 08:23:26 +0000
62+++ ubuntu_theme/static/css/style.css 2012-12-17 17:10:30 +0000
63@@ -157,7 +157,7 @@
64 -webkit-border-radius:0 0 4px 4px;
65 -moz-border-radius:0 0 4px 4px;
66 border-radius:0 0 4px 4px;
67-margin:0 0 0 1.25em;
68+/* margin:0 0 0 1.25em; */
69 background:#efefef;
70 float:left;
71 display:inline;
72@@ -181,7 +181,7 @@
73 header.banner .nav-secondary li select{
74 /* font-size:.813em; */
75 color:#333;
76-margin-top:6px;
77+/* margin-top:6px; */
78 }
79
80 header.banner .nav-secondary li a:link,header.banner .nav-secondary li a:visited{
81@@ -191,7 +191,7 @@
82 margin-bottom:0;
83 text-decoration:none;
84 border-right:1px solid #d7d6d7;
85-padding:10px
86+padding:11px
87 }
88 header.banner .nav-secondary li:first-child{
89 border:0
90@@ -264,7 +264,7 @@
91 border-color:#ccc;
92 float:left;
93 margin:0 .625em 0 0;
94-width:12em}#box-search form button{background:url(../images/patterns/search_submit_bg_2.png) 0 2px no-repeat;
95+width:11.6em}#box-search form button{background:url(../images/patterns/search_submit_bg_2.png) 0 2px no-repeat;
96 border:0;
97 cursor:pointer;
98 display:block;
99@@ -1511,3 +1511,15 @@
100 div#pitfalls, div#tips, div#howto, div#furtherreading {
101 padding-left: 10px;
102 }
103+::-webkit-input-placeholder {
104+ color: #000;
105+}
106+:-moz-placeholder {
107+ color: #000;
108+}
109+::-moz-placeholder {
110+ color: #000;
111+}
112+:-ms-input-placeholder {
113+ color: #000;
114+}
115
116=== modified file 'ubuntu_theme/templates/website_base.html'
117--- ubuntu_theme/templates/website_base.html 2012-12-15 08:23:26 +0000
118+++ ubuntu_theme/templates/website_base.html 2012-12-17 17:10:30 +0000
119@@ -55,7 +55,7 @@
120
121 <div id="box-search" class="three-col last-col">
122 <form action="http://www.ubuntu.com" accept-charset="UTF-8" method="post" id="google-appliance-search-form" class="search-form">
123- <input maxlength="255" name="keys" id="edit-keys" class="form-text" type="text" value=>
124+ <input maxlength="255" name="keys" id="edit-keys" class="form-text" type="text" placeholder="Type to search">
125 <button type="submit" name="op" id="edit-submit-1" class="form-submit">Search</button>
126 <input name="form_build_id" id="form-57eed41bee926fb836d33507bdef1cef" value="form-57eed41bee926fb836d33507bdef1cef" type="hidden">
127 <input name="form_id" id="edit-google-appliance-search-form-1" value="google_appliance_search_form" type="hidden">

Subscribers

People subscribed via source and target branches