Merge "Remove Preferences::trySetUserEmail (deprecated 1.20)"

diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index ec9888f..17fcc60 100644 (file)
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -36,16 +36,21 @@
 .button-colors(@bgColor) {
        background: @bgColor;
 
-       &:hover,
-       &:focus {
+       &:hover {
                // The inner bottom bevel should match the active background color.
                box-shadow: 0 1px rgba(0, 0, 0, 10%), inset 0 -3px rgba(0, 0, 0, 20%);
                border-bottom-color: mix(#000, @bgColor, 20%);
+       }
+
+       &:focus {
+               box-shadow:inset 0px 0px 0px 3px rgba(0, 0, 0, 20%);
                outline: none;
+
                // remove outline in Firefox
                &::-moz-focus-inner {
                        border-color: transparent;
                }
+
        }
 
        &:active,
@@ -102,13 +107,23 @@
        // constructive/progressive/destructive color on hover and active.
        color: @colorButtonText;
 
-       &:hover,
-       &:focus {
+       &:hover {
                // lessphp doesn't implement tint, see above
                // color: tint(@textColor, 20%);
                color: mix(#fff, @textColor, 20%);
        }
 
+       &:focus {
+               box-shadow:inset 0px 0px 0px 3px rgba(0, 0, 0, 20%);
+               outline: none;
+
+               // remove outline in Firefox
+               &::-moz-focus-inner {
+                       border-color: transparent;
+               }
+
+       }
+
        &:active,
        &.mw-ui-checked {
                // lessphp doesn't implement shade, see above