| OLD | NEW |
| 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-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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 } | 145 } |
| 146 | 146 |
| 147 /* Toolbar */ | 147 /* Toolbar */ |
| 148 | 148 |
| 149 .gallery > .header, | 149 .gallery > .header, |
| 150 .gallery > .toolbar { | 150 .gallery > .toolbar { |
| 151 -webkit-box-align: stretch; | 151 -webkit-box-align: stretch; |
| 152 -webkit-box-orient: horizontal; | 152 -webkit-box-orient: horizontal; |
| 153 -webkit-box-pack: start; | 153 -webkit-box-pack: start; |
| 154 background-color: rgba(30, 30, 30, 0.8); | 154 background-color: rgba(30, 30, 30, 0.8); |
| 155 display: -webkit-box; | 155 display: flex; |
| 156 left: 0; | 156 left: 0; |
| 157 opacity: 0; | 157 opacity: 0; |
| 158 padding: 0 10px; | 158 padding: 0 10px; |
| 159 pointer-events: none; | 159 pointer-events: none; |
| 160 position: absolute; | 160 position: absolute; |
| 161 right: 0; | 161 right: 0; |
| 162 transition: opacity 300ms ease; | 162 transition: opacity 300ms ease; |
| 163 } | 163 } |
| 164 | 164 |
| 165 .gallery > .header { | 165 .gallery > .header { |
| 166 -webkit-app-region: drag; | 166 -webkit-app-region: drag; |
| 167 -webkit-box-align: center; | 167 -webkit-box-align: center; |
| 168 -webkit-box-pack: end; | 168 -webkit-box-pack: end; |
| 169 border-bottom: 1px solid rgba(50, 50, 50, 0.8); | 169 border-bottom: 1px solid rgba(50, 50, 50, 0.8); |
| 170 display: -webkit-box; | 170 display: -webkit-box; |
| 171 height: 45px; | 171 height: 45px; |
| 172 top: 0; | 172 top: 0; |
| 173 } | 173 } |
| 174 | 174 |
| 175 .gallery .header button { | 175 .gallery .header button { |
| 176 -webkit-app-region: no-drag; | 176 -webkit-app-region: no-drag; |
| 177 } | 177 } |
| 178 | 178 |
| 179 .gallery > .toolbar { | 179 .gallery > .toolbar { |
| 180 border-top: 1px solid rgba(50, 50, 50, 0.8); | 180 border-top: 1px solid rgba(50, 50, 50, 0.8); |
| 181 bottom: 0; | 181 bottom: 0; |
| 182 height: 55px; | 182 height: 55px; |
| 183 min-width: 800px; | 183 overflow: hidden; |
| 184 } | 184 } |
| 185 | 185 |
| 186 .gallery[tools]:not([slideshow]) > .header, | 186 .gallery[tools]:not([slideshow]) > .header, |
| 187 .gallery[tools]:not([slideshow]) > .toolbar { | 187 .gallery[tools]:not([slideshow]) > .toolbar { |
| 188 opacity: 1; | 188 opacity: 1; |
| 189 pointer-events: auto; | 189 pointer-events: auto; |
| 190 } | 190 } |
| 191 | 191 |
| 192 /* Hide immediately when entering the slideshow. */ | 192 /* Hide immediately when entering the slideshow. */ |
| 193 .gallery[tools][slideshow] > .toolbar { | 193 .gallery[tools][slideshow] > .toolbar { |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 pointer-events: none; | 276 pointer-events: none; |
| 277 } | 277 } |
| 278 | 278 |
| 279 .gallery[tools][editing] [dimmed] { | 279 .gallery[tools][editing] [dimmed] { |
| 280 opacity: 0.2; | 280 opacity: 0.2; |
| 281 } | 281 } |
| 282 | 282 |
| 283 /* Filename */ | 283 /* Filename */ |
| 284 | 284 |
| 285 .gallery .filename-spacer { | 285 .gallery .filename-spacer { |
| 286 flex: 0 1 auto; |
| 286 height: 100%; | 287 height: 100%; |
| 288 min-width: 140px; |
| 287 overflow: hidden; | 289 overflow: hidden; |
| 288 position: relative; | 290 position: relative; |
| 289 width: 270px; | 291 width: 210px; |
| 290 } | 292 } |
| 291 | 293 |
| 292 .gallery .filename-spacer > * { | 294 .gallery .filename-spacer > * { |
| 293 background-color: transparent; | 295 background-color: transparent; |
| 294 overflow: hidden; | 296 overflow: hidden; |
| 295 position: absolute; | 297 position: absolute; |
| 296 transition: visibility 0 linear 180ms, all 180ms linear; | 298 transition: visibility 0 linear 180ms, all 180ms linear; |
| 297 width: 260px; | 299 width: 260px; |
| 298 } | 300 } |
| 299 | 301 |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 cursor: default; | 393 cursor: default; |
| 392 pointer-events: none; | 394 pointer-events: none; |
| 393 } | 395 } |
| 394 | 396 |
| 395 .gallery .filename-spacer .saved[highlighted] { | 397 .gallery .filename-spacer .saved[highlighted] { |
| 396 -webkit-transform: scaleX(1.1) scaleY(1.1) rotate(0); | 398 -webkit-transform: scaleX(1.1) scaleY(1.1) rotate(0); |
| 397 opacity: 1; | 399 opacity: 1; |
| 398 } | 400 } |
| 399 | 401 |
| 400 /* Bubble */ | 402 /* Bubble */ |
| 403 |
| 401 .gallery .toolbar .bubble { | 404 .gallery .toolbar .bubble { |
| 402 bottom: 65px; | 405 bottom: 65px; |
| 403 font-size: 85%; | 406 font-size: 85%; |
| 404 left: 50px; | 407 left: 50px; |
| 405 position: absolute; | 408 position: absolute; |
| 406 width: 220px; | 409 width: 220px; |
| 407 } | 410 } |
| 408 | 411 |
| 409 .gallery:not([editing]) .toolbar .bubble { | 412 .gallery:not([editing]) .toolbar .bubble { |
| 410 display: none; | 413 display: none; |
| 411 } | 414 } |
| 412 | 415 |
| 416 /* Middle spacer */ |
| 417 |
| 418 .gallery .middle-spacer { |
| 419 align-items: center; |
| 420 display: flex; |
| 421 flex: 1 0 auto; |
| 422 flex-direction: column; |
| 423 } |
| 424 |
| 413 /* Toolbar buttons */ | 425 /* Toolbar buttons */ |
| 414 | 426 |
| 415 .gallery .button-spacer { | 427 .gallery .button-spacer { |
| 416 -webkit-box-flex: 1; | 428 display: flex; |
| 417 display: -webkit-box; | 429 flex: none; |
| 430 width: 210px; /* 42px button x 5 */ |
| 418 } | 431 } |
| 419 | 432 |
| 420 /* Thumbnails */ | 433 /* Thumbnails */ |
| 421 | 434 |
| 422 .gallery .ribbon-spacer { | 435 .gallery .ribbon-spacer { |
| 423 -webkit-box-align: center; | 436 height: 55px; |
| 424 -webkit-box-orient: horizontal; | 437 margin-bottom: -55px; |
| 425 -webkit-box-pack: center; | |
| 426 display: -webkit-box; | |
| 427 height: 100%; | |
| 428 left: 280px; | |
| 429 position: absolute; | |
| 430 right: 280px; | |
| 431 } | 438 } |
| 432 | 439 |
| 433 .gallery .toolbar .ribbon { | 440 .gallery .toolbar .ribbon { |
| 434 -webkit-box-flex: 0; | |
| 435 -webkit-box-orient: horizontal; | |
| 436 -webkit-box-pack: start; | |
| 437 display: -webkit-box; | |
| 438 height: 100%; | 441 height: 100%; |
| 439 overflow: hidden; | 442 overflow: hidden; |
| 440 transition: opacity 180ms linear, visibility 0 linear; | 443 transition: opacity 180ms linear, visibility 0 linear; |
| 441 z-index: 0; | 444 z-index: 0; |
| 442 } | 445 } |
| 443 | 446 |
| 444 .gallery[editing] .toolbar .ribbon { | 447 .gallery[editing] .toolbar .ribbon { |
| 445 opacity: 0; | 448 opacity: 0; |
| 446 transition-delay: 0, 180ms; | 449 transition-delay: 0, 180ms; |
| 447 visibility: hidden; | 450 visibility: hidden; |
| 448 } | 451 } |
| 449 | 452 |
| 450 .gallery .ribbon-image { | 453 .gallery .ribbon-image { |
| 451 -webkit-box-align: center; | |
| 452 -webkit-box-orient: horizontal; | |
| 453 -webkit-box-pack: center; | |
| 454 border: 2px solid rgba(255, 255, 255, 0); /* transparent white */ | 454 border: 2px solid rgba(255, 255, 255, 0); /* transparent white */ |
| 455 cursor: pointer; | 455 cursor: pointer; |
| 456 display: -webkit-box; | 456 display: inline-block; |
| 457 height: 47px; | 457 height: 47px; |
| 458 margin: 2px; | 458 margin: 2px; |
| 459 overflow: hidden; | 459 overflow: hidden; |
| 460 transition: all 180ms linear; | 460 transition: all 180ms linear; |
| 461 width: 47px; | 461 width: 47px; |
| 462 } | 462 } |
| 463 | 463 |
| 464 .ribbon-image[vanishing='smooth'] { | 464 .ribbon-image[vanishing='smooth'] { |
| 465 border-left-width: 0; | 465 border-left-width: 0; |
| 466 border-right-width: 0; | 466 border-right-width: 0; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 /* Editor buttons */ | 510 /* Editor buttons */ |
| 511 | 511 |
| 512 .gallery .edit-bar-spacer { | 512 .gallery .edit-bar-spacer { |
| 513 -webkit-box-align: center; | 513 -webkit-box-align: center; |
| 514 -webkit-box-orient: horizontal; | 514 -webkit-box-orient: horizontal; |
| 515 -webkit-box-pack: center; | 515 -webkit-box-pack: center; |
| 516 display: -webkit-box; | 516 display: -webkit-box; |
| 517 height: 100%; | 517 height: 100%; |
| 518 left: 280px; | 518 left: 280px; |
| 519 opacity: 0; | 519 opacity: 0; |
| 520 position: absolute; | |
| 521 right: 280px; | 520 right: 280px; |
| 522 transition: opacity 180ms linear, visibility 0 linear 180ms; | 521 transition: opacity 180ms linear, visibility 0 linear 180ms; |
| 523 visibility: hidden; | 522 visibility: hidden; |
| 523 margin-bottom: -55px; |
| 524 } | 524 } |
| 525 | 525 |
| 526 .gallery .toolbar .edit-main { | 526 .gallery .toolbar .edit-main { |
| 527 -webkit-box-orient: horizontal; | 527 -webkit-box-orient: horizontal; |
| 528 -webkit-box-pack: center; | 528 -webkit-box-pack: center; |
| 529 color: white; | 529 color: white; |
| 530 display: -webkit-box; | 530 display: -webkit-box; |
| 531 height: 55px; | 531 height: 55px; |
| 532 overflow: visible; | 532 overflow: visible; |
| 533 } | 533 } |
| 534 | 534 |
| 535 .gallery[editing] .edit-bar-spacer { | 535 .gallery[editing] .edit-bar-spacer { |
| 536 opacity: 1.0; | 536 opacity: 1.0; |
| 537 pointer-events: auto; | 537 pointer-events: auto; |
| 538 transition-delay: 100ms, 100ms; | 538 transition-delay: 100ms, 100ms; |
| 539 visibility: visible; | 539 visibility: visible; |
| 540 } | 540 } |
| 541 | 541 |
| 542 .gallery .header button, | 542 .gallery .header button, |
| 543 .gallery .toolbar button, | 543 .gallery .toolbar button, |
| 544 .gallery .header button[disabled], | 544 .gallery .header button[disabled], |
| 545 .gallery .toolbar button[disabled] { | 545 .gallery .toolbar button[disabled] { |
| 546 -webkit-box-align: center; | |
| 547 -webkit-box-flex: 0; | |
| 548 -webkit-box-orient: horizontal; | |
| 549 -webkit-box-pack: end; | |
| 550 background-color: rgba(0, 0, 0, 0); | 546 background-color: rgba(0, 0, 0, 0); |
| 551 background-position: center; | 547 background-position: center; |
| 552 background-repeat: no-repeat; | 548 background-repeat: no-repeat; |
| 553 border: none; | 549 border: none; |
| 554 box-shadow: none; | 550 box-shadow: none; |
| 555 color: white; | 551 color: white; |
| 556 cursor: pointer; | 552 cursor: pointer; |
| 557 display: -webkit-box; | 553 display: inline-block; |
| 554 flex: none; |
| 558 opacity: 0.99; /* Workaround for http://crosbug.com/21065 */ | 555 opacity: 0.99; /* Workaround for http://crosbug.com/21065 */ |
| 559 padding: 1px; /* Instead of a border. */ | 556 padding: 1px; /* Instead of a border. */ |
| 560 position: relative; | 557 position: relative; |
| 561 z-index: 10; | 558 z-index: 10; |
| 562 } | 559 } |
| 563 | 560 |
| 564 .gallery .header button, | 561 .gallery .header button, |
| 565 .gallery .toolbar button { | 562 .gallery .toolbar button { |
| 566 height: 40px; | 563 height: 40px; |
| 567 margin: 6px 0; | 564 margin: 6px 0; |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 .gallery > .toolbar button[disabled], | 704 .gallery > .toolbar button[disabled], |
| 708 .gallery[tools][locked] > .toolbar button { | 705 .gallery[tools][locked] > .toolbar button { |
| 709 opacity: 0.5; | 706 opacity: 0.5; |
| 710 pointer-events: none; | 707 pointer-events: none; |
| 711 } | 708 } |
| 712 | 709 |
| 713 .gallery > .toolbar button[hidden] { | 710 .gallery > .toolbar button[hidden] { |
| 714 display: none; | 711 display: none; |
| 715 } | 712 } |
| 716 | 713 |
| 717 .gallery[mode='slide'] > .toolbar > button.mode { | 714 .gallery[mode='slide'] > .toolbar button.mode { |
| 718 background-image: -webkit-image-set( | 715 background-image: -webkit-image-set( |
| 719 url(../images/100/icon_mosaic.png) 1x, | 716 url(../images/100/icon_mosaic.png) 1x, |
| 720 url(../images/200/icon_mosaic.png) 2x); | 717 url(../images/200/icon_mosaic.png) 2x); |
| 721 } | 718 } |
| 722 | 719 |
| 723 .gallery[mode='slide'] > .toolbar > button.mode:active { | 720 .gallery[mode='slide'] > .toolbar button.mode:active { |
| 724 background-image: -webkit-image-set( | 721 background-image: -webkit-image-set( |
| 725 url(../images/100/icon_mosaic_selected.png) 1x, | 722 url(../images/100/icon_mosaic_selected.png) 1x, |
| 726 url(../images/200/icon_mosaic_selected.png) 2x); | 723 url(../images/200/icon_mosaic_selected.png) 2x); |
| 727 } | 724 } |
| 728 | 725 |
| 729 .gallery[mode='mosaic'] > .toolbar > button.mode { | 726 .gallery[mode='mosaic'] > .toolbar button.mode { |
| 730 background-image: -webkit-image-set( | 727 background-image: -webkit-image-set( |
| 731 url(../images/100/icon_1up.png) 1x, | 728 url(../images/100/icon_1up.png) 1x, |
| 732 url(../images/200/icon_1up.png) 2x); | 729 url(../images/200/icon_1up.png) 2x); |
| 733 } | 730 } |
| 734 | 731 |
| 735 .gallery[mode='mosaic'] > .toolbar > button.mode:active { | 732 .gallery[mode='mosaic'] > .toolbar button.mode:active { |
| 736 background-image: -webkit-image-set( | 733 background-image: -webkit-image-set( |
| 737 url(../images/100/icon_1up_selected.png) 1x, | 734 url(../images/100/icon_1up_selected.png) 1x, |
| 738 url(../images/200/icon_1up_selected.png) 2x); | 735 url(../images/200/icon_1up_selected.png) 2x); |
| 739 } | 736 } |
| 740 | 737 |
| 741 .gallery > .toolbar > button.slideshow { | 738 .gallery > .toolbar button.slideshow { |
| 742 background-image: -webkit-image-set( | 739 background-image: -webkit-image-set( |
| 743 url(../images/100/icon_slideshow.png) 1x, | 740 url(../images/100/icon_slideshow.png) 1x, |
| 744 url(../images/200/icon_slideshow.png) 2x); | 741 url(../images/200/icon_slideshow.png) 2x); |
| 745 } | 742 } |
| 746 | 743 |
| 747 .gallery > .toolbar > button.slideshow:active, | 744 .gallery > .toolbar button.slideshow:active, |
| 748 .gallery > .toolbar > button.slideshow[pressed] { | 745 .gallery > .toolbar button.slideshow[pressed] { |
| 749 background-image: -webkit-image-set( | 746 background-image: -webkit-image-set( |
| 750 url(../images/100/icon_slideshow_selected.png) 1x, | 747 url(../images/100/icon_slideshow_selected.png) 1x, |
| 751 url(../images/200/icon_slideshow_selected.png) 2x); | 748 url(../images/200/icon_slideshow_selected.png) 2x); |
| 752 } | 749 } |
| 753 | 750 |
| 754 .gallery > .toolbar > button.delete { | 751 .gallery > .toolbar button.delete { |
| 755 background-image: -webkit-image-set( | 752 background-image: -webkit-image-set( |
| 756 url(../images/100/icon_delete.png) 1x, | 753 url(../images/100/icon_delete.png) 1x, |
| 757 url(../images/200/icon_delete.png) 2x); | 754 url(../images/200/icon_delete.png) 2x); |
| 758 } | 755 } |
| 759 | 756 |
| 760 .gallery > .toolbar > button.delete:active { | 757 .gallery > .toolbar button.delete:active { |
| 761 background-image: -webkit-image-set( | 758 background-image: -webkit-image-set( |
| 762 url(../images/100/icon_delete_selected.png) 1x, | 759 url(../images/100/icon_delete_selected.png) 1x, |
| 763 url(../images/200/icon_delete_selected.png) 2x); | 760 url(../images/200/icon_delete_selected.png) 2x); |
| 764 } | 761 } |
| 765 | 762 |
| 766 .gallery > .toolbar > button.edit { | 763 .gallery > .toolbar button.edit { |
| 767 background-image: -webkit-image-set( | 764 background-image: -webkit-image-set( |
| 768 url(../images/100/icon_edit.png) 1x, | 765 url(../images/100/icon_edit.png) 1x, |
| 769 url(../images/200/icon_edit.png) 2x); | 766 url(../images/200/icon_edit.png) 2x); |
| 770 } | 767 } |
| 771 | 768 |
| 772 .gallery > .toolbar > button.edit:active, | 769 .gallery > .toolbar button.edit:active, |
| 773 .gallery > .toolbar > button.edit[pressed] { | 770 .gallery > .toolbar button.edit[pressed] { |
| 774 background-image: -webkit-image-set( | 771 background-image: -webkit-image-set( |
| 775 url(../images/100/icon_edit_selected.png) 1x, | 772 url(../images/100/icon_edit_selected.png) 1x, |
| 776 url(../images/200/icon_edit_selected.png) 2x); | 773 url(../images/200/icon_edit_selected.png) 2x); |
| 777 } | 774 } |
| 778 | 775 |
| 779 .gallery > .toolbar > button.print { | 776 .gallery > .toolbar button.print { |
| 780 background-image: -webkit-image-set( | 777 background-image: -webkit-image-set( |
| 781 url(../images/100/icon_print.png) 1x, | 778 url(../images/100/icon_print.png) 1x, |
| 782 url(../images/200/icon_print.png) 2x); | 779 url(../images/200/icon_print.png) 2x); |
| 783 } | 780 } |
| 784 | 781 |
| 785 .gallery > .toolbar > button.print:active, | 782 .gallery > .toolbar button.print:active, |
| 786 .gallery > .toolbar > button.print[pressed] { | 783 .gallery > .toolbar button.print[pressed] { |
| 787 background-image: -webkit-image-set( | 784 background-image: -webkit-image-set( |
| 788 url(../images/100/icon_print_selected.png) 1x, | 785 url(../images/100/icon_print_selected.png) 1x, |
| 789 url(../images/200/icon_print_selected.png) 2x); | 786 url(../images/200/icon_print_selected.png) 2x); |
| 790 } | 787 } |
| 791 | 788 |
| 792 .gallery > .toolbar > button.share { | 789 .gallery > .toolbar button.share { |
| 793 background-image: -webkit-image-set( | 790 background-image: -webkit-image-set( |
| 794 url(../images/100/icon_share.png) 1x, | 791 url(../images/100/icon_share.png) 1x, |
| 795 url(../images/200/icon_share.png) 2x); | 792 url(../images/200/icon_share.png) 2x); |
| 796 } | 793 } |
| 797 | 794 |
| 798 .gallery > .toolbar > button.share:active, | 795 .gallery > .toolbar button.share:active, |
| 799 .gallery > .toolbar > button.share[pressed] { | 796 .gallery > .toolbar button.share[pressed] { |
| 800 background-image: -webkit-image-set( | 797 background-image: -webkit-image-set( |
| 801 url(../images/100/icon_share_selected.png) 1x, | 798 url(../images/100/icon_share_selected.png) 1x, |
| 802 url(../images/200/icon_share_selected.png) 2x); | 799 url(../images/200/icon_share_selected.png) 2x); |
| 803 } | 800 } |
| 804 | 801 |
| 805 .gallery > .toolbar > button.share[disabled] { | 802 .gallery > .toolbar button.share[disabled] { |
| 806 display: none; | 803 display: none; |
| 807 } | 804 } |
| 808 | 805 |
| 809 /* Secondary toolbar (mode-specific tools) */ | 806 /* Secondary toolbar (mode-specific tools) */ |
| 810 | 807 |
| 811 .gallery .edit-modal { | 808 .gallery .edit-modal { |
| 812 -webkit-box-orient: horizontal; | 809 -webkit-box-orient: horizontal; |
| 813 -webkit-box-pack: center; | 810 -webkit-box-pack: center; |
| 814 bottom: 80px; | 811 bottom: 80px; |
| 815 display: -webkit-box; | 812 display: -webkit-box; |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1321 url(chrome://resources/images/2x/apps/topbar_button_maximize.png) 2x) | 1318 url(chrome://resources/images/2x/apps/topbar_button_maximize.png) 2x) |
| 1322 center; | 1319 center; |
| 1323 } | 1320 } |
| 1324 | 1321 |
| 1325 .gallery > .header > .close-button { | 1322 .gallery > .header > .close-button { |
| 1326 background: -webkit-image-set( | 1323 background: -webkit-image-set( |
| 1327 url(chrome://resources/images/apps/topbar_button_close.png) 1x, | 1324 url(chrome://resources/images/apps/topbar_button_close.png) 1x, |
| 1328 url(chrome://resources/images/2x/apps/topbar_button_close.png) 2x) | 1325 url(chrome://resources/images/2x/apps/topbar_button_close.png) 2x) |
| 1329 center; | 1326 center; |
| 1330 } | 1327 } |
| OLD | NEW |