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

Side by Side Diff: chrome/browser/resources/file_manager/css/gallery.css

Issue 10829421: First cut of the updated Photo Editor UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 3 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
OLDNEW
1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 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-family: Open Sans, Droid Sans Fallback, sans-serif; 7 font-family: Open Sans, Droid Sans Fallback, sans-serif;
8 font-size: 84%; 8 font-size: 84%;
9 margin: 0; 9 margin: 0;
10 } 10 }
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 } 430 }
431 431
432 .gallery[editing] .toolbar .ribbon { 432 .gallery[editing] .toolbar .ribbon {
433 opacity: 0; 433 opacity: 0;
434 } 434 }
435 435
436 .gallery .ribbon-image { 436 .gallery .ribbon-image {
437 -webkit-box-align: center; 437 -webkit-box-align: center;
438 -webkit-box-orient: horizontal; 438 -webkit-box-orient: horizontal;
439 -webkit-box-pack: center; 439 -webkit-box-pack: center;
440 -webkit-transition: margin-left 180ms linear; 440 -webkit-transition: all 180ms linear;
441 border: 2px solid rgba(255, 255, 255, 0); /* transparent white */ 441 border: 2px solid rgba(255, 255, 255, 0); /* transparent white */
442 cursor: pointer; 442 cursor: pointer;
443 display: -webkit-box; 443 display: -webkit-box;
444 height: 47px; 444 height: 47px;
445 margin: 2px; 445 margin: 2px;
446 overflow: hidden; 446 overflow: hidden;
447 width: 47px; 447 width: 47px;
448 } 448 }
449 449
450 .ribbon-image[vanishing='smooth'] {
451 border-left-width: 0;
452 border-right-width: 0;
453 margin-left: 0;
454 margin-right: 0;
455 width: 0;
456 }
457
450 .gallery .ribbon-image[selected] { 458 .gallery .ribbon-image[selected] {
451 border: 2px solid rgba(255, 233, 168, 1); 459 border: 2px solid rgba(255, 233, 168, 1);
452 } 460 }
453 461
454 .gallery .toolbar .ribbon.fade-left { 462 .gallery .toolbar .ribbon.fade-left {
455 -webkit-mask-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0) 0, 463 -webkit-mask-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0) 0,
456 rgba(0, 0, 0, 1) 40px); 464 rgba(0, 0, 0, 1) 40px);
457 } 465 }
458 466
459 .gallery .toolbar .ribbon.fade-right { 467 .gallery .toolbar .ribbon.fade-right {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 .gallery > .toolbar .button { 541 .gallery > .toolbar .button {
534 background-color: rgba(0, 0, 0, 0); 542 background-color: rgba(0, 0, 0, 0);
535 color: white; 543 color: white;
536 } 544 }
537 545
538 .gallery > .toolbar .button:hover { 546 .gallery > .toolbar .button:hover {
539 background-color: rgba(31, 31, 31, 1); 547 background-color: rgba(31, 31, 31, 1);
540 color: white; 548 color: white;
541 } 549 }
542 550
543 .gallery > .toolbar .button[pressed] { 551 .gallery > .toolbar .button:active,
544 background-color: rgba(240, 240, 240, 1); 552 .gallery > .toolbar .button[pressed],
545 color: black;
546 }
547
548 .gallery > .toolbar .button[pressed]:hover { 553 .gallery > .toolbar .button[pressed]:hover {
549 background-color: rgba(240, 240, 240, 1); 554 background-color: rgba(240, 240, 240, 1);
550 color: black; 555 color: black;
551 } 556 }
552 557
553 .gallery > .toolbar .button.autofix { 558 .gallery > .toolbar .button.autofix {
554 background-image: -webkit-image-set( 559 background-image: -webkit-image-set(
555 url('../images/gallery/icon_autofix.png') 1x, 560 url('../images/gallery/icon_autofix.png') 1x,
556 url('../images/gallery/2x/icon_autofix.png') 2x); 561 url('../images/gallery/2x/icon_autofix.png') 2x);
557 } 562 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 .gallery > .toolbar .button[disabled] { 631 .gallery > .toolbar .button[disabled] {
627 opacity: 0.5; 632 opacity: 0.5;
628 pointer-events: none; 633 pointer-events: none;
629 } 634 }
630 635
631 .gallery > .toolbar .button[hidden] { 636 .gallery > .toolbar .button[hidden] {
632 display: none; 637 display: none;
633 } 638 }
634 639
635 .gallery > .toolbar > .button { 640 .gallery > .toolbar > .button {
641 background-position: center;
642 padding: 0;
636 position: relative; 643 position: relative;
644 width: 40px;
637 z-index: 10; 645 z-index: 10;
638 } 646 }
639 647
640 .gallery > .toolbar > .button.grid { 648 .gallery[mode='slide'] > .toolbar > .button.mode {
641 background-image: -webkit-image-set( 649 background-image: -webkit-image-set(
642 url('../images/gallery/icon_edit.png') 1x, 650 url('../images/gallery/icon_mosaic.png') 1x);
643 url('../images/gallery/2x/icon_edit.png') 2x);
644 } 651 }
645 652
646 .gallery > .toolbar > .button.grid[pressed] { 653 .gallery[mode='slide'] > .toolbar > .button.mode:active {
647 background-image: -webkit-image-set( 654 background-image: -webkit-image-set(
648 url('../images/gallery/icon_edit_selected.png') 1x, 655 url('../images/gallery/icon_mosaic_selected.png') 1x);
649 url('../images/gallery/2x/icon_edit_selected.png') 2x); 656 }
657
658 .gallery[mode='grid'] > .toolbar > .button.mode {
659 background-image: -webkit-image-set(
660 url('../images/gallery/icon_1up.png') 1x);
661 }
662
663 .gallery[mode='grid'] > .toolbar > .button.mode:active {
664 background-image: -webkit-image-set(
665 url('../images/gallery/icon_1up_selected.png') 1x);
666 }
667
668 .gallery > .toolbar > .button.slideshow {
669 background-image: -webkit-image-set(
670 url('../images/gallery/icon_slideshow.png') 1x);
671 }
672
673 .gallery > .toolbar > .button.slideshow:active,
674 .gallery > .toolbar > .button.slideshow[pressed] {
675 background-image: -webkit-image-set(
676 url('../images/gallery/icon_slideshow_selected.png') 1x);
677 }
678
679 .gallery > .toolbar > .button.delete {
680 background-image: -webkit-image-set(
681 url('../images/gallery/icon_delete.png') 1x);
682 }
683
684 .gallery > .toolbar > .button.delete:active {
685 background-image: -webkit-image-set(
686 url('../images/gallery/icon_delete_selected.png') 1x);
650 } 687 }
651 688
652 .gallery > .toolbar > .button.edit { 689 .gallery > .toolbar > .button.edit {
653 background-image: -webkit-image-set( 690 background-image: -webkit-image-set(
654 url('../images/gallery/icon_edit.png') 1x, 691 url('../images/gallery/icon_edit.png') 1x,
655 url('../images/gallery/2x/icon_edit.png') 2x); 692 url('../images/gallery/2x/icon_edit.png') 2x);
656 } 693 }
657 694
695 .gallery > .toolbar > .button.edit:active,
658 .gallery > .toolbar > .button.edit[pressed] { 696 .gallery > .toolbar > .button.edit[pressed] {
659 background-image: -webkit-image-set( 697 background-image: -webkit-image-set(
660 url('../images/gallery/icon_edit_selected.png') 1x, 698 url('../images/gallery/icon_edit_selected.png') 1x,
661 url('../images/gallery/2x/icon_edit_selected.png') 2x); 699 url('../images/gallery/2x/icon_edit_selected.png') 2x);
662 } 700 }
663 701
664 .gallery > .toolbar > .button.share { 702 .gallery > .toolbar > .button.share {
665 background-image: -webkit-image-set( 703 background-image: -webkit-image-set(
666 url('../images/gallery/icon_share.png') 1x, 704 url('../images/gallery/icon_share.png') 1x,
667 url('../images/gallery/2x/icon_share.png') 2x); 705 url('../images/gallery/2x/icon_share.png') 2x);
668 } 706 }
669 707
670 .gallery > .toolbar > .button.share[pressed] { 708 .gallery > .toolbar > .button.share:hover {
671 background-image: -webkit-image-set( 709 background-color: rgba(31, 31, 31, 1);
672 url('../images/gallery/icon_share_selected.png') 1x,
673 url('../images/gallery/2x/icon_share_selected.png') 2x);
674 } 710 }
675 711
676 .gallery[error] > .toolbar .button.edit, 712 .gallery[error] > .toolbar .button.edit,
677 .gallery[error] > .toolbar .button.share { 713 .gallery[error] > .toolbar .button.share {
678 opacity: 0.7; 714 opacity: 0.7;
679 pointer-events: none; 715 pointer-events: none;
680 } 716 }
681 717
682 .gallery > .toolbar > .button:last-child { 718 .gallery > .toolbar > .button:last-child {
683 margin-right: 8px; 719 margin-right: 8px;
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 .gallery .video-controls { 1074 .gallery .video-controls {
1039 display: none; 1075 display: none;
1040 max-width: 800px; 1076 max-width: 800px;
1041 } 1077 }
1042 1078
1043 .gallery[video] .video-controls { 1079 .gallery[video] .video-controls {
1044 -webkit-box-flex: 1; 1080 -webkit-box-flex: 1;
1045 display: -webkit-box; 1081 display: -webkit-box;
1046 } 1082 }
1047 1083
1048 .gallery[video] > .toolbar .button.edit,
1049 .gallery[video] > .toolbar .edit-bar { 1084 .gallery[video] > .toolbar .edit-bar {
1050 display: none; 1085 display: none;
1051 } 1086 }
1052 1087
1053 @media print { 1088 .thumbnail-grid {
1054 .image-container > .image { 1089 bottom: 56px; /* Avoid overlapping with the toolbar. */
1055 left: 0 !important; 1090 left: 0;
1056 max-height: 100%; 1091 overflow-y: auto;
1057 max-width: 100%; 1092 position: absolute;
1058 object-fit: contain; 1093 right: 0;
1059 top: 0 !important; 1094 top: 56px; /* Same as bottom. */
1060 } 1095 }
1061 1096
1062 .gallery .tool { 1097 .thumbnail-grid::-webkit-scrollbar {
1063 opacity: 0 !important; 1098 background: black;
1064 }
1065 } 1099 }
1100
1101 .thumbnail-grid::-webkit-scrollbar-thumb {
1102 background: rgb(31, 31, 31);
1103 }
1104
1105 .thumbnail-item {
1106 background-color: rgba(0, 0, 0, 0) !important;
1107 background-image: none !important;
1108 border: none !important;
1109 height: 184px;
1110 margin-left: 8px;
1111 margin-top: 7px;
1112 overflow: hidden;
1113 padding: 0;
1114 width: 244px;
1115 }
1116
1117 .thumbnail-item .img-container {
1118 border: 2px solid transparent; /* Make room for the img border */
1119 bottom: 0;
1120 left: 0;
1121 position: absolute;
1122 right: 0;
1123 top: 0;
1124 }
1125
1126 /* Smaller box around the generic icon. */
1127 .thumbnail-item .img-container[generic-thumbnail] {
1128 bottom: 25px;
1129 left: 55px;
1130 right: 55px;
1131 top: 25px;
1132 }
1133
1134 .thumbnail-item[selected] .img-container[generic-thumbnail],
1135 .thumbnail-item:hover .img-container[generic-thumbnail] {
1136 border-color: rgb(51, 153, 255);
1137 }
1138
1139 .thumbnail-item img {
1140 -webkit-user-drag: none;
1141 border: 2px solid transparent;
1142 box-sizing: border-box;
1143 position: absolute;
1144 }
1145
1146 .thumbnail-item[selected] img,
1147 .thumbnail-item:hover img {
1148 outline: 2px solid rgb(51, 153, 255);
1149 }
1150
1151 .gallery:not([mode='grid']) .thumbnail-grid,
1152 .gallery:not([mode='slide']) .image-container,
1153 .gallery:not([mode='slide']) .ribbon,
1154 .gallery:not([mode='slide']) .arrow-box {
1155 opacity: 0;
1156 pointer-events: none;
1157 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/resources/file_manager/gallery.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698