Commit 7e3f56e4 authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Commit Bot

Fix 'Cancel selection' button style when focused

This button is <paper-button> in contrast to other buttons that are just
<button> so the style wasn't applying to it.

Add "menu-button" CSS class to all buttons within div.dialog-header so
they can share similar style.

Bug: 687077
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I1426891c17f734e8d4ce81cdec48c23cdefcbbdd
Reviewed-on: https://chromium-review.googlesource.com/1013844Reviewed-by: default avatarSasha Morrissey <sashab@chromium.org>
Commit-Queue: Luciano Pacheco (SYD) <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551283}
parent bf470281
...@@ -295,13 +295,15 @@ body.check-select .dialog-header button paper-ripple { ...@@ -295,13 +295,15 @@ body.check-select .dialog-header button paper-ripple {
color: rgb(90, 90, 90); color: rgb(90, 90, 90);
} }
/** Avoid highlighting if element doesn't have focus by tab (tabindex=-1)
* or if focusing during mouse click event ":active" pseudo-selector. */
.dialog-header .dialog-header
button:focus:not(.using-mouse):not([tabindex='-1']):not(:active) { .menu-button:focus:not([tabindex='-1']):not(:active) {
background-color: rgba(255, 255, 255, 0.20); background-color: rgba(255, 255, 255, 0.20);
} }
body.check-select .dialog-header body.check-select .dialog-header
button:focus:not(.using-mouse):not([tabindex='-1']):not(:active) { .menu-button:focus:not([tabindex='-1']):not(:active) {
background-color: rgba(153, 153, 153, 0.20); background-color: rgba(153, 153, 153, 0.20);
} }
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
<div class="dialog-header"> <div class="dialog-header">
<div id="location-breadcrumbs" class="breadcrumbs"></div> <div id="location-breadcrumbs" class="breadcrumbs"></div>
<div id="cancel-selection-button-wrapper"> <div id="cancel-selection-button-wrapper">
<paper-button id="cancel-selection-button" tabindex="8" <paper-button id="cancel-selection-button" class="menu-button" tabindex="8"
i18n-values="aria-label:CANCEL_SELECTION_BUTTON_LABEL"> i18n-values="aria-label:CANCEL_SELECTION_BUTTON_LABEL">
<span class="icon-arrow-back"></span> <span class="icon-arrow-back"></span>
<span id="cancel-selection-label" i18n-content="CANCEL_SELECTION_BUTTON_LABEL"></span> <span id="cancel-selection-label" i18n-content="CANCEL_SELECTION_BUTTON_LABEL"></span>
...@@ -300,11 +300,11 @@ ...@@ -300,11 +300,11 @@
</div> </div>
<div id="files-selected-label"></div> <div id="files-selected-label"></div>
<div class="spacer"></div> <div class="spacer"></div>
<button id="tasks" class="combobutton" menu="#tasks-menu" <button id="tasks" class="combobutton menu-button" menu="#tasks-menu"
tabindex="10" hidden tabindex="10" hidden
i18n-values="aria-label:TASKS_BUTTON_LABEL"> i18n-values="aria-label:TASKS_BUTTON_LABEL">
</button> </button>
<button id="share-menu-button" class="icon-button" tabindex="11" hidden <button id="share-menu-button" class="icon-button menu-button" tabindex="11" hidden
menu="#share-menu" menu="#share-menu"
i18n-values="aria-label:SHARE_BUTTON_TOOLTIP" i18n-values="aria-label:SHARE_BUTTON_TOOLTIP"
aria-activedescendant="share-menu" aria-activedescendant="share-menu"
...@@ -312,14 +312,14 @@ ...@@ -312,14 +312,14 @@
<files-toggle-ripple></files-toggle-ripple> <files-toggle-ripple></files-toggle-ripple>
<div class="icon"></div> <div class="icon"></div>
</button> </button>
<button id="delete-button" class="icon-button" tabindex="12" hidden <button id="delete-button" class="icon-button menu-button" tabindex="12" hidden
i18n-values="aria-label:DELETE_BUTTON_LABEL" i18n-values="aria-label:DELETE_BUTTON_LABEL"
visibleif="full-page" visibleif="full-page"
has-tooltip> has-tooltip>
<files-ripple></files-ripple> <files-ripple></files-ripple>
<div class="icon"></div> <div class="icon"></div>
</button> </button>
<button id="search-button" class="icon-button" tabindex="13" <button id="search-button" class="icon-button menu-button" tabindex="13"
i18n-values="aria-label:SEARCH_TEXT_LABEL" i18n-values="aria-label:SEARCH_TEXT_LABEL"
has-tooltip> has-tooltip>
<files-toggle-ripple></files-toggle-ripple> <files-toggle-ripple></files-toggle-ripple>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
<span class="clear" slot="suffix"></span> <span class="clear" slot="suffix"></span>
</paper-input-container> </paper-input-container>
</div> </div>
<button id="refresh-button" class="icon-button" tabindex="15" hidden <button id="refresh-button" class="icon-button menu-button" tabindex="15" hidden
i18n-values="aria-label:REFRESH_BUTTON_LABEL" i18n-values="aria-label:REFRESH_BUTTON_LABEL"
command="#refresh" has-tooltip> command="#refresh" has-tooltip>
<files-ripple></files-ripple> <files-ripple></files-ripple>
...@@ -343,14 +343,14 @@ ...@@ -343,14 +343,14 @@
hidden> hidden>
<div class="buttons"> <div class="buttons">
<button id="cloud-import-button" <button id="cloud-import-button"
class="icon-button" class="icon-button menu-button"
tabindex="16" tabindex="16"
i18n-values="aria-label:CLOUD_IMPORT_COMMAND" i18n-values="aria-label:CLOUD_IMPORT_COMMAND"
has-tooltip> has-tooltip>
<iron-icon icon="files:cloud-queue"></iron-icon> <iron-icon icon="files:cloud-queue"></iron-icon>
</button> </button>
<button id="cloud-import-details-button" <button id="cloud-import-details-button"
class="icon-button" class="icon-button menu-button"
tabindex="16" tabindex="16"
i18n-values="aria-label:CLOUD_IMPORT_SHOW_DETAILS" i18n-values="aria-label:CLOUD_IMPORT_SHOW_DETAILS"
has-tooltip> has-tooltip>
...@@ -362,13 +362,13 @@ ...@@ -362,13 +362,13 @@
<files-toggle-ripple></files-toggle-ripple> <files-toggle-ripple></files-toggle-ripple>
</div> </div>
</div> </div>
<button id="view-button" class="icon-button" tabindex="17" <button id="view-button" class="icon-button menu-button" tabindex="17"
i18n-values="aria-label:CHANGE_TO_THUMBNAILVIEW_BUTTON_LABEL" i18n-values="aria-label:CHANGE_TO_THUMBNAILVIEW_BUTTON_LABEL"
has-tooltip> has-tooltip>
<files-ripple></files-ripple> <files-ripple></files-ripple>
<div class="icon"></div> <div class="icon"></div>
</button> </button>
<button id="sort-button" class="icon-button" tabindex="18" <button id="sort-button" class="icon-button menu-button" tabindex="18"
menu="#sort-menu" menu="#sort-menu"
i18n-values="aria-label:SORT_BUTTON_TOOLTIP" i18n-values="aria-label:SORT_BUTTON_TOOLTIP"
aria-activedescendant="sort-menu" aria-activedescendant="sort-menu"
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
<files-toggle-ripple></files-toggle-ripple> <files-toggle-ripple></files-toggle-ripple>
<div class="icon"></div> <div class="icon"></div>
</button> </button>
<button id="gear-button" class="icon-button" tabindex="19" <button id="gear-button" class="icon-button menu-button" tabindex="19"
menu="#gear-menu" menu="#gear-menu"
i18n-values="aria-label:GEAR_BUTTON_TOOLTIP" i18n-values="aria-label:GEAR_BUTTON_TOOLTIP"
aria-activedescendant="gear-menu" aria-activedescendant="gear-menu"
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
<files-toggle-ripple></files-toggle-ripple> <files-toggle-ripple></files-toggle-ripple>
<div class="icon"></div> <div class="icon"></div>
</button> </button>
<button id="selection-menu-button" class="icon-button" tabindex="19" <button id="selection-menu-button" class="icon-button menu-button" tabindex="19"
menu="#file-context-menu" menu="#file-context-menu"
i18n-values="aria-label:SELECTION_MENU_BUTTON_TOOLTIP" i18n-values="aria-label:SELECTION_MENU_BUTTON_TOOLTIP"
aria-activedescendant="file-context-menu" aria-activedescendant="file-context-menu"
......
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