| Index: chrome/browser/resources/gallery/css/gallery.css
|
| diff --git a/chrome/browser/resources/file_manager/foreground/css/gallery.css b/chrome/browser/resources/gallery/css/gallery.css
|
| similarity index 84%
|
| copy from chrome/browser/resources/file_manager/foreground/css/gallery.css
|
| copy to chrome/browser/resources/gallery/css/gallery.css
|
| index 1a62e4d5220239b0b070fbe6af1d008a4f08e325..ae32e9676348202291bd48062111ffcd85f4c349 100644
|
| --- a/chrome/browser/resources/file_manager/foreground/css/gallery.css
|
| +++ b/chrome/browser/resources/gallery/css/gallery.css
|
| @@ -1,4 +1,4 @@
|
| -/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +/* Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
| * Use of this source code is governed by a BSD-style license that can be
|
| * found in the LICENSE file. */
|
|
|
| @@ -41,8 +41,8 @@ body {
|
| overlaps it) */
|
| .gallery > .back-button div {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/back_to_files.png') 1x,
|
| - url('../images/gallery/2x/back_to_files.png') 2x);
|
| + url('../images/100/back_to_files.png') 1x,
|
| + url('../images/200/back_to_files.png') 2x);
|
| background-position: center center;
|
| background-repeat: no-repeat;
|
| height: 40px;
|
| @@ -73,42 +73,42 @@ body {
|
|
|
| .gallery[tools] .image-container[cursor='move'] {
|
| cursor: -webkit-image-set(
|
| - url('../images/gallery/cursor_move.png') 1x,
|
| - url('../images/gallery/2x/cursor_move.png') 2x) 15 15, auto;
|
| + url('../images/100/cursor_move.png') 1x,
|
| + url('../images/200/cursor_move.png') 2x) 15 15, auto;
|
| }
|
|
|
| .gallery[tools] .image-container[cursor='crop'] {
|
| cursor: -webkit-image-set(
|
| - url('../images/gallery/cursor_crop.png') 1x,
|
| - url('../images/gallery/2x/cursor_crop.png') 2x) 15 15, auto;
|
| + url('../images/100/cursor_crop.png') 1x,
|
| + url('../images/200/cursor_crop.png') 2x) 15 15, auto;
|
| }
|
|
|
| .gallery[tools] .image-container[cursor='n-resize'],
|
| .gallery[tools] .image-container[cursor='s-resize'] {
|
| cursor: -webkit-image-set(
|
| - url('../images/gallery/cursor_updown.png') 1x,
|
| - url('../images/gallery/2x/cursor_updown.png') 2x) 15 15, auto;
|
| + url('../images/100/cursor_updown.png') 1x,
|
| + url('../images/200/cursor_updown.png') 2x) 15 15, auto;
|
| }
|
|
|
| .gallery[tools] .image-container[cursor='e-resize'],
|
| .gallery[tools] .image-container[cursor='w-resize'] {
|
| cursor: -webkit-image-set(
|
| - url('../images/gallery/cursor_leftright.png') 1x,
|
| - url('../images/gallery/2x/cursor_leftright.png') 2x) 15 15, auto;
|
| + url('../images/100/cursor_leftright.png') 1x,
|
| + url('../images/200/cursor_leftright.png') 2x) 15 15, auto;
|
| }
|
|
|
| .gallery[tools] .image-container[cursor='nw-resize'],
|
| .gallery[tools] .image-container[cursor='se-resize'] {
|
| cursor: -webkit-image-set(
|
| - url('../images/gallery/cursor_nwse.png') 1x,
|
| - url('../images/gallery/2x/cursor_nwse.png') 2x) 15 15, auto;
|
| + url('../images/100/cursor_nwse.png') 1x,
|
| + url('../images/200/cursor_nwse.png') 2x) 15 15, auto;
|
| }
|
|
|
| .gallery[tools] .image-container[cursor='ne-resize'],
|
| .gallery[tools] .image-container[cursor='sw-resize'] {
|
| cursor: -webkit-image-set(
|
| - url('../images/gallery/cursor_swne.png') 1x,
|
| - url('../images/gallery/2x/cursor_swne.png') 2x) 15 15, auto;
|
| + url('../images/100/cursor_swne.png') 1x,
|
| + url('../images/200/cursor_swne.png') 2x) 15 15, auto;
|
| }
|
|
|
| .gallery .image-container > .image {
|
| @@ -257,14 +257,14 @@ body {
|
|
|
| .gallery .arrow.left div {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/arrow_left.png') 1x,
|
| - url('../images/gallery/2x/arrow_left.png') 2x);
|
| + url('../images/100/arrow_left.png') 1x,
|
| + url('../images/200/arrow_left.png') 2x);
|
| }
|
|
|
| .gallery .arrow.right div {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/arrow_right.png') 1x,
|
| - url('../images/gallery/2x/arrow_right.png') 2x);
|
| + url('../images/100/arrow_right.png') 1x,
|
| + url('../images/200/arrow_right.png') 2x);
|
| }
|
|
|
| /* Special behavior on mouse drag.
|
| @@ -622,94 +622,94 @@ body {
|
|
|
| .gallery > .toolbar button.autofix {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_autofix.png') 1x,
|
| - url('../images/gallery/2x/icon_autofix.png') 2x);
|
| + url('../images/100/icon_autofix.png') 1x,
|
| + url('../images/200/icon_autofix.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.autofix:active,
|
| .gallery > .toolbar button.autofix[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_autofix_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_autofix_selected.png') 2x);
|
| + url('../images/100/icon_autofix_selected.png') 1x,
|
| + url('../images/200/icon_autofix_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.crop {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_crop.png') 1x,
|
| - url('../images/gallery/2x/icon_crop.png') 2x);
|
| + url('../images/100/icon_crop.png') 1x,
|
| + url('../images/200/icon_crop.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.crop:active,
|
| .gallery > .toolbar button.crop[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_crop_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_crop_selected.png') 2x);
|
| + url('../images/100/icon_crop_selected.png') 1x,
|
| + url('../images/200/icon_crop_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.exposure {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_brightness.png') 1x,
|
| - url('../images/gallery/2x/icon_brightness.png') 2x);
|
| + url('../images/100/icon_brightness.png') 1x,
|
| + url('../images/200/icon_brightness.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.exposure:active,
|
| .gallery > .toolbar button.exposure[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_brightness_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_brightness_selected.png') 2x);
|
| + url('../images/100/icon_brightness_selected.png') 1x,
|
| + url('../images/200/icon_brightness_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.rotate_right {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_rotate.png') 1x,
|
| - url('../images/gallery/2x/icon_rotate.png') 2x);
|
| + url('../images/100/icon_rotate.png') 1x,
|
| + url('../images/200/icon_rotate.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.rotate_right:active,
|
| .gallery > .toolbar button.rotate_right[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_rotate_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_rotate_selected.png') 2x);
|
| + url('../images/100/icon_rotate_selected.png') 1x,
|
| + url('../images/200/icon_rotate_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.rotate_left {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_rotate_left.png') 1x,
|
| - url('../images/gallery/2x/icon_rotate_left.png') 2x);
|
| + url('../images/100/icon_rotate_left.png') 1x,
|
| + url('../images/200/icon_rotate_left.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.rotate_left:active,
|
| .gallery > .toolbar button.rotate_left[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_rotate_left_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_rotate_left_selected.png') 2x);
|
| + url('../images/100/icon_rotate_left_selected.png') 1x,
|
| + url('../images/200/icon_rotate_left_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.undo {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_undo.png') 1x,
|
| - url('../images/gallery/2x/icon_undo.png') 2x);
|
| + url('../images/100/icon_undo.png') 1x,
|
| + url('../images/200/icon_undo.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.undo:active,
|
| .gallery > .toolbar button.undo[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_undo_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_undo_selected.png') 2x);
|
| + url('../images/100/icon_undo_selected.png') 1x,
|
| + url('../images/200/icon_undo_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button.redo {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_redo.png') 1x,
|
| - url('../images/gallery/2x/icon_redo.png') 2x);
|
| + url('../images/100/icon_redo.png') 1x,
|
| + url('../images/200/icon_redo.png') 2x);
|
| position: absolute; /* Exclude from center-packing*/
|
| }
|
|
|
| .gallery > .toolbar button.redo:active,
|
| .gallery > .toolbar button.redo[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_redo_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_redo_selected.png') 2x);
|
| + url('../images/100/icon_redo_selected.png') 1x,
|
| + url('../images/200/icon_redo_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar button[disabled],
|
| @@ -724,90 +724,90 @@ body {
|
|
|
| .gallery[mode='slide'] > .toolbar > button.mode {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_mosaic.png') 1x,
|
| - url('../images/gallery/2x/icon_mosaic.png') 2x);
|
| + url('../images/100/icon_mosaic.png') 1x,
|
| + url('../images/200/icon_mosaic.png') 2x);
|
| }
|
|
|
| .gallery[mode='slide'] > .toolbar > button.mode:active {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_mosaic_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_mosaic_selected.png') 2x);
|
| + url('../images/100/icon_mosaic_selected.png') 1x,
|
| + url('../images/200/icon_mosaic_selected.png') 2x);
|
| }
|
|
|
| .gallery[mode='mosaic'] > .toolbar > button.mode {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_1up.png') 1x,
|
| - url('../images/gallery/2x/icon_1up.png') 2x);
|
| + url('../images/100/icon_1up.png') 1x,
|
| + url('../images/200/icon_1up.png') 2x);
|
| }
|
|
|
| .gallery[mode='mosaic'] > .toolbar > button.mode:active {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_1up_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_1up_selected.png') 2x);
|
| + url('../images/100/icon_1up_selected.png') 1x,
|
| + url('../images/200/icon_1up_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.slideshow {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_slideshow.png') 1x,
|
| - url('../images/gallery/2x/icon_slideshow.png') 2x);
|
| + url('../images/100/icon_slideshow.png') 1x,
|
| + url('../images/200/icon_slideshow.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.slideshow:active,
|
| .gallery > .toolbar > button.slideshow[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_slideshow_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_slideshow_selected.png') 2x);
|
| + url('../images/100/icon_slideshow_selected.png') 1x,
|
| + url('../images/200/icon_slideshow_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.delete {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_delete.png') 1x,
|
| - url('../images/gallery/2x/icon_delete.png') 2x);
|
| + url('../images/100/icon_delete.png') 1x,
|
| + url('../images/200/icon_delete.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.delete:active {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_delete_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_delete_selected.png') 2x);
|
| + url('../images/100/icon_delete_selected.png') 1x,
|
| + url('../images/200/icon_delete_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.edit {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_edit.png') 1x,
|
| - url('../images/gallery/2x/icon_edit.png') 2x);
|
| + url('../images/100/icon_edit.png') 1x,
|
| + url('../images/200/icon_edit.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.edit:active,
|
| .gallery > .toolbar > button.edit[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_edit_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_edit_selected.png') 2x);
|
| + url('../images/100/icon_edit_selected.png') 1x,
|
| + url('../images/200/icon_edit_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.print {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_print.png') 1x,
|
| - url('../images/gallery/2x/icon_print.png') 2x);
|
| + url('../images/100/icon_print.png') 1x,
|
| + url('../images/200/icon_print.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.print:active,
|
| .gallery > .toolbar > button.print[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_print_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_print_selected.png') 2x);
|
| + url('../images/100/icon_print_selected.png') 1x,
|
| + url('../images/200/icon_print_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.share {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_share.png') 1x,
|
| - url('../images/gallery/2x/icon_share.png') 2x);
|
| + url('../images/100/icon_share.png') 1x,
|
| + url('../images/200/icon_share.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.share:active,
|
| .gallery > .toolbar > button.share[pressed] {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_share_selected.png') 1x,
|
| - url('../images/gallery/2x/icon_share_selected.png') 2x);
|
| + url('../images/100/icon_share_selected.png') 1x,
|
| + url('../images/200/icon_share_selected.png') 2x);
|
| }
|
|
|
| .gallery > .toolbar > button.share[disabled] {
|
| @@ -855,14 +855,14 @@ body {
|
|
|
| .gallery .edit-modal .label.brightness {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_brightness.png') 1x,
|
| - url('../images/gallery/2x/icon_brightness.png') 2x);
|
| + url('../images/100/icon_brightness.png') 1x,
|
| + url('../images/200/icon_brightness.png') 2x);
|
| }
|
|
|
| .gallery .edit-modal .label.contrast {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/icon_contrast.png') 1x,
|
| - url('../images/gallery/2x/icon_contrast.png') 2x);
|
| + url('../images/100/icon_contrast.png') 1x,
|
| + url('../images/200/icon_contrast.png') 2x);
|
| height: 24px;
|
| margin-left: 15px;
|
| }
|
| @@ -877,8 +877,8 @@ body {
|
| .gallery .edit-modal .range::-webkit-slider-thumb {
|
| -webkit-appearance: none;
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/slider_thumb.png') 1x,
|
| - url('../images/gallery/2x/slider_thumb.png') 2x);
|
| + url('../images/100/slider_thumb.png') 1x,
|
| + url('../images/200/slider_thumb.png') 2x);
|
| height: 29px;
|
| width: 16px;
|
| }
|
| @@ -1024,8 +1024,8 @@ body {
|
|
|
| .gallery .prompt .back-button {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/butterbar_close_button.png') 1x,
|
| - url('../images/gallery/2x/butterbar_close_button.png') 2x);
|
| + url('../images/100/butterbar_close_button.png') 1x,
|
| + url('../images/200/butterbar_close_button.png') 2x);
|
| background-position: center center;
|
| background-repeat: no-repeat;
|
| height: 16px;
|
| @@ -1058,8 +1058,8 @@ body {
|
|
|
| .gallery .share-menu .bubble-point {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/bubble_point.png') 1x,
|
| - url('../images/gallery/2x/bubble_point.png') 2x);
|
| + url('../images/100/bubble_point.png') 1x,
|
| + url('../images/200/bubble_point.png') 2x);
|
| background-position: center top;
|
| background-repeat: no-repeat;
|
| bottom: -8px;
|
| @@ -1097,7 +1097,7 @@ body {
|
| /* Load spinner and error banner. */
|
|
|
| .gallery .spinner {
|
| - background-image: url(../images/common/spinner.svg);
|
| + background-image: url(../images/100/common/spinner.svg);
|
| background-size: 100%;
|
| height: 16px;
|
| left: 50%;
|
| @@ -1118,8 +1118,8 @@ body {
|
| -webkit-box-pack: center;
|
| background-color: rgba(24, 24, 24, 1);
|
| background-image: -webkit-image-set(
|
| - url('../images/media/error.png') 1x,
|
| - url('../images/media/2x/error.png') 2x);
|
| + url('../images/100/media/error.png') 1x,
|
| + url('../images/100/media/2x/error.png') 2x);
|
| background-position: 25px center;
|
| background-repeat: no-repeat;
|
| color: white;
|
| @@ -1333,21 +1333,21 @@ body {
|
|
|
| .slideshow-toolbar > .slideshow-play {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/slideshow-play.png') 1x,
|
| - url('../images/gallery/2x/slideshow-play.png') 2x);
|
| + url('../images/100/slideshow-play.png') 1x,
|
| + url('../images/200/slideshow-play.png') 2x);
|
| margin-right: -2px;
|
| }
|
|
|
| .gallery[slideshow='playing'] .slideshow-toolbar > .slideshow-play {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/slideshow-pause.png') 1x,
|
| - url('../images/gallery/2x/slideshow-pause.png') 2x);
|
| + url('../images/100/slideshow-pause.png') 1x,
|
| + url('../images/200/slideshow-pause.png') 2x);
|
| }
|
|
|
| .slideshow-toolbar > .slideshow-end {
|
| background-image: -webkit-image-set(
|
| - url('../images/gallery/slideshow-end.png') 1x,
|
| - url('../images/gallery/2x/slideshow-end.png') 2x);
|
| + url('../images/100/slideshow-end.png') 1x,
|
| + url('../images/200/slideshow-end.png') 2x);
|
| margin-left: -2px;
|
| }
|
|
|
|
|