зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1702350 - Clean up findbar styling. r=emalysz
Differential Revision: https://phabricator.services.mozilla.com/D110480
This commit is contained in:
Tim Nguyen
Родитель
7d8f2e48b1
Коммит
c8cde5a910
|
|
@ -314,12 +314,6 @@ menupopup::part(drop-indicator) {
|
|||
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
|
||||
}
|
||||
|
||||
@supports -moz-bool-pref("browser.proton.enabled") {
|
||||
.browserContainer > findbar {
|
||||
padding: 6px;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
/* Private browsing and accessibility indicators */
|
||||
|
||||
.accessibility-indicator,
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<toolbarbutton anonid="find-closebutton" class="findbar-closebutton tabbable close-icon"
|
||||
data-l10n-id="findbar-find-button-close" oncommand="close();" />
|
||||
<hbox anonid="findbar-textbox-wrapper" align="stretch">
|
||||
<html:input anonid="findbar-textbox" class="findbar-textbox findbar-find-fast" />
|
||||
<html:input anonid="findbar-textbox" class="findbar-textbox" />
|
||||
<toolbarbutton anonid="find-previous" class="findbar-find-previous tabbable"
|
||||
data-l10n-attrs="tooltiptext" data-l10n-id="findbar-previous"
|
||||
oncommand="onFindAgainCommand(true);" disabled="true" />
|
||||
|
|
@ -53,19 +53,19 @@
|
|||
data-l10n-id="findbar-next" oncommand="onFindAgainCommand(false);" disabled="true" />
|
||||
</hbox>
|
||||
<checkbox anonid="highlight" class="findbar-highlight tabbable"
|
||||
data-l10n-id="findbar-highlight-all2" oncommand="toggleHighlight(this.checked);" type="checkbox" />
|
||||
data-l10n-id="findbar-highlight-all2" oncommand="toggleHighlight(this.checked);"/>
|
||||
<checkbox anonid="find-case-sensitive" class="findbar-case-sensitive tabbable"
|
||||
data-l10n-id="findbar-case-sensitive" oncommand="_setCaseSensitivity(this.checked ? 1 : 0);" type="checkbox" />
|
||||
data-l10n-id="findbar-case-sensitive" oncommand="_setCaseSensitivity(this.checked ? 1 : 0);"/>
|
||||
<checkbox anonid="find-match-diacritics" class="findbar-match-diacritics tabbable"
|
||||
data-l10n-id="findbar-match-diacritics" oncommand="_setDiacriticMatching(this.checked ? 1 : 0);" type="checkbox" />
|
||||
data-l10n-id="findbar-match-diacritics" oncommand="_setDiacriticMatching(this.checked ? 1 : 0);"/>
|
||||
<checkbox anonid="find-entire-word" class="findbar-entire-word tabbable"
|
||||
data-l10n-id="findbar-entire-word" oncommand="toggleEntireWord(this.checked);" type="checkbox" />
|
||||
<label anonid="match-case-status" class="findbar-find-fast" />
|
||||
<label anonid="match-diacritics-status" class="findbar-find-fast" />
|
||||
<label anonid="entire-word-status" class="findbar-find-fast" />
|
||||
<label anonid="found-matches" class="findbar-find-fast found-matches" hidden="true" />
|
||||
<image anonid="find-status-icon" class="findbar-find-fast find-status-icon" />
|
||||
<description anonid="find-status" control="findbar-textbox" class="findbar-find-fast findbar-find-status" />
|
||||
data-l10n-id="findbar-entire-word" oncommand="toggleEntireWord(this.checked);"/>
|
||||
<label anonid="match-case-status" class="findbar-label" />
|
||||
<label anonid="match-diacritics-status" class="findbar-label" />
|
||||
<label anonid="entire-word-status" class="findbar-label" />
|
||||
<label anonid="found-matches" class="findbar-label found-matches" hidden="true" />
|
||||
<image anonid="find-status-icon" class="find-status-icon" />
|
||||
<description anonid="find-status" control="findbar-textbox" class="findbar-label findbar-find-status" />
|
||||
</hbox>
|
||||
`;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,19 +44,4 @@ html|input.findbar-textbox {
|
|||
html|input.findbar-textbox:-moz-locale-dir(rtl) {
|
||||
background-position-x: right 5px;
|
||||
}
|
||||
}
|
||||
/*** END !proton ***/
|
||||
|
||||
.findbar-container {
|
||||
padding-inline-start: 2px;
|
||||
}
|
||||
|
||||
label.findbar-find-fast {
|
||||
color: #6d6d6d;
|
||||
margin: 0;
|
||||
margin-inline-start: 12px;
|
||||
}
|
||||
|
||||
label.findbar-find-fast:-moz-lwtheme {
|
||||
color: inherit;
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
|
|
|||
|
|
@ -27,12 +27,8 @@ findbar[noanim] {
|
|||
transition-delay: 0s !important;
|
||||
}
|
||||
|
||||
.findbar-container > checkbox {
|
||||
margin: 0 8px;
|
||||
}
|
||||
|
||||
.findbar-closebutton {
|
||||
padding: 0 8px;
|
||||
.findbar-container {
|
||||
padding: 6px;
|
||||
}
|
||||
|
||||
/* Search field */
|
||||
|
|
@ -81,27 +77,19 @@ html|input.findbar-textbox[flash="true"] {
|
|||
color: inherit;
|
||||
}
|
||||
|
||||
html|input.findbar-textbox.minimal {
|
||||
border-radius: 2px;
|
||||
}
|
||||
/* Previous/next buttons */
|
||||
|
||||
.findbar-find-previous,
|
||||
.findbar-find-next {
|
||||
margin-inline-start: 0;
|
||||
appearance: none;
|
||||
padding: 2px 5px;
|
||||
line-height: 1em;
|
||||
padding: 4px 7px;
|
||||
-moz-context-properties: fill;
|
||||
fill: currentColor;
|
||||
color: inherit;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.findbar-find-previous > .toolbarbutton-icon,
|
||||
.findbar-find-next > .toolbarbutton-icon {
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
.findbar-find-previous:not([disabled]):hover,
|
||||
.findbar-find-next:not([disabled]):hover {
|
||||
background: var(--button-hover-bgcolor, rgba(190,190,190,.2));
|
||||
|
|
@ -109,7 +97,7 @@ html|input.findbar-textbox.minimal {
|
|||
|
||||
.findbar-find-previous:not([disabled]):hover:active,
|
||||
.findbar-find-next:not([disabled]):hover:active {
|
||||
background: var(--button-active-bgcolor, rgba(23,50,76,.2));
|
||||
background: var(--button-active-bgcolor, rgba(190,190,190,.4));
|
||||
}
|
||||
|
||||
.findbar-find-previous {
|
||||
|
|
@ -123,11 +111,6 @@ html|input.findbar-textbox.minimal {
|
|||
list-style-image: url(chrome://global/skin/icons/find-next-arrow.svg);
|
||||
}
|
||||
|
||||
.findbar-find-next:-moz-lwtheme,
|
||||
.findbar-find-previous:-moz-lwtheme {
|
||||
border-color: var(--lwt-toolbar-field-border-color, ThreeDShadow);
|
||||
}
|
||||
|
||||
.findbar-find-previous > .toolbarbutton-icon,
|
||||
.findbar-find-next > .toolbarbutton-icon {
|
||||
margin: 0;
|
||||
|
|
@ -138,37 +121,36 @@ html|input.findbar-textbox.minimal {
|
|||
opacity: .4;
|
||||
}
|
||||
|
||||
/* Checkboxes & Labels */
|
||||
|
||||
.findbar-highlight,
|
||||
.findbar-case-sensitive,
|
||||
.findbar-match-diacritics,
|
||||
.findbar-entire-word {
|
||||
margin-inline-start: 5px;
|
||||
}
|
||||
|
||||
.findbar-highlight > .toolbarbutton-icon,
|
||||
.findbar-case-sensitive > .toolbarbutton-icon,
|
||||
.findbar-match-diacritics > .toolbarbutton-icon,
|
||||
.findbar-entire-word > .toolbarbutton-icon {
|
||||
display: none;
|
||||
.findbar-entire-word,
|
||||
.findbar-label {
|
||||
margin: 0 8px;
|
||||
}
|
||||
|
||||
.findbar-find-status,
|
||||
.found-matches {
|
||||
color: GrayText;
|
||||
margin: 0 !important;
|
||||
margin-inline-start: 12px !important;
|
||||
margin-inline-start: 12px;
|
||||
}
|
||||
|
||||
.findbar-find-status:-moz-lwtheme,
|
||||
.found-matches:-moz-lwtheme {
|
||||
color: inherit;
|
||||
opacity: .6;
|
||||
@supports -moz-bool-pref("browser.proton.enabled") {
|
||||
.findbar-find-status[status="notfound"] {
|
||||
color: var(--error-text-color, color-mix(in srgb, currentColor 40%, #C50042));
|
||||
}
|
||||
|
||||
.find-status-icon {
|
||||
display: none;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
/* Close button */
|
||||
|
||||
.findbar-closebutton {
|
||||
/* Override margin-inline from close-icon.css */
|
||||
margin-inline: 4px 8px !important;
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
|
|
@ -179,6 +161,10 @@ html|input.findbar-textbox {
|
|||
width: 14em;
|
||||
}
|
||||
|
||||
html|input.findbar-textbox.minimal {
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
html|input.findbar-textbox:focus {
|
||||
background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, Field));
|
||||
color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, FieldText));
|
||||
|
|
@ -193,7 +179,7 @@ html|input.findbar-textbox[status="notfound"] {
|
|||
|
||||
.findbar-container {
|
||||
padding-block: 4px;
|
||||
padding-inline-start: 8px;
|
||||
padding-inline: 8px 0;
|
||||
}
|
||||
|
||||
.findbar-find-previous,
|
||||
|
|
@ -204,9 +190,9 @@ html|input.findbar-textbox[status="notfound"] {
|
|||
border-radius: 0;
|
||||
}
|
||||
|
||||
.findbar-find-previous > .toolbarbutton-icon,
|
||||
.findbar-find-next > .toolbarbutton-icon {
|
||||
padding: 0;
|
||||
.findbar-find-next:-moz-lwtheme,
|
||||
.findbar-find-previous:-moz-lwtheme {
|
||||
border-color: var(--lwt-toolbar-field-border-color, ThreeDShadow);
|
||||
}
|
||||
|
||||
.findbar-find-previous {
|
||||
|
|
@ -216,7 +202,7 @@ html|input.findbar-textbox[status="notfound"] {
|
|||
.findbar-find-next {
|
||||
border-start-end-radius: 2px;
|
||||
border-end-end-radius: 2px;
|
||||
margin-inline-end: 0;
|
||||
margin-inline-end: 8px;
|
||||
}
|
||||
|
||||
.findbar-find-previous:not([disabled]):hover:active,
|
||||
|
|
@ -224,9 +210,13 @@ html|input.findbar-textbox[status="notfound"] {
|
|||
box-shadow: 0 1px 2px rgba(10,31,51,.2) inset;
|
||||
}
|
||||
|
||||
.findbar-label:not(:-moz-lwtheme) {
|
||||
color: color-mix(in srgb, currentColor 65%, transparent);
|
||||
}
|
||||
|
||||
.find-status-icon[status="pending"] {
|
||||
list-style-image: url("chrome://global/skin/icons/loading.png");
|
||||
margin-inline-start: 8px;
|
||||
}
|
||||
|
||||
@media (min-resolution: 1.1dppx) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче