Bug 1419898 - Fix address bar border hover state on lightweight themes. r=dao

MozReview-Commit-ID: 4e5HGbOZX0X

--HG--
extra : rebase_source : 135a9107e45439d0b1e4ad653c875b27b9c7b138
This commit is contained in:
Tim Nguyen 2017-12-05 19:16:00 +00:00
parent e323f51349
commit 914342129b
3 changed files with 14 additions and 6 deletions

View File

@ -465,7 +465,7 @@ tabbrowser {
}
.tabbrowser-tab[visuallyselected=true]:-moz-lwtheme {
color: var(--theme-tab-text, var(--toolbar-color, inherit));
color: var(--lwt-tab-text, var(--toolbar-color, inherit));
}
.tab-line {

View File

@ -4,6 +4,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%endif
%define fieldBorderColor hsla(240,5%,5%,.25)
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
:root {
/* 28x28 box - 16x16 image = 12x12 padding, 6 on each side */
--urlbar-icon-padding: 6px;
@ -23,7 +26,7 @@
.searchbar-textbox {
-moz-appearance: none;
background-clip: content-box;
border: 1px solid hsla(240,5%,5%,.25);
border: 1px solid @fieldBorderColor@;
border-radius: var(--toolbarbutton-border-radius);
box-shadow: 0 1px 4px rgba(0,0,0,.05);
padding: 0;
@ -35,7 +38,7 @@
#urlbar:hover,
.searchbar-textbox:hover {
border-color: hsla(240,5%,5%,.35);
border-color: @fieldHoverBorderColor@;
box-shadow: 0 1px 6px rgba(0,0,0,.1);
}
@ -47,7 +50,12 @@
#urlbar:not([focused="true"]):-moz-lwtheme,
#navigator-toolbox .searchbar-textbox:not([focused="true"]):-moz-lwtheme {
border-color: var(--url-and-searchbar-border-color, hsla(240,5%,5%,.25));
border-color: var(--lwt-toolbar-field-border-color, @fieldBorderColor@);
}
#urlbar:not([focused="true"]):-moz-lwtheme:hover,
#navigator-toolbox .searchbar-textbox:not([focused="true"]):-moz-lwtheme:hover {
border-color: var(--lwt-toolbar-field-border-color, @fieldHoverBorderColor@);
}
#urlbar:-moz-lwtheme:hover,

View File

@ -16,12 +16,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeImageOptimizer",
const kCSSVarsMap = new Map([
["--lwt-background-alignment", "backgroundsAlignment"],
["--lwt-background-tiling", "backgroundsTiling"],
["--theme-tab-text", "tab_text"],
["--lwt-tab-text", "tab_text"],
["--toolbar-bgcolor", "toolbarColor"],
["--toolbar-color", "toolbar_text"],
["--url-and-searchbar-background-color", "toolbar_field"],
["--url-and-searchbar-color", "toolbar_field_text"],
["--url-and-searchbar-border-color", "toolbar_field_border"],
["--lwt-toolbar-field-border-color", "toolbar_field_border"],
["--tabs-border-color", "toolbar_top_separator"],
["--toolbox-border-bottom-color", "toolbar_bottom_separator"],
["--urlbar-separator-color", "toolbar_vertical_separator"],