OLD | NEW |
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 10 matching lines...) Expand all Loading... |
21 | 21 |
22 /* Common background for both mosaic and slide mode. */ | 22 /* Common background for both mosaic and slide mode. */ |
23 .gallery .content { | 23 .gallery .content { |
24 background-color: black; | 24 background-color: black; |
25 } | 25 } |
26 | 26 |
27 /* Close button */ | 27 /* Close button */ |
28 | 28 |
29 /* We actually want (left,top) to be (0,0) but for some weird reason | 29 /* We actually want (left,top) to be (0,0) but for some weird reason |
30 this triggers :hover style on page reload which is ugly. */ | 30 this triggers :hover style on page reload which is ugly. */ |
31 .gallery > .close { | 31 .gallery > .back-button { |
32 cursor: pointer; | 32 cursor: pointer; |
33 left: 1px; | 33 left: 1px; |
34 position: absolute; | 34 position: absolute; |
35 top: 1px; | 35 top: 1px; |
36 z-index: 200; | 36 z-index: 200; |
37 } | 37 } |
38 | 38 |
39 body[new-ui] .tools .gallery > .close { | 39 body[new-ui] .tools .gallery > .back-button { |
40 opacity: 0; | 40 opacity: 0; |
41 } | 41 } |
42 | 42 |
43 /* The close icon is in a nested div so that its opacity can be manipulated | 43 /* The close icon is in a nested div so that its opacity can be manipulated |
44 independently from its parent (which can be dimmed when the crop frame | 44 independently from its parent (which can be dimmed when the crop frame |
45 overlaps it) */ | 45 overlaps it) */ |
46 .gallery > .close div { | 46 .gallery > .back-button div { |
47 background-image: -webkit-image-set( | 47 background-image: -webkit-image-set( |
48 url('../images/gallery/back_to_files.png') 1x, | 48 url('../images/gallery/back_to_files.png') 1x, |
49 url('../images/gallery/2x/back_to_files.png') 2x); | 49 url('../images/gallery/2x/back_to_files.png') 2x); |
50 background-position: center center; | 50 background-position: center center; |
51 background-repeat: no-repeat; | 51 background-repeat: no-repeat; |
52 height: 40px; | 52 height: 40px; |
53 opacity: 0; | 53 opacity: 0; |
54 width: 64px; | 54 width: 64px; |
55 } | 55 } |
56 | 56 |
57 .gallery[tools] > .close div { | 57 .gallery[tools] > .back-button div { |
58 opacity: 0.5; | 58 opacity: 0.5; |
59 } | 59 } |
60 | 60 |
61 .gallery[tools] > .close div:hover { | 61 .gallery[tools] > .back-button div:hover { |
62 opacity: 1; | 62 opacity: 1; |
63 } | 63 } |
64 | 64 |
65 /* Image container and canvas elements */ | 65 /* Image container and canvas elements */ |
66 | 66 |
67 .gallery .image-container { | 67 .gallery .image-container { |
68 cursor: none; /* Only visible when the toolbar is active */ | 68 cursor: none; /* Only visible when the toolbar is active */ |
69 height: 100%; | 69 height: 100%; |
70 position: absolute; | 70 position: absolute; |
71 width: 100%; | 71 width: 100%; |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 | 172 |
173 body[new-ui] .gallery > .header, | 173 body[new-ui] .gallery > .header, |
174 .gallery > .toolbar { | 174 .gallery > .toolbar { |
175 -webkit-box-align: stretch; | 175 -webkit-box-align: stretch; |
176 -webkit-box-orient: horizontal; | 176 -webkit-box-orient: horizontal; |
177 -webkit-box-pack: start; | 177 -webkit-box-pack: start; |
178 -webkit-transition: opacity 300ms ease; | 178 -webkit-transition: opacity 300ms ease; |
179 background-color: rgba(18, 18, 18, 0.875); | 179 background-color: rgba(18, 18, 18, 0.875); |
180 display: -webkit-box; | 180 display: -webkit-box; |
181 left: 0; | 181 left: 0; |
182 min-width: 800px; | |
183 opacity: 0; | 182 opacity: 0; |
184 padding: 0 8px; | 183 padding: 0 10px; |
185 pointer-events: none; | 184 pointer-events: none; |
186 position: absolute; | 185 position: absolute; |
187 right: 0; | 186 right: 0; |
188 } | 187 } |
189 | 188 |
190 body[new-ui] .gallery > .header, | 189 body[new-ui] .gallery > .header, |
191 body[new-ui] .gallery > .toolbar { | 190 body[new-ui] .gallery > .toolbar { |
192 background-color: rgba(30, 30, 30, 0.8); | 191 background-color: rgba(30, 30, 30, 0.8); |
193 } | 192 } |
194 | 193 |
195 body[new-ui] .gallery > .header { | 194 body[new-ui] .gallery > .header { |
| 195 -webkit-box-align: center; |
| 196 -webkit-box-pack: end; |
196 border-bottom: 1px solid rgba(50, 50, 50, 0.8); | 197 border-bottom: 1px solid rgba(50, 50, 50, 0.8); |
| 198 display: -webkit-box; |
197 height: 45px; | 199 height: 45px; |
198 top: 0; | 200 top: 0; |
199 } | 201 } |
200 | 202 |
201 .gallery > .toolbar { | 203 .gallery > .toolbar { |
202 border-top: 1px solid rgba(31, 31, 31, 0.7); | 204 border-top: 1px solid rgba(31, 31, 31, 0.7); |
203 bottom: 0; | 205 bottom: 0; |
204 height: 55px; | 206 height: 55px; |
| 207 min-width: 800px; |
205 } | 208 } |
206 | 209 |
207 body[new-ui] .gallery > .toolbar { | 210 body[new-ui] .gallery > .toolbar { |
208 border-top: 1px solid rgba(50, 50, 50, 0.8); | 211 border-top: 1px solid rgba(50, 50, 50, 0.8); |
209 bottom: 0; | 212 bottom: 0; |
210 height: 55px; | 213 height: 55px; |
211 } | 214 } |
212 | 215 |
213 body[new-ui] .gallery[tools]:not([slideshow]) > .header, | 216 body[new-ui] .gallery[tools]:not([slideshow]) > .header, |
214 .gallery[tools]:not([slideshow]) > .toolbar { | 217 .gallery[tools]:not([slideshow]) > .toolbar { |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 .gallery[tools][editing][mousedrag] * { | 294 .gallery[tools][editing][mousedrag] * { |
292 pointer-events: none; | 295 pointer-events: none; |
293 } | 296 } |
294 | 297 |
295 .gallery[tools][editing][mousedrag] .image-container { | 298 .gallery[tools][editing][mousedrag] .image-container { |
296 pointer-events: auto; | 299 pointer-events: auto; |
297 } | 300 } |
298 | 301 |
299 /* The editor marks elements with 'dimmed' attribute to get them out of the way | 302 /* The editor marks elements with 'dimmed' attribute to get them out of the way |
300 of the crop frame */ | 303 of the crop frame */ |
301 .gallery[tools][editing] *[dimmed], | 304 body:not([new-ui]) .gallery[tools][editing] *[dimmed], |
302 .gallery[tools][editing] *[dimmed] * { | 305 body[new-ui] .gallery[tools][editing] *[dimmed], |
| 306 body:not([new-ui]) .gallery[tools][editing] *[dimmed] *, |
| 307 body[new-ui] .gallery[tools][editing] *[dimmed] * { |
303 pointer-events: none; | 308 pointer-events: none; |
304 } | 309 } |
305 | 310 |
306 .gallery[tools][editing] *[dimmed] { | 311 body:not([new-ui]) .gallery[tools][editing] *[dimmed], |
| 312 body[new-ui] .gallery[tools][editing] *[dimmed] { |
307 opacity: 0.2; | 313 opacity: 0.2; |
308 } | 314 } |
309 | 315 |
310 /* Filename */ | 316 /* Filename */ |
311 | 317 |
312 .gallery .filename-spacer { | 318 .gallery .filename-spacer { |
313 position: relative; | 319 position: relative; |
314 width: 270px; | 320 width: 270px; |
315 } | 321 } |
316 | 322 |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
562 overflow: visible; | 568 overflow: visible; |
563 } | 569 } |
564 | 570 |
565 .gallery[editing] .edit-bar-spacer { | 571 .gallery[editing] .edit-bar-spacer { |
566 -webkit-transition-delay: 100ms, 100ms; | 572 -webkit-transition-delay: 100ms, 100ms; |
567 opacity: 1.0; | 573 opacity: 1.0; |
568 pointer-events: auto; | 574 pointer-events: auto; |
569 visibility: visible; | 575 visibility: visible; |
570 } | 576 } |
571 | 577 |
572 body .gallery > .toolbar button { | 578 body .gallery button, |
| 579 body .gallery button[disabled] { |
573 -webkit-box-align: center; | 580 -webkit-box-align: center; |
574 -webkit-box-flex: 0; | 581 -webkit-box-flex: 0; |
575 -webkit-box-orient: horizontal; | 582 -webkit-box-orient: horizontal; |
576 -webkit-box-pack: end; | 583 -webkit-box-pack: end; |
577 -webkit-box-shadow: none; | 584 -webkit-box-shadow: none; |
578 background-color: rgba(0, 0, 0, 0); | 585 background-color: rgba(0, 0, 0, 0); |
579 background-position: center; | 586 background-position: center; |
580 background-repeat: no-repeat; | 587 background-repeat: no-repeat; |
581 border: none; | 588 border: none; |
582 box-sizing: content-box; | |
583 color: white; | 589 color: white; |
584 cursor: pointer; | 590 cursor: pointer; |
585 display: -webkit-box; | 591 display: -webkit-box; |
| 592 opacity: 0.99; /* Workaround for http://crosbug.com/21065 */ |
| 593 padding: 1px; /* Instead of a border. */ |
| 594 position: relative; |
| 595 z-index: 10; |
| 596 } |
| 597 |
| 598 body .gallery button { |
586 height: 40px; | 599 height: 40px; |
587 margin: 8px 0 7px 3px; | 600 margin: 6px 0; |
588 min-width: 40px; /* Reset. */ | 601 min-width: 40px; /* Reset. */ |
589 opacity: 0.99; /* Workaround for http://crosbug.com/21065 */ | |
590 padding: 0; | |
591 position: relative; | |
592 width: 40px; | 602 width: 40px; |
593 z-index: 10; | |
594 } | 603 } |
595 | 604 |
596 /* By default, labels are hidden. */ | 605 /* By default, labels are hidden. */ |
597 .gallery > .toolbar button span { | 606 .gallery > .toolbar button span { |
598 display: none; | 607 display: none; |
599 } | 608 } |
600 | 609 |
601 /* Show labels if there is enough space. */ | 610 /* Show labels if there is enough space. */ |
602 @media (min-width: 1050px) { | 611 @media (min-width: 1050px) { |
603 | 612 |
604 body .gallery .edit-main button { | 613 body .gallery .edit-main button { |
605 background-position: 5px center; | 614 background-position: 5px center; |
606 min-width: 0; /* Reset. */ | 615 min-width: 0; /* Reset. */ |
607 padding: 0 10px 0 35px; | 616 padding: 0 10px 0 35px; |
608 width: auto; | 617 width: auto; |
609 } | 618 } |
610 | 619 |
611 body .gallery > .toolbar button span { | 620 body .gallery > .toolbar button span { |
612 display: inline; | 621 display: inline; |
613 } | 622 } |
614 | 623 |
615 } | 624 } |
616 | 625 |
617 .gallery > .toolbar button:hover { | 626 body .gallery button:hover { |
618 background-color: rgba(31, 31, 31, 1); | 627 background-color: rgba(31, 31, 31, 1); |
619 color: white; | 628 color: white; |
620 } | 629 } |
621 | 630 |
622 .gallery > .toolbar button:active, | 631 body .gallery button:active, |
623 .gallery > .toolbar button[pressed], | 632 body .gallery button[pressed], |
624 .gallery > .toolbar button[pressed]:hover { | 633 body .gallery button[pressed]:hover { |
625 background-color: rgba(240, 240, 240, 1); | 634 background-color: rgba(240, 240, 240, 1); |
626 color: black; | 635 color: black; |
627 } | 636 } |
628 | 637 |
629 .gallery > .toolbar button.autofix { | 638 .gallery > .toolbar button.autofix { |
630 background-image: -webkit-image-set( | 639 background-image: -webkit-image-set( |
631 url('../images/gallery/icon_autofix.png') 1x, | 640 url('../images/gallery/icon_autofix.png') 1x, |
632 url('../images/gallery/2x/icon_autofix.png') 2x); | 641 url('../images/gallery/2x/icon_autofix.png') 2x); |
633 } | 642 } |
634 | 643 |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
972 } | 981 } |
973 | 982 |
974 .gallery .prompt-wrapper[pos=top] { | 983 .gallery .prompt-wrapper[pos=top] { |
975 -webkit-box-align: start; | 984 -webkit-box-align: start; |
976 } | 985 } |
977 | 986 |
978 .gallery .prompt-wrapper[pos=center] { | 987 .gallery .prompt-wrapper[pos=center] { |
979 -webkit-box-align: center; | 988 -webkit-box-align: center; |
980 } | 989 } |
981 | 990 |
982 .gallery .prompt-wrapper[pos=center] .close { | 991 .gallery .prompt-wrapper[pos=center] .back-button { |
983 display: none; | 992 display: none; |
984 } | 993 } |
985 | 994 |
986 .gallery .prompt-wrapper > div.dimmable { | 995 .gallery .prompt-wrapper > div.dimmable { |
987 -webkit-transition: opacity 220ms ease; | 996 -webkit-transition: opacity 220ms ease; |
988 opacity: 1; | 997 opacity: 1; |
989 } | 998 } |
990 | 999 |
991 .gallery .prompt { | 1000 .gallery .prompt { |
992 -webkit-box-align: center; | 1001 -webkit-box-align: center; |
(...skipping 17 matching lines...) Expand all Loading... |
1010 | 1019 |
1011 .gallery .prompt[state='fadeout'] { | 1020 .gallery .prompt[state='fadeout'] { |
1012 opacity: 0; | 1021 opacity: 0; |
1013 top: 0; | 1022 top: 0; |
1014 } | 1023 } |
1015 | 1024 |
1016 .gallery .prompt-wrapper[pos=top] .prompt { | 1025 .gallery .prompt-wrapper[pos=top] .prompt { |
1017 padding-right: 10px; | 1026 padding-right: 10px; |
1018 } | 1027 } |
1019 | 1028 |
1020 .gallery .prompt .close { | 1029 .gallery .prompt .back-button { |
1021 background-image: -webkit-image-set( | 1030 background-image: -webkit-image-set( |
1022 url('../images/gallery/butterbar_close_x.png') 1x, | 1031 url('../images/gallery/butterbar_close_x.png') 1x, |
1023 url('../images/gallery/2x/butterbar_close_x.png') 2x); | 1032 url('../images/gallery/2x/butterbar_close_x.png') 2x); |
1024 background-position: center center; | 1033 background-position: center center; |
1025 background-repeat: no-repeat; | 1034 background-repeat: no-repeat; |
1026 height: 16px; | 1035 height: 16px; |
1027 margin-left: 16px; | 1036 margin-left: 16px; |
1028 opacity: 0.65; | 1037 opacity: 0.65; |
1029 pointer-events: auto; | 1038 pointer-events: auto; |
1030 width: 16px; | 1039 width: 16px; |
1031 } | 1040 } |
1032 | 1041 |
1033 .gallery .prompt .close:hover { | 1042 .gallery .prompt .back-button:hover { |
1034 background-color: rgba(81, 81, 81, 1); | 1043 background-color: rgba(81, 81, 81, 1); |
1035 opacity: 1.0; | 1044 opacity: 1.0; |
1036 } | 1045 } |
1037 | 1046 |
1038 .gallery .share-menu { | 1047 .gallery .share-menu { |
1039 -webkit-border-radius: 1px; | 1048 -webkit-border-radius: 1px; |
1040 -webkit-box-align: stretch; | 1049 -webkit-box-align: stretch; |
1041 -webkit-box-orient: vertical; | 1050 -webkit-box-orient: vertical; |
1042 -webkit-box-pack: start; | 1051 -webkit-box-pack: start; |
1043 -webkit-transition: opacity 500ms ease-in-out; | 1052 -webkit-transition: opacity 500ms ease-in-out; |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1338 url('../images/gallery/slideshow-pause.png') 1x, | 1347 url('../images/gallery/slideshow-pause.png') 1x, |
1339 url('../images/gallery/2x/slideshow-pause.png') 2x); | 1348 url('../images/gallery/2x/slideshow-pause.png') 2x); |
1340 } | 1349 } |
1341 | 1350 |
1342 .slideshow-toolbar > .slideshow-end { | 1351 .slideshow-toolbar > .slideshow-end { |
1343 background-image: -webkit-image-set( | 1352 background-image: -webkit-image-set( |
1344 url('../images/gallery/slideshow-end.png') 1x, | 1353 url('../images/gallery/slideshow-end.png') 1x, |
1345 url('../images/gallery/2x/slideshow-end.png') 2x); | 1354 url('../images/gallery/2x/slideshow-end.png') 2x); |
1346 margin-left: -2px; | 1355 margin-left: -2px; |
1347 } | 1356 } |
| 1357 |
| 1358 body[new-ui] .gallery > .header > button { |
| 1359 height: 27px; |
| 1360 min-width: 29px; |
| 1361 width: 29px; |
| 1362 } |
| 1363 |
| 1364 body[new-ui] .gallery > .header > .maximize-button { |
| 1365 background-image: -webkit-image-set( |
| 1366 url('../images/files/ui/new-ui/topbar_button_maximize.png') 1x, |
| 1367 url('../images/files/ui/new-ui/2x/topbar_button_maximize.png') 2x); |
| 1368 } |
| 1369 |
| 1370 body[new-ui] .gallery > .header > .close-button { |
| 1371 background-image: -webkit-image-set( |
| 1372 url('../images/files/ui/new-ui/topbar_button_close.png') 1x, |
| 1373 url('../images/files/ui/new-ui/2x/topbar_button_close.png') 2x); |
| 1374 } |
OLD | NEW |