Bug 1346280 - Use --focus-ring-box-shadow in place of @focusRingShadow@/@yosemiteRingFocusShadow@ in osx theme. r=Gijs

* replace use of @focusRingShadow@ with the CSS variable in toolkit osx theme and browser theme files
* remove redundant @media blocks as --focus-ring-box-shadow is already mac-theme specific
* fix focus style for tabprompt buttons (alert buttons)
* fix focus style for notification anchor icons

MozReview-Commit-ID: EFAMwSbwdGX

--HG--
extra : rebase_source : 9b33c5dc2d2e0c00e983f2c64a9f902f9947cfd6
This commit is contained in:
Sam Foster 2017-03-15 12:44:40 -07:00
parent 18e322c255
commit e7750a3e51
6 changed files with 16 additions and 41 deletions

View File

@ -2909,8 +2909,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
%include ../shared/notification-icons.inc.css
.notification-anchor-icon:-moz-focusring {
box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
0 0 3px 2px -moz-mac-focusring;
box-shadow: var(--focus-ring-box-shadow);
}
/* Translation */

View File

@ -51,5 +51,3 @@
#identity-popup-securityView-body > button:-moz-focusring {
box-shadow: var(--focus-ring-box-shadow);
}

View File

@ -105,7 +105,7 @@ label.findbar-find-fast:-moz-lwtheme,
.findbar-find-next:-moz-focusring,
.findbar-find-previous:-moz-focusring {
position: relative;
box-shadow: @focusRingShadow@, @roundButtonShadow@;
box-shadow: var(--focus-ring-box-shadow), @roundButtonShadow@;
}
.findbar-container > toolbarbutton[disabled] {
@ -129,20 +129,7 @@ label.findbar-find-fast:-moz-lwtheme,
.findbar-find-previous:hover:active:-moz-focusring {
text-shadow: @loweredShadow@;
background: @roundButtonPressedBackground@;
box-shadow: @focusRingShadow@, @roundButtonPressedShadow@;
}
@media (-moz-mac-yosemite-theme) {
.findbar-container > toolbarbutton:-moz-focusring,
.findbar-find-next:-moz-focusring,
.findbar-find-previous:-moz-focusring {
box-shadow: @yosemiteFocusRingShadow@, @roundButtonShadow@;
}
.findbar-find-next:hover:active:-moz-focusring,
.findbar-find-previous:hover:active:-moz-focusring {
box-shadow: @yosemiteFocusRingShadow@, @roundButtonPressedShadow@;
}
box-shadow: var(--focus-ring-box-shadow), @roundButtonPressedShadow@;
}
/* Search field */
@ -180,13 +167,7 @@ label.findbar-find-fast:-moz-lwtheme,
}
.findbar-textbox[focused="true"] {
box-shadow: @focusRingShadow@;
}
@media (-moz-mac-yosemite-theme) {
.findbar-textbox[focused="true"] {
box-shadow: @yosemiteFocusRingShadow@;
}
box-shadow: var(--focus-ring-box-shadow);
}
.findbar-textbox[flash="true"] {

View File

@ -36,7 +36,7 @@ window,
page,
dialog,
wizard,
prefwindow {
prefwindow {
-moz-appearance: dialog;
background-color: #FFFFFF;
color: -moz-DialogText;
@ -118,7 +118,7 @@ statusbarpanel {
.statusbarpanel-iconic {
padding: 0px;
}
}
/* ::::: miscellaneous formatting ::::: */
@ -147,7 +147,7 @@ statusbar:-moz-lwtheme {
border-bottom-color: ThreeDHighlight;
margin: 0 5px 5px;
}
.outset {
border: 1px solid ThreeDShadow;
border-left-color: ThreeDHighlight;
@ -163,7 +163,7 @@ separator[orient="vertical"] {
separator.thin:not([orient="vertical"]) {
height: 0.5em;
}
}
separator.thin[orient="vertical"] {
width: 0.5em;
}
@ -180,7 +180,7 @@ separator.groove[orient="vertical"] {
margin-left: 0.4em;
margin-right: 0.4em;
}
.plain {
-moz-appearance: none;
margin: 0 !important;
@ -241,7 +241,7 @@ label[disabled="true"] {
.text-link:hover {
text-decoration: underline;
}
.text-link:-moz-focusring {
box-shadow: var(--focus-ring-box-shadow);
}
@ -271,11 +271,11 @@ notification > button:active:hover {
}
notification > button:-moz-focusring {
box-shadow: @focusRingShadow@, @roundButtonShadow@;
box-shadow: var(--focus-ring-box-shadow), @roundButtonShadow@;
}
notification > button:active:hover:-moz-focusring {
box-shadow: @focusRingShadow@, @roundButtonPressedShadow@;
box-shadow: var(--focus-ring-box-shadow), @roundButtonPressedShadow@;
}
notification > button > .button-box > .button-text {

View File

@ -44,7 +44,6 @@ button {
0 1px 2px hsla(0,0%,0%,.1);
}
button[default=true] {
background-color: hsl(0,0%,79%);
}
@ -61,7 +60,5 @@ button:hover:active {
}
button:focus {
box-shadow: 0 0 1px -moz-mac-focusring inset,
0 0 4px 1px -moz-mac-focusring,
0 0 1.5px 1px -moz-mac-focusring;
box-shadow: var(--focus-ring-box-shadow)
}

View File

@ -15,7 +15,7 @@ tree {
/* ::::: tree focusring ::::: */
.focusring > .tree-stack > .tree-rows > .tree-bodybox {
border: 1px solid transparent;
border: 1px solid transparent;
}
.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox {
@ -163,7 +163,7 @@ treechildren::-moz-tree-cell-text(progressmeter) {
/* ::::: tree columns ::::: */
treecol,
treecolpicker {
treecolpicker {
-moz-appearance: treeheadercell;
-moz-box-align: center;
-moz-box-pack: center;
@ -278,7 +278,7 @@ treechildren.gridlines::-moz-tree-row {
.tree-input {
-moz-appearance: none;
border-width: 0;
box-shadow: @focusRingShadow@;
box-shadow: var(--focus-ring-box-shadow);
margin: 0;
margin-inline-start: -2px;
padding: 2px 1px 1px;