Commit f1e1f1b2 authored by Alex Danilo's avatar Alex Danilo Committed by Commit Bot

Style action bar buttons for files-ng

Adds a bunch of style rule changes for the dialog header, managed by
the CSS class 'files-ng'.

Moved input styles from main.html since files-ng uses different colors.

Note: text-transform is set to 'none' for the cancel selection
button to retain the same behavior for the not files-ng styling.

Bug: 992823
Change-Id: I153d6e2e9e4268a77bbe3d06941e85a50f5e3650
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1984785
Commit-Queue: Alex Danilo <adanilo@chromium.org>
Reviewed-by: default avatarNoel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740503}
parent 1b5089a1
...@@ -428,6 +428,12 @@ div.splitter { ...@@ -428,6 +428,12 @@ div.splitter {
transition: background 220ms ease; transition: background 220ms ease;
} }
.dialog-header.files-ng {
background: none;
border-bottom: 1px solid var(--cr-separator-color, rgb(224, 224, 224));
color: var(--google-grey-700);
}
body.check-select .dialog-header { body.check-select .dialog-header {
background: white; background: white;
border-bottom: 1px solid rgb(219, 219, 219); border-bottom: 1px solid rgb(219, 219, 219);
...@@ -460,11 +466,15 @@ body[type='open-multi-file'].check-select .dialog-header { ...@@ -460,11 +466,15 @@ body[type='open-multi-file'].check-select .dialog-header {
z-index: 1; z-index: 1;
} }
.dialog-header button, .dialog-header:not(.files-ng) button,
.dialog-header button:hover { .dialog-header:not(.files-ng) button:hover {
color: white; color: white;
} }
.dialog-header.files-ng cr-button {
--text-color: currentColor;
}
body.check-select button, body.check-select button,
body.check-select button:hover { body.check-select button:hover {
color: rgb(90, 90, 90); color: rgb(90, 90, 90);
...@@ -541,86 +551,132 @@ html[dir='rtl'] .dialog-header button.icon-button > files-toggle-ripple { ...@@ -541,86 +551,132 @@ html[dir='rtl'] .dialog-header button.icon-button > files-toggle-ripple {
width: 32px; width: 32px;
} }
#search-button > .icon { .dialog-header.files-ng cr-button > .icon,
.dialog-header.files-ng #search-box .clear,
.dialog-header.files-ng #read-only-icon,
.dialog-header.files-ng .breadcrumbs .separator {
-webkit-mask-position: center;
-webkit-mask-repeat: no-repeat;
background-color: currentColor;
background-image: none;
}
.dialog-header:not(.files-ng) #search-button > .icon {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/files/ui/search_white.png) 1x, url(../images/files/ui/search_white.png) 1x,
url(../images/files/ui/2x/search_white.png) 2x); url(../images/files/ui/2x/search_white.png) 2x);
} }
.dialog-header.files-ng #search-button > .icon {
-webkit-mask-image: url(../images/files/ui/search.svg);
}
body.check-select #search-button > .icon { body.check-select #search-button > .icon {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/files/ui/search.png) 1x, url(../images/files/ui/search.png) 1x,
url(../images/files/ui/2x/search.png) 2x); url(../images/files/ui/2x/search.png) 2x);
} }
#share-menu-button > .icon { .dialog-header:not(.files-ng) #share-menu-button > .icon {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/files/ui/share_white.png) 1x, url(../images/files/ui/share_white.png) 1x,
url(../images/files/ui/2x/share_white.png) 2x); url(../images/files/ui/2x/share_white.png) 2x);
} }
.dialog-header.files-ng #share-menu-button > .icon {
-webkit-mask-image: url(../images/files/ui/share_ng.svg);
}
body.check-select #share-menu-button > .icon { body.check-select #share-menu-button > .icon {
background-image: url(../images/files/ui/share.svg); background-image: url(../images/files/ui/share.svg);
} }
#delete-button > .icon { .dialog-header:not(.files-ng) #delete-button > .icon {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/files/ui/delete_white.png) 1x, url(../images/files/ui/delete_white.png) 1x,
url(../images/files/ui/2x/delete_white.png) 2x); url(../images/files/ui/2x/delete_white.png) 2x);
} }
.dialog-header.files-ng #delete-button > .icon {
-webkit-mask-image: url(../images/files/ui/delete_ng.svg);
}
body.check-select #delete-button > .icon { body.check-select #delete-button > .icon {
background-image: url(../images/files/ui/delete.svg); background-image: url(../images/files/ui/delete.svg);
} }
#view-button > .icon { .dialog-header:not(.files-ng) #refresh-button > .icon {
background-image: -webkit-image-set(
url(../images/files/ui/refresh_white.png) 1x,
url(../images/files/ui/2x/refresh_white.png) 2x);
}
.dialog-header.files-ng #refresh-button > .icon {
-webkit-mask-image: url(../images/files/ui/refresh.svg);
}
.dialog-header:not(.files-ng) #view-button > .icon {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/files/ui/view_list_white.png) 1x, url(../images/files/ui/view_list_white.png) 1x,
url(../images/files/ui/2x/view_list_white.png) 2x); url(../images/files/ui/2x/view_list_white.png) 2x);
} }
#refresh-button > .icon { .dialog-header.files-ng #view-button > .icon {
background-image: -webkit-image-set( -webkit-mask-image: url(../images/files/ui/view_list.svg);
url(../images/files/ui/refresh_white.png) 1x,
url(../images/files/ui/2x/refresh_white.png) 2x);
} }
body.check-select #view-button { body.check-select #view-button {
display: none; display: none;
} }
#view-button.thumbnail > .icon { .dialog-header:not(.files-ng) #view-button.thumbnail > .icon {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/files/ui/view_thumbnail_white.png) 1x, url(../images/files/ui/view_thumbnail_white.png) 1x,
url(../images/files/ui/2x/view_thumbnail_white.png) 2x); url(../images/files/ui/2x/view_thumbnail_white.png) 2x);
} }
.dialog-header.files-ng #view-button.thumbnail > .icon {
-webkit-mask-image: url(../images/files/ui/view_thumbnail.svg);
}
body.check-select #view-button.thumbnail { body.check-select #view-button.thumbnail {
display: none; display: none;
} }
#sort-button > .icon { .dialog-header:not(.files-ng) #sort-button > .icon {
background-image: url(../images/files/ui/sorting_white.svg); background-image: url(../images/files/ui/sorting_white.svg);
} }
.dialog-header.files-ng #sort-button > .icon {
-webkit-mask-image: url(../images/files/ui/sorting_ng.svg);
}
body.check-select #sort-button { body.check-select #sort-button {
display: none; display: none;
} }
#gear-button > .icon { .dialog-header:not(.files-ng) #gear-button > .icon {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/files/ui/menu_white.png) 1x, url(../images/files/ui/menu_white.png) 1x,
url(../images/files/ui/2x/menu_white.png) 2x); url(../images/files/ui/2x/menu_white.png) 2x);
} }
.dialog-header.files-ng #gear-button > .icon {
-webkit-mask-image: url(../images/files/ui/menu_ng.svg);
}
body.check-select #gear-button { body.check-select #gear-button {
display: none; display: none;
} }
#selection-menu-button > .icon { .dialog-header:not(.files-ng) #selection-menu-button > .icon {
background-image: url(../images/files/ui/menu.svg); background-image: url(../images/files/ui/menu.svg);
} }
.dialog-header.files-ng #selection-menu-button > .icon {
-webkit-mask-image: url(../images/files/ui/menu_ng.svg);
}
body:not(.check-select) #selection-menu-button { body:not(.check-select) #selection-menu-button {
display: none; display: none;
} }
...@@ -781,6 +837,7 @@ body.check-select #files-selected-label { ...@@ -781,6 +837,7 @@ body.check-select #files-selected-label {
box-shadow: none; box-shadow: none;
color: currentColor; color: currentColor;
display: flex; display: flex;
text-transform: none;
} }
#cancel-selection-button:focus:not([tabindex='-1']):not(:active) { #cancel-selection-button:focus:not([tabindex='-1']):not(:active) {
...@@ -839,6 +896,16 @@ body.check-select #search-button { ...@@ -839,6 +896,16 @@ body.check-select #search-button {
font-size: 14px; font-size: 14px;
} }
.dialog-header:not(.files-ng) #search-box cr-input {
--cr-input-color: white;
--cr-input-focus-color: white;
}
.dialog-header.files-ng #search-box cr-input {
--cr-input-color: var(--google-grey-800);
--cr-input-focus-color: var(--google-grey-700);
}
body.check-select #search-box { body.check-select #search-box {
display: none; display: none;
} }
...@@ -856,23 +923,32 @@ body.check-select #search-box { ...@@ -856,23 +923,32 @@ body.check-select #search-box {
} }
#search-box .clear { #search-box .clear {
background: -webkit-image-set(
url(../images/files/ui/search_clear.png) 1x,
url(../images/files/ui/2x/search_clear.png) 2x)
no-repeat center;
border: 0; border: 0;
cursor: pointer; cursor: pointer;
display: none; display: none;
height: 16px;
margin: 0; margin: 0;
min-width: 0; min-width: 0;
position: absolute; position: absolute;
right: 0; right: 0;
visibility: hidden; visibility: hidden;
}
.dialog-header:not(.files-ng) #search-box .clear {
background: -webkit-image-set(
url(../images/files/ui/search_clear.png) 1x,
url(../images/files/ui/2x/search_clear.png) 2x)
no-repeat center;
height: 16px;
width: 16px; width: 16px;
} }
#search-box .clear:focus { .dialog-header.files-ng #search-box .clear {
-webkit-mask-image: url(../images/files/ui/search_clear_filled.svg);
height: 20px;
width: 20px;
}
.dialog-header:not(.files-ng) #search-box .clear:focus {
background-color: rgba(255, 255, 255, 0.3); background-color: rgba(255, 255, 255, 0.3);
} }
...@@ -1123,6 +1199,15 @@ html[dir='rtl'] .breadcrumbs .breadcrumb-path:first-child { ...@@ -1123,6 +1199,15 @@ html[dir='rtl'] .breadcrumbs .breadcrumb-path:first-child {
cursor: default; cursor: default;
} }
.dialog-header.files-ng .breadcrumbs .breadcrumb-path {
--text-color: currentColor;
}
.dialog-header.files-ng .breadcrumbs .breadcrumb-path.breadcrumb-last {
color: var(--google-grey-900);
--text-color: currentColor;
}
/* The > arrow between breadcrumbs. */ /* The > arrow between breadcrumbs. */
.breadcrumbs .separator { .breadcrumbs .separator {
background: -webkit-image-set( background: -webkit-image-set(
...@@ -1133,6 +1218,16 @@ html[dir='rtl'] .breadcrumbs .breadcrumb-path:first-child { ...@@ -1133,6 +1218,16 @@ html[dir='rtl'] .breadcrumbs .breadcrumb-path:first-child {
width: 8px; width: 8px;
} }
.dialog-header:not(.files-ng) .breadcrumbs .separator {
background: -webkit-image-set(
url(../images/files/ui/arrow_right_white.png) 1x,
url(../images/files/ui/2x/arrow_right_white.png) 2x) center no-repeat;
}
.dialog-header.files-ng .breadcrumbs .separator {
-webkit-mask-image: url(../images/files/ui/arrow_right.svg);
}
html[dir='rtl'] .breadcrumbs .separator { html[dir='rtl'] .breadcrumbs .separator {
transform: scaleX(-1); transform: scaleX(-1);
} }
...@@ -1156,11 +1251,21 @@ body.check-select #read-only-indicator { ...@@ -1156,11 +1251,21 @@ body.check-select #read-only-indicator {
#read-only-icon { #read-only-icon {
background-image: url(../images/files/ui/visibility_white.svg); background-image: url(../images/files/ui/visibility_white.svg);
flex: none; flex: none;
height: 16px;
margin-inline-end: 8px; margin-inline-end: 8px;
}
.dialog-header:not(.files-ng) #read-only-icon {
background-image: url(../images/files/ui/visibility_white.svg);
height: 16px;
width: 16px; width: 16px;
} }
.dialog-header.files-ng #read-only-icon {
-webkit-mask-image: url(../images/files/ui/visibility_ng.svg);
height: 20px;
width: 20px;
}
#read-only-label { #read-only-label {
flex: none; flex: none;
font-size: 13px; font-size: 13px;
......
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
--cr-input-background-color: transparent; --cr-input-background-color: transparent;
--cr-input-border-bottom: 1px solid rgba(255, 255, 255, 0.5); --cr-input-border-bottom: 1px solid rgba(255, 255, 255, 0.5);
--cr-input-border-radius: 0; --cr-input-border-radius: 0;
--cr-input-color: white;
--cr-input-focus-color: white;
--cr-input-error-display: none; --cr-input-error-display: none;
--cr-input-padding-end: 20px; --cr-input-padding-end: 20px;
--cr-input-padding-start: 0; --cr-input-padding-start: 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment