Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/browser/resources/chromeos/wallpaper_manager/css/wallpaper_manager.css

Issue 12042095: Move wallpaper progress bar on top of thumbnails (completely remove butter bar) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/wallpaper_manager/js/butter_bar.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. */ 3 * found in the LICENSE file. */
4 4
5 html { 5 html {
6 height: 100%; 6 height: 100%;
7 } 7 }
8 8
9 body { 9 body {
10 background-color: rgba(20, 20, 20, 0.93); 10 background-color: rgba(20, 20, 20, 0.93);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #categories-list > li > div { 66 #categories-list > li > div {
67 line-height: 34px; 67 line-height: 34px;
68 padding: 0 10px; 68 padding: 0 10px;
69 } 69 }
70 70
71 #categories-list > li[selected] > div { 71 #categories-list > li[selected] > div {
72 color: #eee; 72 color: #eee;
73 } 73 }
74 74
75 #close { 75 #close {
76 margin-top: 5px; 76 background-image: -webkit-image-set(
77 opacity: 0.5; 77 url('../images/ui/close-white.png') 1x,
78 url('../images/ui/2x/close-white.png') 2x);
79 height: 14px;
80 position: absolute;
81 right: 10px;
82 top: 10px;
83 width: 14px
78 } 84 }
79 85
80 #close:hover { 86 #close:hover {
81 opacity: 0.7; 87 background-image: -webkit-image-set(
88 url('../images/ui/close-white-hover.png') 1x,
89 url('../images/ui/2x/close-white-hover.png') 2x);
82 } 90 }
83 91
84 #bar { 92 #bar {
85 -webkit-transition: left 130ms ease-in-out; 93 -webkit-transition: left 130ms ease-in-out;
86 background-color: #eee; 94 background-color: #eee;
87 height: 4px; 95 height: 4px;
88 position: absolute; 96 position: absolute;
89 top: 0; 97 top: 0;
90 } 98 }
91 99
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 position: relative; 153 position: relative;
146 width: 108px; 154 width: 108px;
147 } 155 }
148 156
149 .image-picker [role=listitem]:hover { 157 .image-picker [role=listitem]:hover {
150 outline: 3px solid #f1f1f1; 158 outline: 3px solid #f1f1f1;
151 z-index: 1; 159 z-index: 1;
152 } 160 }
153 161
154 .image-picker .check { 162 .image-picker .check {
155 left: 3px; 163 background-image: -webkit-image-set(
164 url('../images/ui/check.png') 1x,
165 url('../images/ui/2x/check.png') 2x);
166 height: 32px;
167 left: 38px;
156 position: absolute; 168 position: absolute;
157 top: 49px; 169 top: 18px;
158 } 170 width: 32px;
159
160 .image-picker [active] .check {
161 background-image: url('../images/ui/check.png');
162 height: 15px;
163 width: 20px;
164 z-index: 3; 171 z-index: 3;
165 } 172 }
166 173
167
168 ::-webkit-scrollbar { 174 ::-webkit-scrollbar {
169 width: 6px; 175 width: 6px;
170 } 176 }
171 177
172 ::-webkit-scrollbar-thumb { 178 ::-webkit-scrollbar-thumb {
173 background: #aaa; 179 background: #aaa;
174 } 180 }
175 181
176 ::-webkit-scrollbar-thumb:hover { 182 ::-webkit-scrollbar-thumb:hover {
177 background: #888; 183 background: #888;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 -webkit-box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2); 233 -webkit-box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
228 height: 80px; 234 height: 80px;
229 width: 128px; 235 width: 128px;
230 } 236 }
231 237
232 /* [hidden] does display:none, but its priority is too low. */ 238 /* [hidden] does display:none, but its priority is too low. */
233 [hidden] { 239 [hidden] {
234 display: none !important; 240 display: none !important;
235 } 241 }
236 242
237 /* The butter bar styles are copied from file_manager.css. We will revisit 243 .progress-bar {
238 * it to see if we can share some code after butter bar is integrated with 244 background-color: rgba(255, 255, 255, 0.7);
239 * Photo Editor. 245 height: 6px;
240 * See http://codereview.chromium.org/10916149/ for details.
241 */
242 /* TODO(bshe): Remove these styles if we can share code with file manager. */
243 #butter-bar-container {
244 -webkit-box-pack: center;
245 display: -webkit-box;
246 left: 0;
247 pointer-events: none;
248 position: absolute; 246 position: absolute;
249 top: 0; 247 top: 62px;
250 width: 100%; 248 width: 100%;
251 z-index: 3;
252 }
253
254 #butter-bar {
255 -webkit-box-align: end;
256 -webkit-box-orient: horizontal;
257 -webkit-transition: opacity 300ms;
258 background-color: #e3e3e3;
259 color: #222;
260 display: -webkit-box;
261 max-width: 340px;
262 min-width: 40px;
263 padding: 0 1em;
264 pointer-events: auto;
265 top: 1px;
266 width: 30%;
267 z-index: 2;
268 }
269
270 #butter-bar:not(.visible) {
271 opacity: 0;
272 pointer-events: none;
273 }
274
275 #butter-bar .content {
276 -webkit-box-flex: 1;
277 overflow: hidden;
278 padding-bottom: 4px;
279 padding-top: 4px;
280 }
281
282 #butter-bar .actions {
283 -webkit-box-orient: horizontal;
284 -webkit-box-pack: end;
285 display: -webkit-box;
286 height: 20px;
287 }
288
289 #butter-bar .actions a {
290 background: center center no-repeat;
291 background-image: -webkit-image-set(
292 url('../images/ui/close_bar.png') 1x,
293 url('../images/ui/2x/close_bar.png') 2x);
294 display: inline-block;
295 height: 12px;
296 padding: 4px 2px;
297 width: 12px;
298 }
299
300 #butter-bar .actions a:first-child {
301 margin-left: 2px;
302 }
303
304 #butter-bar .actions a:last-child {
305 margin-right: -2px; /* Overlap the padding with butter-bar padding. */
306 }
307
308 #butter-bar.error {
309 background-color: rgb(236, 207, 203);
310 border: 1px solid rgba(221, 75, 57, 0.5);
311 border-radius: 2px;
312 padding: 2px 1em;
313 }
314
315 .progress-bar {
316 -webkit-box-flex: 1;
317 border: 1px solid #999;
318 margin-bottom: 2px;
319 margin-top: 3px;
320 padding: 1px;
321 } 249 }
322 250
323 .progress-track { 251 .progress-track {
324 -webkit-animation-duration: 800ms; 252 -webkit-transition: width 1ms linear;
325 -webkit-animation-iteration-count: infinite; 253 background-color: rgb(66, 129, 244);
326 -webkit-animation-name: bg; 254 height: 100%;
327 -webkit-animation-timing-function: linear; 255 width: 0;
328 background-color: #ccc;
329 background-image: -webkit-linear-gradient(315deg, transparent,
330 transparent 33%, rgba(0, 0, 0, 0.12) 33%, rgba(0, 0, 0, 0.12) 66%,
331 transparent 66%, transparent);
332 background-position: 0 0;
333 background-repeat: repeat-x;
334 background-size: 16px 8px;
335 height: 5px;
336 } 256 }
337
338 @-webkit-keyframes bg {
339 0% { background-position: 0 0; }
340 100% { background-position: -16px 0; }
341 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/wallpaper_manager/js/butter_bar.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698