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 18 matching lines...) Expand all Loading... |
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 > .close { |
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 { |
| 40 opacity: 0; |
| 41 } |
| 42 |
39 /* 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 |
40 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 |
41 overlaps it) */ | 45 overlaps it) */ |
42 .gallery > .close div { | 46 .gallery > .close div { |
43 background-image: -webkit-image-set( | 47 background-image: -webkit-image-set( |
44 url('../images/gallery/back_to_files.png') 1x, | 48 url('../images/gallery/back_to_files.png') 1x, |
45 url('../images/gallery/2x/back_to_files.png') 2x); | 49 url('../images/gallery/2x/back_to_files.png') 2x); |
46 background-position: center center; | 50 background-position: center center; |
47 background-repeat: no-repeat; | 51 background-repeat: no-repeat; |
48 height: 40px; | 52 height: 40px; |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 } | 163 } |
160 | 164 |
161 /* Print video at the center of the page */ | 165 /* Print video at the center of the page */ |
162 .gallery .image-container > video.image { | 166 .gallery .image-container > video.image { |
163 position: auto !important; | 167 position: auto !important; |
164 } | 168 } |
165 } | 169 } |
166 | 170 |
167 /* Toolbar */ | 171 /* Toolbar */ |
168 | 172 |
| 173 body[new-ui] .gallery > .header, |
169 .gallery > .toolbar { | 174 .gallery > .toolbar { |
170 -webkit-box-align: stretch; | 175 -webkit-box-align: stretch; |
171 -webkit-box-orient: horizontal; | 176 -webkit-box-orient: horizontal; |
172 -webkit-box-pack: start; | 177 -webkit-box-pack: start; |
173 -webkit-transition: opacity 300ms ease; | 178 -webkit-transition: opacity 300ms ease; |
174 background-color: rgba(18, 18, 18, 0.875); | 179 background-color: rgba(18, 18, 18, 0.875); |
175 border-top: 1px solid rgba(31, 31, 31, 0.875); | |
176 bottom: 0; | |
177 box-sizing: border-box; | |
178 display: -webkit-box; | 180 display: -webkit-box; |
179 height: 55px; | |
180 min-width: 800px; | 181 min-width: 800px; |
181 opacity: 0; | 182 opacity: 0; |
182 padding: 0 8px; | 183 padding: 0 8px; |
183 pointer-events: none; | 184 pointer-events: none; |
184 position: absolute; | 185 position: absolute; |
185 width: 100%; | 186 width: 100%; |
186 } | 187 } |
187 | 188 |
| 189 body[new-ui] .gallery > .header, |
| 190 body[new-ui] .gallery > .toolbar { |
| 191 background-color: rgba(30, 30, 30, 0.8); |
| 192 } |
| 193 |
| 194 body[new-ui] .gallery > .header { |
| 195 border-bottom: 1px solid rgba(50, 50, 50, 0.8); |
| 196 height: 45px; |
| 197 top: 0; |
| 198 } |
| 199 |
| 200 .gallery > .toolbar { |
| 201 border-top: 1px solid rgba(31, 31, 31, 0.7); |
| 202 bottom: 0; |
| 203 height: 55px; |
| 204 } |
| 205 |
| 206 body[new-ui] .gallery > .toolbar { |
| 207 border-top: 1px solid rgba(50, 50, 50, 0.8); |
| 208 bottom: 0; |
| 209 height: 55px; |
| 210 } |
| 211 |
| 212 body[new-ui] .gallery[tools]:not([slideshow]) > .header, |
188 .gallery[tools]:not([slideshow]) > .toolbar { | 213 .gallery[tools]:not([slideshow]) > .toolbar { |
189 opacity: 1; | 214 opacity: 1; |
190 pointer-events: auto; | 215 pointer-events: auto; |
191 } | 216 } |
192 | 217 |
193 /* Hide immediately when entering the slideshow. */ | 218 /* Hide immediately when entering the slideshow. */ |
194 .gallery[tools][slideshow] > .toolbar { | 219 .gallery[tools][slideshow] > .toolbar { |
195 -webkit-transition-duration: 0; | 220 -webkit-transition-duration: 0; |
196 } | 221 } |
197 | 222 |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
500 height: 45px; | 525 height: 45px; |
501 overflow: hidden; | 526 overflow: hidden; |
502 position: relative; | 527 position: relative; |
503 width: 45px; | 528 width: 45px; |
504 } | 529 } |
505 | 530 |
506 .gallery .image-wrapper > img { | 531 .gallery .image-wrapper > img { |
507 position: absolute; | 532 position: absolute; |
508 } | 533 } |
509 | 534 |
| 535 body[new-ui] .gallery .image-wrapper > img:not(.cached) { |
| 536 -webkit-animation: fadeIn 500ms ease-in; |
| 537 } |
| 538 |
510 /* Editor buttons */ | 539 /* Editor buttons */ |
511 | 540 |
512 .gallery .edit-bar-spacer { | 541 .gallery .edit-bar-spacer { |
513 -webkit-box-align: center; | 542 -webkit-box-align: center; |
514 -webkit-box-orient: horizontal; | 543 -webkit-box-orient: horizontal; |
515 -webkit-box-pack: center; | 544 -webkit-box-pack: center; |
516 -webkit-transition: opacity 180ms linear, visibility 0 linear 180ms; | 545 -webkit-transition: opacity 180ms linear, visibility 0 linear 180ms; |
517 display: -webkit-box; | 546 display: -webkit-box; |
518 height: 100%; | 547 height: 100%; |
519 left: 280px; | 548 left: 280px; |
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1307 url('../images/gallery/slideshow-pause.png') 1x, | 1336 url('../images/gallery/slideshow-pause.png') 1x, |
1308 url('../images/gallery/2x/slideshow-pause.png') 2x); | 1337 url('../images/gallery/2x/slideshow-pause.png') 2x); |
1309 } | 1338 } |
1310 | 1339 |
1311 .slideshow-toolbar > .slideshow-end { | 1340 .slideshow-toolbar > .slideshow-end { |
1312 background-image: -webkit-image-set( | 1341 background-image: -webkit-image-set( |
1313 url('../images/gallery/slideshow-end.png') 1x, | 1342 url('../images/gallery/slideshow-end.png') 1x, |
1314 url('../images/gallery/2x/slideshow-end.png') 2x); | 1343 url('../images/gallery/2x/slideshow-end.png') 2x); |
1315 margin-left: -2px; | 1344 margin-left: -2px; |
1316 } | 1345 } |
OLD | NEW |