Merge lp:~stephen-stewart/online-services-common-js/navbar-css into lp:online-services-common-js

Proposed by Stephen Stewart
Status: Merged
Approved by: Stephen Stewart
Approved revision: 32
Merged at revision: 32
Proposed branch: lp:~stephen-stewart/online-services-common-js/navbar-css
Merge into: lp:online-services-common-js
Diff against target: 205 lines (+2/-155)
7 files modified
build/config.js (+1/-1)
build/navbar/assets/navbar-core.css (+0/-75)
build/navbar/assets/skins/sam/navbar-skin.css (+0/-1)
build/navbar/assets/skins/sam/navbar.css (+0/-1)
src/navbar/assets/navbar-core.css (+0/-75)
src/navbar/assets/skins/sam/navbar-skin.css (+0/-1)
src/navbar/build.json (+1/-1)
To merge this branch: bzr merge lp:~stephen-stewart/online-services-common-js/navbar-css
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
Review via email: mp+218113@code.launchpad.net

Commit message

move css for navbar to ulysses

Description of the change

move css for navbar to ulysses, css loaded via js is more complex to manage wrt the cascade and media queries and also the navbar css is easier managed if it's all in one place

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/config.js'
2--- build/config.js 2014-04-16 13:48:47 +0000
3+++ build/config.js 2014-05-02 15:43:50 +0000
4@@ -1,1 +1,1 @@
5-YUI.GlobalConfig = {"groups":{"os":{"modules":{"carousel":{"skinnable":true,"requires":["base","node","anim","event"]},"ga-tracking":{"requires":["node"]},"global-navigation-templates":{"requires":["template"]},"global-navigation":{"requires":["node","template","array-extras","global-navigation-templates"],"skinnable":true},"html5-details":{"requires":["base","node","event"]},"myapps-hud":{"skinnable":true,"requires":["node"]},"navbar":{"requires":["node","plugin-collapse"],"skinnable":true},"navbar-autocomplete":{"requires":["node","autocomplete","autocomplete-highlighters"],"after":["navbar"]},"overlay-extras":{"requires":["overlay","plugin","event-resize","event-outside"]},"password-meter":{"requires":["base","widget","event-key","transition"],"skinnable":true},"plugin-collapse":{"requires":["base","plugin","node-pluginhost","transition"]},"plugin-jit-bar":{"requires":["anim","node","node-scroll-info","plugin"],"skinnable":true},"rangyinputs":{},"uploader-augmented":{"requires":["array-extras","uploader-html5"]},"uploader-follow":{"requires":["base","anim"]},"uploader-myapps-packages-for-extraction":{"requires":["base","uploader-myapps-packages","util","cookie","io","json-parse"]},"uploader-myapps-packages":{"requires":["base","uploader-myapps","util","cookie","io","json-parse"]},"uploader-myapps-templates":{"requires":["template"]},"uploader-myapps":{"skinnable":true,"requires":["template","uploader-augmented","uploader-myapps-templates","node"]},"util-share":{"requires":["base","node"]},"util-stacktrace":{"requires":[]},"util-oops":{"requires":["base","io-base","json-stringify"]},"util-myapps":{"skinnable":true,"requires":["base","node"]},"util":{"use":["util-share","util-stacktrace","util-oops","util-myapps"]},"widget-cc-input":{"requires":["node-pluginhost","widget","base","transition","button","rangyinputs","template"],"skinnable":true},"position-sticky":{"requires":["widget","substitute","node","event-resize"]},"widget-tooltip":{"requires":["event-mouseenter","widget","widget-position","widget-position-align","widget-stack","escape"],"skinnable":true}}}}};
6\ No newline at end of file
7+YUI.GlobalConfig = {"groups":{"os":{"modules":{"carousel":{"skinnable":true,"requires":["base","node","anim","event"]},"ga-tracking":{"requires":["node"]},"global-navigation-templates":{"requires":["template"]},"global-navigation":{"requires":["node","template","array-extras","global-navigation-templates"],"skinnable":true},"html5-details":{"requires":["base","node","event"]},"myapps-hud":{"skinnable":true,"requires":["node"]},"navbar":{"requires":["node","plugin-collapse"]},"navbar-autocomplete":{"requires":["node","autocomplete","autocomplete-highlighters"],"after":["navbar"]},"overlay-extras":{"requires":["overlay","plugin","event-resize","event-outside"]},"password-meter":{"requires":["base","widget","event-key","transition"],"skinnable":true},"plugin-collapse":{"requires":["base","plugin","node-pluginhost","transition"]},"plugin-jit-bar":{"requires":["anim","node","node-scroll-info","plugin"],"skinnable":true},"rangyinputs":{},"uploader-augmented":{"requires":["array-extras","uploader-html5"]},"uploader-follow":{"requires":["base","anim"]},"uploader-myapps-packages-for-extraction":{"requires":["base","uploader-myapps-packages","util","cookie","io","json-parse"]},"uploader-myapps-packages":{"requires":["base","uploader-myapps","util","cookie","io","json-parse"]},"uploader-myapps-templates":{"requires":["template"]},"uploader-myapps":{"skinnable":true,"requires":["template","uploader-augmented","uploader-myapps-templates","node"]},"util-share":{"requires":["base","node"]},"util-stacktrace":{"requires":[]},"util-oops":{"requires":["base","io-base","json-stringify"]},"util-myapps":{"skinnable":true,"requires":["base","node"]},"util":{"use":["util-share","util-stacktrace","util-oops","util-myapps"]},"widget-cc-input":{"requires":["node-pluginhost","widget","base","transition","button","rangyinputs","template"],"skinnable":true},"position-sticky":{"requires":["widget","substitute","node","event-resize"]},"widget-tooltip":{"requires":["event-mouseenter","widget","widget-position","widget-position-align","widget-stack","escape"],"skinnable":true}}}}};
8\ No newline at end of file
9
10=== removed directory 'build/navbar/assets'
11=== removed file 'build/navbar/assets/navbar-core.css'
12--- build/navbar/assets/navbar-core.css 2014-04-18 16:20:17 +0000
13+++ build/navbar/assets/navbar-core.css 1970-01-01 00:00:00 +0000
14@@ -1,75 +0,0 @@
15-.ues-icon-menu,
16-.ues-icon-search-bordered {
17- display:none;
18- margin:10px;
19- float:right;
20-}
21-
22-.ues-autocomplete {
23- width: 100% !important;
24-}
25-
26-.yui3-aclist-aria {
27- line-height: 0;
28-}
29-
30-.yui3-aclist-item:hover {
31- background-color:#eee;
32-}
33-
34-.yui3-aclist-item-active {
35- background-color:#ddd;
36-}
37-
38-@media (max-width: 480px) {
39- .collapse {
40- display: block;
41- }
42- .collapse.in {
43- display: none;
44- }
45- .ues-navbar-collapse {
46- background-color:#eee;
47- overflow:hidden;
48- }
49-
50- .ues-navbar-header:after,
51- .ues-navbar-header:before,
52- .ues-navbar-collapse:after,
53- .ues-navbar-collapse:before {
54- content: '';
55- display: table;
56- }
57- .ues-navbar-header:after,
58- .ues-navbar-collapse:after {
59- clear:both;
60- }
61-
62- .ues-navbar-primary-nav,
63- .ues-navbar-secondary-nav {
64- float:none;
65- }
66-
67- .ues-icon-menu,
68- .ues-icon-search-bordered {
69- display:block;
70- }
71-
72- .ues-autocomplete {
73- position: relative;
74- display: none;
75- }
76-
77- .open.ues-autocomplete {
78- display: block;
79- }
80-
81-}
82-
83-@media (min-width: 480px) {
84- .ues-navbar-collapse {
85- /** needs to override style set by collapse **/
86- height:auto !important;
87- width: auto;
88- }
89-}
90
91=== removed directory 'build/navbar/assets/skins'
92=== removed directory 'build/navbar/assets/skins/sam'
93=== removed file 'build/navbar/assets/skins/sam/navbar-skin.css'
94--- build/navbar/assets/skins/sam/navbar-skin.css 2014-03-11 23:07:54 +0000
95+++ build/navbar/assets/skins/sam/navbar-skin.css 1970-01-01 00:00:00 +0000
96@@ -1,1 +0,0 @@
97-/** hello world **/
98
99=== removed file 'build/navbar/assets/skins/sam/navbar.css'
100--- build/navbar/assets/skins/sam/navbar.css 2014-04-18 16:20:17 +0000
101+++ build/navbar/assets/skins/sam/navbar.css 1970-01-01 00:00:00 +0000
102@@ -1,1 +0,0 @@
103-.ues-icon-menu,.ues-icon-search-bordered{display:none;margin:10px;float:right}.ues-autocomplete{width:100%!important}.yui3-aclist-aria{line-height:0}.yui3-aclist-item:hover{background-color:#eee}.yui3-aclist-item-active{background-color:#ddd}@media(max-width:480px){.collapse{display:block}.collapse.in{display:none}.ues-navbar-collapse{background-color:#eee;overflow:hidden}.ues-navbar-header:after,.ues-navbar-header:before,.ues-navbar-collapse:after,.ues-navbar-collapse:before{content:'';display:table}.ues-navbar-header:after,.ues-navbar-collapse:after{clear:both}.ues-navbar-primary-nav,.ues-navbar-secondary-nav{float:none}.ues-icon-menu,.ues-icon-search-bordered{display:block}.ues-autocomplete{position:relative;display:none}.open.ues-autocomplete{display:block}}@media(min-width:480px){.ues-navbar-collapse{height:auto!important;width:auto}}#yui3-css-stamp.skin-sam-navbar{display:none}
104
105=== removed directory 'src/navbar/assets'
106=== removed file 'src/navbar/assets/navbar-core.css'
107--- src/navbar/assets/navbar-core.css 2014-04-18 16:20:17 +0000
108+++ src/navbar/assets/navbar-core.css 1970-01-01 00:00:00 +0000
109@@ -1,75 +0,0 @@
110-.ues-icon-menu,
111-.ues-icon-search-bordered {
112- display:none;
113- margin:10px;
114- float:right;
115-}
116-
117-.ues-autocomplete {
118- width: 100% !important;
119-}
120-
121-.yui3-aclist-aria {
122- line-height: 0;
123-}
124-
125-.yui3-aclist-item:hover {
126- background-color:#eee;
127-}
128-
129-.yui3-aclist-item-active {
130- background-color:#ddd;
131-}
132-
133-@media (max-width: 480px) {
134- .collapse {
135- display: block;
136- }
137- .collapse.in {
138- display: none;
139- }
140- .ues-navbar-collapse {
141- background-color:#eee;
142- overflow:hidden;
143- }
144-
145- .ues-navbar-header:after,
146- .ues-navbar-header:before,
147- .ues-navbar-collapse:after,
148- .ues-navbar-collapse:before {
149- content: '';
150- display: table;
151- }
152- .ues-navbar-header:after,
153- .ues-navbar-collapse:after {
154- clear:both;
155- }
156-
157- .ues-navbar-primary-nav,
158- .ues-navbar-secondary-nav {
159- float:none;
160- }
161-
162- .ues-icon-menu,
163- .ues-icon-search-bordered {
164- display:block;
165- }
166-
167- .ues-autocomplete {
168- position: relative;
169- display: none;
170- }
171-
172- .open.ues-autocomplete {
173- display: block;
174- }
175-
176-}
177-
178-@media (min-width: 480px) {
179- .ues-navbar-collapse {
180- /** needs to override style set by collapse **/
181- height:auto !important;
182- width: auto;
183- }
184-}
185
186=== removed directory 'src/navbar/assets/skins'
187=== removed directory 'src/navbar/assets/skins/sam'
188=== removed file 'src/navbar/assets/skins/sam/navbar-skin.css'
189--- src/navbar/assets/skins/sam/navbar-skin.css 2014-03-11 23:07:54 +0000
190+++ src/navbar/assets/skins/sam/navbar-skin.css 1970-01-01 00:00:00 +0000
191@@ -1,1 +0,0 @@
192-/** hello world **/
193
194=== modified file 'src/navbar/build.json'
195--- src/navbar/build.json 2014-04-16 13:48:47 +0000
196+++ src/navbar/build.json 2014-05-02 15:43:50 +0000
197@@ -8,7 +8,7 @@
198 "replace": {
199 "@VERSION@": "0.1.0"
200 },
201- "skinnable": true,
202+ "skinnable": false,
203 "config": {
204 "requires": [
205 "node",

Subscribers

People subscribed via source and target branches

to all changes: