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

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

Issue 1142303007: Gallery: Replace buttons in top toolbar with paper-button and new icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix integration tests. 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 25 matching lines...) Expand all
36 .gallery .content { 36 .gallery .content {
37 bottom: 0; 37 bottom: 0;
38 left: 0; 38 left: 0;
39 overflow: hidden; 39 overflow: hidden;
40 position: absolute; 40 position: absolute;
41 right: 0; 41 right: 0;
42 top: 0; 42 top: 0;
43 } 43 }
44 44
45 /* Common background for both mosaic and slide mode. */ 45 /* Common background for both mosaic and slide mode. */
46 .gallery .content { 46 .gallery > .content {
47 background-color: black; 47 background-color: black;
48 } 48 }
49 49
50 /* Image container and canvas elements */ 50 /* Image container and canvas elements */
51 51
52 .gallery .image-container { 52 .gallery .image-container {
53 cursor: none; /* Only visible when the toolbar is active */ 53 cursor: none; /* Only visible when the toolbar is active */
54 height: 100%; 54 height: 100%;
55 position: absolute; 55 position: absolute;
56 width: 100%; 56 width: 100%;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 } 150 }
151 } 151 }
152 152
153 /* Toolbar */ 153 /* Toolbar */
154 154
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(40, 42, 45, 0.9); 159 background-color: rgba(40, 42, 45, 0.9);
160 border-top: 1px solid rgba(50, 50, 50, 0.8);
161 display: flex; 160 display: flex;
162 height: 55px; 161 height: 48px;
163 left: 0; 162 left: 0;
164 opacity: 0; 163 opacity: 0;
165 overflow: hidden; 164 overflow: hidden;
166 padding: 0 10px; 165 padding: 0;
167 pointer-events: none; 166 pointer-events: none;
168 position: absolute; 167 position: absolute;
169 right: 0; 168 right: 0;
170 transition: opacity 300ms ease; 169 transition: opacity 300ms ease;
171 } 170 }
172 171
173 .gallery > .toolbar.top { 172 .gallery > .toolbar.top {
174 top: 0; 173 top: 0;
175 } 174 }
176 175
177 .gallery > .toolbar.bottom { 176 .gallery > .toolbar.bottom {
178 bottom: 0; 177 bottom: 0;
178 height: 55px;
179 } 179 }
180 180
181 .gallery > .toolbar.bottom > .slide-mode-toolbar { 181 .gallery > .toolbar.bottom > .slide-mode-toolbar {
182 left: 0; 182 left: 0;
183 opacity: 1; 183 opacity: 1;
184 position: absolute; 184 position: absolute;
185 visibility: visible; 185 visibility: visible;
186 width: 100%; 186 width: 100%;
187 } 187 }
188 188
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 pointer-events: none; 296 pointer-events: none;
297 } 297 }
298 298
299 .gallery[tools][editing] [dimmed] { 299 .gallery[tools][editing] [dimmed] {
300 opacity: 0.2; 300 opacity: 0.2;
301 } 301 }
302 302
303 /* Filename */ 303 /* Filename */
304 304
305 .gallery .filename-spacer { 305 .gallery .filename-spacer {
306 -webkit-margin-start: 16px;
306 flex: 1 0 auto; 307 flex: 1 0 auto;
307 height: 100%; 308 height: 100%;
308 min-width: 140px; 309 min-width: 140px;
309 overflow: hidden; 310 overflow: hidden;
310 position: relative; 311 position: relative;
311 } 312 }
312 313
313 .gallery .filename-spacer > * { 314 .gallery .filename-spacer > * {
314 background-color: transparent; 315 background-color: transparent;
315 overflow: hidden; 316 overflow: hidden;
(...skipping 12 matching lines...) Expand all
328 box-sizing: border-box; 329 box-sizing: border-box;
329 cursor: pointer; 330 cursor: pointer;
330 display: block; 331 display: block;
331 font-size: 120%; 332 font-size: 120%;
332 height: 22px; 333 height: 22px;
333 outline: none; 334 outline: none;
334 overflow: hidden; 335 overflow: hidden;
335 padding: 0 3px; 336 padding: 0 3px;
336 position: absolute; 337 position: absolute;
337 text-overflow: ellipsis; 338 text-overflow: ellipsis;
338 top: 15px; 339 top: 13px;
339 white-space: nowrap; 340 white-space: nowrap;
340 width: 100%; 341 width: 100%;
341 } 342 }
342 343
343 .gallery .filename-spacer .namebox[disabled] { 344 .gallery .filename-spacer .namebox[disabled] {
344 -webkit-user-select: none; 345 -webkit-user-select: none;
345 cursor: default; 346 cursor: default;
346 } 347 }
347 348
348 .gallery .filename-spacer .namebox:not([disabled]):not(:focus):hover { 349 .gallery .filename-spacer .namebox:not([disabled]):not(:focus):hover {
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 .gallery > .toolbar button[disabled], 724 .gallery > .toolbar button[disabled],
724 .gallery[tools][locked] > .toolbar button { 725 .gallery[tools][locked] > .toolbar button {
725 opacity: 0.5; 726 opacity: 0.5;
726 pointer-events: none; 727 pointer-events: none;
727 } 728 }
728 729
729 .gallery > .toolbar button[hidden] { 730 .gallery > .toolbar button[hidden] {
730 display: none; 731 display: none;
731 } 732 }
732 733
733 .gallery[mode='slide'] > .toolbar button.mode { 734 .gallery > .toolbar paper-button {
734 background-image: -webkit-image-set( 735 background-position: center;
735 url(../images/100/icon_mosaic.png) 1x, 736 background-repeat: no-repeat;
736 url(../images/200/icon_mosaic.png) 2x); 737 height: 32px;
738 margin: 0 8px;
739 min-width: 32px;
740 width: 32px;
737 } 741 }
738 742
739 .gallery[mode='slide'] > .toolbar button.mode:active { 743 /* Since currently Gallery does not use shadow dom with Polymer, ::shadow
740 background-image: -webkit-image-set( 744 * selector does not work correctly. */
741 url(../images/100/icon_mosaic_selected.png) 1x, 745 .gallery > .toolbar paper-button::shadow paper-ripple,
742 url(../images/200/icon_mosaic_selected.png) 2x); 746 .gallery > .toolbar paper-button > paper-ripple {
747 color: white;
743 } 748 }
744 749
745 .gallery[mode='mosaic'] > .toolbar button.mode { 750 .gallery > .toolbar paper-button.edit {
746 background-image: -webkit-image-set( 751 background-image: -webkit-image-set(
747 url(../images/100/icon_1up.png) 1x, 752 url(../images/100/edit.png) 1x,
748 url(../images/200/icon_1up.png) 2x); 753 url(../images/200/edit.png) 2x);
749 } 754 }
750 755
751 .gallery[mode='mosaic'] > .toolbar button.mode:active { 756 .gallery > .toolbar paper-button.print {
752 background-image: -webkit-image-set( 757 background-image: -webkit-image-set(
753 url(../images/100/icon_1up_selected.png) 1x, 758 url(../images/100/print.png) 1x,
754 url(../images/200/icon_1up_selected.png) 2x); 759 url(../images/200/print.png) 2x);
755 } 760 }
756 761
757 .gallery > .toolbar button.slideshow { 762 .gallery > .toolbar paper-button.delete {
758 background-image: -webkit-image-set( 763 background-image: -webkit-image-set(
759 url(../images/100/icon_slideshow.png) 1x, 764 url(../images/100/delete.png) 1x,
760 url(../images/200/icon_slideshow.png) 2x); 765 url(../images/200/delete.png) 2x);
761 } 766 }
762 767
763 .gallery > .toolbar button.slideshow:active, 768 .gallery > .toolbar paper-button.slide-mode {
764 .gallery > .toolbar button.slideshow[pressed] {
765 background-image: -webkit-image-set( 769 background-image: -webkit-image-set(
766 url(../images/100/icon_slideshow_selected.png) 1x, 770 url(../images/100/slide_view.png) 1x,
767 url(../images/200/icon_slideshow_selected.png) 2x); 771 url(../images/200/slide_view.png) 2x);
768 } 772 }
769 773
770 .gallery > .toolbar button.delete { 774 .gallery > .toolbar paper-button.mosaic-mode {
771 background-image: -webkit-image-set( 775 background-image: -webkit-image-set(
772 url(../images/100/icon_delete.png) 1x, 776 url(../images/100/mosaic_view.png) 1x,
773 url(../images/200/icon_delete.png) 2x); 777 url(../images/200/mosaic_view.png) 2x);
774 } 778 }
775 779
776 .gallery > .toolbar button.delete:active { 780 .gallery > .toolbar paper-button.slideshow {
777 background-image: -webkit-image-set( 781 background-image: -webkit-image-set(
778 url(../images/100/icon_delete_selected.png) 1x, 782 url(../images/100/slideshow.png) 1x,
779 url(../images/200/icon_delete_selected.png) 2x); 783 url(../images/200/slideshow.png) 2x);
780 } 784 }
781 785
782 .gallery > .toolbar button.edit { 786 .gallery > .toolbar paper-button.share {
783 background-image: -webkit-image-set( 787 background-image: -webkit-image-set(
784 url(../images/100/icon_edit.png) 1x, 788 url(../images/100/share.png) 1x,
785 url(../images/200/icon_edit.png) 2x); 789 url(../images/200/share.png) 2x);
786 } 790 }
787 791
788 .gallery > .toolbar button.edit:active, 792 .gallery[editing] > .toolbar paper-button.edit {
789 .gallery > .toolbar button.edit[pressed] { 793 opacity: 0.5;
790 background-image: -webkit-image-set( 794 pointer-events: none;
791 url(../images/100/icon_edit_selected.png) 1x,
792 url(../images/200/icon_edit_selected.png) 2x);
793 } 795 }
794 796
795 .gallery > .toolbar button.print { 797 .gallery[mode='slide'] > .toolbar paper-button.slide-mode,
796 background-image: -webkit-image-set( 798 .gallery[mode='mosaic'] > .toolbar paper-button.mosaic-mode,
797 url(../images/100/icon_print.png) 1x, 799 .gallery > .toolbar paper-button[disabled] {
798 url(../images/200/icon_print.png) 2x);
799 }
800
801 .gallery > .toolbar button.print:active,
802 .gallery > .toolbar button.print[pressed] {
803 background-image: -webkit-image-set(
804 url(../images/100/icon_print_selected.png) 1x,
805 url(../images/200/icon_print_selected.png) 2x);
806 }
807
808 .gallery > .toolbar button.share {
809 background-image: -webkit-image-set(
810 url(../images/100/icon_share.png) 1x,
811 url(../images/200/icon_share.png) 2x);
812 }
813
814 .gallery > .toolbar button.share:active,
815 .gallery > .toolbar button.share[pressed] {
816 background-image: -webkit-image-set(
817 url(../images/100/icon_share_selected.png) 1x,
818 url(../images/200/icon_share_selected.png) 2x);
819 }
820
821 .gallery > .toolbar button.share[disabled] {
822 display: none; 800 display: none;
823 } 801 }
824 802
825 /* Secondary toolbar (mode-specific tools) */ 803 /* Secondary toolbar (mode-specific tools) */
826 804
827 .gallery .edit-modal { 805 .gallery .edit-modal {
828 -webkit-box-orient: horizontal; 806 -webkit-box-orient: horizontal;
829 -webkit-box-pack: center; 807 -webkit-box-pack: center;
830 bottom: 80px; 808 bottom: 80px;
831 display: -webkit-box; 809 display: -webkit-box;
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 background-color: rgba(255, 0, 0, 0.3); 1324 background-color: rgba(255, 0, 0, 0.3);
1347 } 1325 }
1348 1326
1349 .debug-me .load-target-external-metadata::before { 1327 .debug-me .load-target-external-metadata::before {
1350 background-color: rgba(0, 255, 0, 0.3); 1328 background-color: rgba(0, 255, 0, 0.3);
1351 } 1329 }
1352 1330
1353 .debug-me .load-target-file-entry::before { 1331 .debug-me .load-target-file-entry::before {
1354 background-color: rgba(0, 0, 255, 0.3); 1332 background-color: rgba(0, 0, 255, 0.3);
1355 } 1333 }
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