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

Side by Side Diff: ui/file_manager/gallery/css/gallery.css

Issue 1167533004: Move overwrite original checkbox and saved label to bottom toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « no previous file | ui/file_manager/gallery/gallery.html » ('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) 2014 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2014 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 body { 5 body {
6 -webkit-user-select: none; 6 -webkit-user-select: none;
7 font-size: 84%; 7 font-size: 84%;
8 margin: 0; 8 margin: 0;
9 } 9 }
10 10
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } 149 }
150 } 150 }
151 151
152 /* Toolbar */ 152 /* Toolbar */
153 153
154 .gallery > .header, 154 .gallery > .header,
155 .gallery > .toolbar { 155 .gallery > .toolbar {
156 -webkit-box-align: stretch; 156 -webkit-box-align: stretch;
157 -webkit-box-orient: horizontal; 157 -webkit-box-orient: horizontal;
158 -webkit-box-pack: start; 158 -webkit-box-pack: start;
159 background-color: rgba(30, 30, 30, 0.8);
160 display: flex; 159 display: flex;
161 left: 0; 160 left: 0;
162 opacity: 0; 161 opacity: 0;
163 padding: 0 10px; 162 padding: 0 10px;
164 pointer-events: none; 163 pointer-events: none;
165 position: absolute; 164 position: absolute;
166 right: 0; 165 right: 0;
167 transition: opacity 300ms ease; 166 transition: opacity 300ms ease;
168 } 167 }
169 168
170 .gallery > .header { 169 .gallery > .header {
171 -webkit-app-region: drag; 170 -webkit-app-region: drag;
172 -webkit-box-align: center; 171 -webkit-box-align: center;
173 -webkit-box-pack: end; 172 -webkit-box-pack: end;
173 background-color: rgba(30, 30, 30, 0.8);
174 border-bottom: 1px solid rgba(50, 50, 50, 0.8); 174 border-bottom: 1px solid rgba(50, 50, 50, 0.8);
175 display: -webkit-box; 175 display: -webkit-box;
176 height: 45px; 176 height: 45px;
177 top: 0; 177 top: 0;
178 } 178 }
179 179
180 .gallery > .toolbar {
181 background-color: rgba(40, 42, 45, 0.9);
182 }
183
180 .gallery .header button { 184 .gallery .header button {
181 -webkit-app-region: no-drag; 185 -webkit-app-region: no-drag;
182 } 186 }
183 187
184 .gallery > .toolbar { 188 .gallery > .toolbar {
185 border-top: 1px solid rgba(50, 50, 50, 0.8); 189 border-top: 1px solid rgba(50, 50, 50, 0.8);
186 height: 55px; 190 height: 55px;
187 overflow: hidden; 191 overflow: hidden;
188 } 192 }
189 193
190 .gallery > .toolbar.top { 194 .gallery > .toolbar.top {
191 top: 45px; /* Header height. */ 195 top: 45px; /* Header height. */
192 } 196 }
193 197
194 .gallery > .toolbar.bottom { 198 .gallery > .toolbar.bottom {
195 bottom: 0; 199 bottom: 0;
196 } 200 }
197 201
202 .gallery > .toolbar.bottom > .slide-mode-toolbar {
203 left: 0;
204 opacity: 1;
205 position: absolute;
206 visibility: visible;
207 width: 100%;
208 }
209
210 .gallery > .toolbar.bottom > .edit-mode-toolbar {
211 left: 0;
212 opacity: 0;
213 position: absolute;
214 visibility: hidden;
215 width: 100%;
216 }
217
218 .gallery[editing] > .toolbar.bottom > .slide-mode-toolbar {
219 opacity: 0;
220 visibility: hidden;
221 }
222
223 .gallery[editing] > .toolbar.bottom > .edit-mode-toolbar {
224 opacity: 1;
225 visibility: visible;
226 }
227
198 .gallery[tools]:not([slideshow]) > .header, 228 .gallery[tools]:not([slideshow]) > .header,
199 .gallery[tools]:not([slideshow]) > .toolbar { 229 .gallery[tools]:not([slideshow]) > .toolbar {
200 opacity: 1; 230 opacity: 1;
201 pointer-events: auto; 231 pointer-events: auto;
202 } 232 }
203 233
204 /* Hide immediately when entering the slideshow. */ 234 /* Hide immediately when entering the slideshow. */
205 .gallery[tools][slideshow] > .toolbar { 235 .gallery[tools][slideshow] > .toolbar {
206 transition-duration: 0ms; 236 transition-duration: 0ms;
207 } 237 }
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 outline: none; 355 outline: none;
326 overflow: hidden; 356 overflow: hidden;
327 padding: 0 3px; 357 padding: 0 3px;
328 position: absolute; 358 position: absolute;
329 text-overflow: ellipsis; 359 text-overflow: ellipsis;
330 top: 15px; 360 top: 15px;
331 white-space: nowrap; 361 white-space: nowrap;
332 width: 100%; 362 width: 100%;
333 } 363 }
334 364
335 .gallery[editing] .filename-spacer .namebox {
336 height: 21px;
337 top: 5px;
338 }
339
340 .gallery .filename-spacer .namebox[disabled] { 365 .gallery .filename-spacer .namebox[disabled] {
341 -webkit-user-select: none; 366 -webkit-user-select: none;
342 cursor: default; 367 cursor: default;
343 } 368 }
344 369
345 .gallery .filename-spacer .namebox:not([disabled]):not(:focus):hover { 370 .gallery .filename-spacer .namebox:not([disabled]):not(:focus):hover {
346 background-color: rgba(48, 48, 48, 1.0); 371 background-color: rgba(48, 48, 48, 1.0);
347 } 372 }
348 373
349 .gallery .filename-spacer .namebox:focus { 374 .gallery .filename-spacer .namebox:focus {
350 background-color: white; 375 background-color: white;
351 color: black; 376 color: black;
352 cursor: text; 377 cursor: text;
353 } 378 }
354 379
355 .gallery .filename-spacer .options {
356 -webkit-box-align: center;
357 -webkit-box-orient: horizontal;
358 -webkit-box-pack: start;
359 display: -webkit-box;
360 height: 0;
361 opacity: 0;
362 top: 50px;
363 visibility: hidden;
364 }
365
366 .gallery[editing] .filename-spacer .options {
367 height: auto;
368 opacity: 1;
369 top: 28px;
370 visibility: visible;
371 }
372
373 .gallery .filename-spacer .saved,
374 .gallery .filename-spacer .overwrite-original {
375 cursor: inherit;
376 font-size: 90%;
377 margin-left: 3px;
378 margin-right: 18px;
379 opacity: 0;
380 pointer-events: none;
381 transition: all linear 120ms;
382 }
383
384 .gallery[editing] .filename-spacer .saved {
385 color: white;
386 opacity: 0.5;
387 }
388
389 .gallery[editing] .filename-spacer .overwrite-original,
390 .gallery[editing] .filename-spacer .overwrite-original > * {
391 cursor: pointer;
392 opacity: 1;
393 pointer-events: auto;
394 }
395
396 .gallery[editing] .overwrite-original[disabled] {
397 opacity: 0.5;
398 }
399
400 .gallery[editing] .overwrite-original[disabled],
401 .gallery[editing] .overwrite-original[disabled] > * {
402 cursor: default;
403 pointer-events: none;
404 }
405
406 .gallery .filename-spacer .saved[highlighted] {
407 transform: scaleX(1.1) scaleY(1.1) rotate(0);
408 opacity: 1;
409 }
410
411 /* Bubble */ 380 /* Bubble */
412 381
413 .gallery .toolbar .bubble { 382 .gallery .toolbar .bubble {
414 bottom: 65px; 383 bottom: 65px;
415 font-size: 85%; 384 font-size: 85%;
416 left: 50px; 385 left: 50px;
417 position: absolute; 386 position: absolute;
418 width: 220px; 387 width: 220px;
419 } 388 }
420 389
421 .gallery:not([editing]) .toolbar .bubble { 390 .gallery:not([editing]) .toolbar .bubble {
422 display: none; 391 display: none;
423 } 392 }
424 393
425 /* Middle spacer */ 394 /* Middle spacer */
426 395
427 .gallery .middle-spacer { 396 .gallery .middle-spacer {
428 align-items: center; 397 align-items: center;
429 display: flex; 398 display: flex;
430 flex: 1 0 auto; 399 flex: 1 0 auto;
431 flex-direction: column; 400 flex-direction: column;
432 } 401 }
433 402
434 /* Toolbar buttons */ 403 /* Toolbar buttons */
435 404
436 .gallery .button-spacer { 405 .gallery .button-spacer {
406 align-items: center;
437 display: flex; 407 display: flex;
438 flex: none; 408 flex: none;
439 justify-content: flex-end; 409 justify-content: flex-end;
440 width: 252px; /* 42px button x 6 */ 410 width: 252px; /* 42px button x 6 */
441 } 411 }
442 412
443 /* Thumbnails */ 413 /* Thumbnails */
444 414
445 .gallery .ribbon-spacer { 415 .gallery .ribbon-spacer {
446 height: 55px; 416 height: 55px;
447 margin-bottom: -55px;
448 } 417 }
449 418
450 .gallery .toolbar .ribbon { 419 .gallery .toolbar .ribbon {
451 height: 100%; 420 height: 100%;
421 margin: 0 auto;
452 overflow: hidden; 422 overflow: hidden;
453 transition: opacity 180ms linear, visibility 0ms linear; 423 transition: opacity 180ms linear, visibility 0ms linear;
454 white-space: nowrap; 424 white-space: nowrap;
455 z-index: 0; 425 z-index: 0;
456 } 426 }
457 427
458 .gallery[editing] .toolbar .ribbon { 428 .gallery[editing] .toolbar .ribbon {
459 opacity: 0; 429 opacity: 0;
460 transition-delay: 0ms, 180ms; 430 transition-delay: 0ms, 180ms;
461 visibility: hidden; 431 visibility: hidden;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 } 481 }
512 482
513 .gallery .image-wrapper > img { 483 .gallery .image-wrapper > img {
514 position: absolute; 484 position: absolute;
515 } 485 }
516 486
517 .gallery .image-wrapper > img:not(.cached) { 487 .gallery .image-wrapper > img:not(.cached) {
518 -webkit-animation: fadeIn 500ms ease-in; 488 -webkit-animation: fadeIn 500ms ease-in;
519 } 489 }
520 490
521 /* Editor buttons */ 491 /* Editor toolbar. */
522 492
523 .gallery .edit-bar-spacer { 493 .gallery .edit-mode-toolbar .options {
524 -webkit-box-align: center; 494 align-items: center;
525 -webkit-box-orient: horizontal; 495 display: flex;
526 -webkit-box-pack: center;
527 display: -webkit-box;
528 height: 100%; 496 height: 100%;
529 left: 280px; 497 left: 0;
530 opacity: 0; 498 opacity: 0;
531 right: 280px; 499 position: absolute;
500 visibility: hidden;
501 }
502
503 .gallery .edit-mode-toolbar .edit-bar-spacer {
504 display: block;
505 height: 100%;
506 opacity: 0;
532 transition: opacity 180ms linear, visibility 0ms linear 180ms; 507 transition: opacity 180ms linear, visibility 0ms linear 180ms;
533 visibility: hidden; 508 visibility: hidden;
534 margin-bottom: -55px;
535 } 509 }
536 510
511 .gallery[editing] .edit-mode-toolbar .options {
512 opacity: 1;
513 visibility: visible;
514 }
515
516 .gallery .edit-mode-toolbar .saved,
517 .gallery .edit-mode-toolbar .overwrite-original {
518 cursor: inherit;
519 font-size: 90%;
520 opacity: 0;
521 pointer-events: none;
522 transition: all linear 120ms;
523 }
524
525 .gallery .edit-mode-toolbar .overwrite-original {
526 margin-left: 16px;
527 }
528
529 .gallery .edit-mode-toolbar .saved {
530 margin-left: 14px;
531 }
532
533 .gallery .edit-mode-toolbar .overwrite-original > input {
534 float: left;
mtomasz 2015/06/02 10:59:20 nit: Please confirm that the new UI renders correc
yawano 2015/06/02 11:37:34 Thank you for the catch! It didn't work in RTL. I
535 margin: 1px 0;
536 }
537
538 .gallery .edit-mode-toolbar .overwrite-original > .label {
539 color: white;
540 float: left;
541 margin-left: 8px;
542 }
543
544 .gallery[editing] .edit-mode-toolbar .saved {
545 color: white;
546 opacity: 0.5;
547 }
548
549 .gallery[editing] .edit-mode-toolbar .overwrite-original,
550 .gallery[editing] .edit-mode-toolbar .overwrite-original > * {
551 cursor: pointer;
552 opacity: 1;
553 pointer-events: auto;
554 }
555
556 .gallery[editing] .overwrite-original[disabled] {
557 opacity: 0.5;
558 }
559
560 .gallery[editing] .overwrite-original[disabled],
561 .gallery[editing] .overwrite-original[disabled] > * {
562 cursor: default;
563 pointer-events: none;
564 }
565
566 .gallery .edit-mode-toolbar .saved[highlighted] {
567 transform: scaleX(1.1) scaleY(1.1) rotate(0);
568 opacity: 1;
569 }
570
571 /* Editor buttons. */
572
537 .gallery .toolbar .edit-main { 573 .gallery .toolbar .edit-main {
538 -webkit-box-orient: horizontal; 574 align-items: center;
539 -webkit-box-pack: center;
540 color: white; 575 color: white;
541 display: -webkit-box; 576 display: flex;
542 height: 55px; 577 height: 55px;
578 justify-content: center;
543 overflow: visible; 579 overflow: visible;
544 } 580 }
545 581
546 .gallery[editing] .edit-bar-spacer { 582 .gallery[editing] .edit-bar-spacer {
547 opacity: 1.0; 583 opacity: 1.0;
548 pointer-events: auto; 584 pointer-events: auto;
549 transition-delay: 100ms, 100ms; 585 transition-delay: 100ms, 100ms;
550 visibility: visible; 586 visibility: visible;
551 } 587 }
552 588
(...skipping 12 matching lines...) Expand all
565 flex: none; 601 flex: none;
566 opacity: 0.99; /* Workaround for http://crosbug.com/21065 */ 602 opacity: 0.99; /* Workaround for http://crosbug.com/21065 */
567 padding: 1px; /* Instead of a border. */ 603 padding: 1px; /* Instead of a border. */
568 position: relative; 604 position: relative;
569 z-index: 10; 605 z-index: 10;
570 } 606 }
571 607
572 .gallery .header button, 608 .gallery .header button,
573 .gallery .toolbar button { 609 .gallery .toolbar button {
574 height: 40px; 610 height: 40px;
575 margin: 6px 0;
576 min-width: 40px; /* Reset. */ 611 min-width: 40px; /* Reset. */
577 width: 40px; 612 width: 40px;
578 } 613 }
579 614
615 .gallery .header button {
616 margin: 6px 0;
617 }
618
580 .gallery .toolbar button:focus { 619 .gallery .toolbar button:focus {
581 z-index: 11; 620 z-index: 11;
582 } 621 }
583 622
584 /* By default, labels are hidden. */ 623 /* By default, labels are hidden. */
585 .gallery > .toolbar button span { 624 .gallery > .toolbar button span {
586 display: none; 625 display: none;
587 } 626 }
588 627
589 /* Show labels if there is enough space. */ 628 /* Show labels if there is enough space. */
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 background-color: rgba(255, 0, 0, 0.3); 1406 background-color: rgba(255, 0, 0, 0.3);
1368 } 1407 }
1369 1408
1370 .debug-me .load-target-external-metadata::before { 1409 .debug-me .load-target-external-metadata::before {
1371 background-color: rgba(0, 255, 0, 0.3); 1410 background-color: rgba(0, 255, 0, 0.3);
1372 } 1411 }
1373 1412
1374 .debug-me .load-target-file-entry::before { 1413 .debug-me .load-target-file-entry::before {
1375 background-color: rgba(0, 0, 255, 0.3); 1414 background-color: rgba(0, 0, 255, 0.3);
1376 } 1415 }
OLDNEW
« no previous file with comments | « no previous file | ui/file_manager/gallery/gallery.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698