VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372032 )
Change subject: [WIP] mediawiki.ui: Bring checkbox and radio on par with
WikimediaUI design
......................................................................
[WIP] mediawiki.ui: Bring checkbox and radio on par with WikimediaUI design
Bringing checkbox and radio on par with WikimediaUI design templates,
also slightly enhancing accessibility by using colors of new palette.
Width & height is taken from current OOjs UI size, based on 16px default
browser font-size.
Adding several similar variables to variables.less.
Bug: T148265
Change-Id: I68848d48ea45c67124ac75be58748b4e9fb3085d
---
M resources/src/mediawiki.less/mediawiki.ui/variables.less
M resources/src/mediawiki.ui/components/checkbox.less
A resources/src/mediawiki.ui/components/images/checkbox-checked.png
A resources/src/mediawiki.ui/components/images/checkbox-checked.svg
D resources/src/mediawiki.ui/components/images/checked_disabled.png
D resources/src/mediawiki.ui/components/images/checked_disabled.svg
6 files changed, 91 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/32/372032/1
diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less
b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index ff74b6e..5844f52 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -17,8 +17,9 @@
@colorGray13: #ddd;
@colorGray14: #eaecf0;
@colorGray15: #f8f9fa; // lightest
+@colorBaseInverted: #fff;
-// Semantic background colors
+// Semantic colors
// Blue; for contextual use of a continuing action
@colorProgressive: #36c;
@colorProgressiveHighlight: #447ff5;
@@ -50,18 +51,30 @@
@colorWarningText: #705000;
// UI colors
+@backgroundColorInputBinaryChecked: @colorProgressive;
+@backgroundColorInputBinaryActive: @colorProgressiveActive;
@colorFieldBorder: #a2a9b1;
@colorShadow: @colorGray14;
@colorPlaceholder: @colorGray10;
@colorNeutral: @colorGray7;
+// Border colors
+@borderColorInputBinaryChecked: @colorProgressive;
+@borderColorInputBinaryActive: @colorProgressiveActive;
+
// Global border radius to be used to buttons and inputs
@borderRadius: 2px;
+
+// Box shadows
+@boxShadowWidget: inset 0 0 0 1px transparent;
+@boxShadowWidgetFocus: inset 0 0 0 1px @colorProgressive;
+@boxShadowProgressiveFocus: inset 0 0 0 1px @colorProgressive, inset 0 0 0 2px
@colorBaseInverted;
+@boxShadowInputBinaryActive: inset 0 0 0 1px @colorProgressiveActive;
// Icon related variables
@iconSize: 1.5em;
@iconGutterWidth: 1em;
-// Form input sizes
-@checkboxSize: 2em;
+// Form input sizes, equal to OOjs UI at 16px base font-size
+@checkboxSize: 1.5625em;
@radioSize: 2em;
diff --git a/resources/src/mediawiki.ui/components/checkbox.less
b/resources/src/mediawiki.ui/components/checkbox.less
index 6412da5..d3ae714 100644
--- a/resources/src/mediawiki.ui/components/checkbox.less
+++ b/resources/src/mediawiki.ui/components/checkbox.less
@@ -5,9 +5,9 @@
//
// Styling checkboxes in a way that works cross browser is a tricky problem to
solve.
// In MediaWiki UI put a checkbox and label inside a mw-ui-checkbox div.
-// This renders in all browsers except IE 6-8 which do not support the
:checked selector;
+// This renders in all browsers except IE 6-8 which do not support the
`:checked` selector;
// these are kept backwards-compatible using the `:not( #noop )` selector.
-// You should give the checkbox and label matching "id" and "for" attributes,
respectively.
+// You should give the checkbox and label matching `id` and `for` attributes,
respectively.
//
// Markup:
// <div class="mw-ui-checkbox">
@@ -30,52 +30,50 @@
// Styleguide 3.
.mw-ui-checkbox {
display: inline-block;
+ line-height: @checkboxSize;
vertical-align: middle;
}
-// We use the not selector to cancel out styling on IE 8 and below
+// We use the `:not` selector to cancel out styling on IE 8 and below
// We also disable this styling on JavaScript disabled devices. This fixes the
issue with
// Opera Mini where checking/unchecking doesn't apply styling but potentially
leaves other
// more capable browsers with unstyled checkboxes.
.client-js .mw-ui-checkbox:not( #noop ) {
+ display: table;
// Position relatively so we can make use of absolute pseudo elements
position: relative;
- display: table;
* {
- // reset font sizes (see T74727)
+ // Reset font sizes, see T74727
font: inherit;
vertical-align: middle;
}
- input[type='checkbox'] {
- // we hide the input element as instead we will style the label
that follows
- // we use opacity so that VoiceOver software can still identify
it
- opacity: 0;
- // Render *on top of* the label, so that it's still clickable
(T98905)
- z-index: 1;
+ [type='checkbox'] {
+ display: table-cell;
position: relative;
- // ensure the invisible checkbox takes up the required width
+ // Ensure the invisible input takes up the required `width` &
`height`
width: @checkboxSize;
height: @checkboxSize;
- // This is needed for Firefox mobile (See T73750 to workaround
default Firefox stylesheet)
+ // Support: Firefox mobile to override user-agent stylesheet,
see T73750
max-width: none;
margin: 0 0.4em 0 0;
- cursor: pointer;
- display: table-cell;
+ // Hide `input[type=checkbox]` and instead style the label that
follows
+ // Support: VoiceOver. Use `opacity` so that VoiceOver can
still identify the checkbox
+ opacity: 0;
+ // Render *on top of* the label, so that it's still clickable,
see T98905
+ z-index: 1;
& + label {
display: table-cell;
- cursor: pointer;
}
- // the pseudo before element of the label after the checkbox
now looks like a checkbox
+ // Pseudo `:before` element of the label after the checkbox now
looks like a checkbox
& + label:before {
content: '';
background-color: #fff;
- .background-image-svg( 'images/checked.svg',
'images/checked.png' );
- background-position: center center;
background-origin: border-box;
+ background-position: center center;
background-repeat: no-repeat;
.background-size( 0, 0 );
.box-sizing( border-box );
@@ -88,39 +86,72 @@
margin-top: -1em;
border: 1px solid @colorGray7;
border-radius: @borderRadius;
- line-height: @checkboxSize;
- cursor: pointer;
}
- // when the input is checked, style the label pseudo before
element that followed as a checked checkbox
+ // Apply a checkmark on the pseudo `:before` element when the
input is checked
&:checked + label:before {
- .background-size( 100%, 100% );
+ .background-image-svg( 'images/checkbox-checked.svg',
'images/checkbox-checked.png' );
+ .background-size( 90%, 90% );
}
- &:active + label:before {
- background-color: @colorGray13;
- border-color: @colorGray13;
- }
+ &:enabled {
+ cursor: pointer;
- &:focus + label:before {
- border-width: 2px;
- }
+ & + label {
+ cursor: pointer;
+ }
- &:focus:hover + label:before,
- &:hover + label:before {
- border-bottom-width: 3px;
+ & + label:before {
+ cursor: pointer;
+ .transition( ~'background-color 100ms, color
100ms, border-color 100ms, box-shadow 100ms' );
+ }
+
+ // `:focus` has to come first, otherwise a selector
race with `:hover:focus` etc needs to be done
+ &:focus + label:before {
+ border-color: @colorProgressive;
+ box-shadow: @boxShadowWidgetFocus;
+ }
+
+ &:hover + label:before {
+ border-color: @colorProgressive;
+ }
+
+ &:active + label:before {
+ background-color: @colorProgressiveActive;
+ border-color: @borderColorInputBinaryActive;
+ box-shadow: @boxShadowInputBinaryActive;
+ }
+
+ &:checked {
+ & + label:before {
+ background-color:
@backgroundColorInputBinaryChecked;
+ border-color:
@borderColorInputBinaryChecked;
+ }
+
+ &:focus + label:before {
+ background-color:
@backgroundColorInputBinaryChecked;
+ border-color:
@borderColorInputBinaryChecked;
+ box-shadow: @boxShadowProgressiveFocus;
+ }
+
+ &:hover + label:before {
+ background-color:
@colorProgressiveHighlight;
+ border-color:
@colorProgressiveHighlight;
+ }
+
+ &:active + label:before {
+ background-color:
@backgroundColorInputBinaryActive;
+ border-color:
@borderColorInputBinaryActive;
+ box-shadow: @boxShadowInputBinaryActive;
+ }
+ }
}
// disabled checkboxes have a gray background
&:disabled + label:before {
+ background-color: @colorGray12;
+ border-color: @colorGray12;
cursor: default;
- background-color: @colorGray14;
- border-color: @colorGray14;
- }
-
- // disabled and checked checkboxes have a white circle
- &:disabled:checked + label:before {
- .background-image-svg( 'images/checked_disabled.svg',
'images/checked_disabled.png' );
}
}
}
diff --git a/resources/src/mediawiki.ui/components/images/checkbox-checked.png
b/resources/src/mediawiki.ui/components/images/checkbox-checked.png
new file mode 100644
index 0000000..708bb39
--- /dev/null
+++ b/resources/src/mediawiki.ui/components/images/checkbox-checked.png
Binary files differ
diff --git a/resources/src/mediawiki.ui/components/images/checkbox-checked.svg
b/resources/src/mediawiki.ui/components/images/checkbox-checked.svg
new file mode 100644
index 0000000..7f3299a
--- /dev/null
+++ b/resources/src/mediawiki.ui/components/images/checkbox-checked.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24"><g fill="#fff">
+ <path d="M17 7.5L9.5 15 6 11.5 4.5 13l5 5L20 7.5c-.706-.706-2.294-.706-3
0z" id="check"/>
+</g></svg>
diff --git a/resources/src/mediawiki.ui/components/images/checked_disabled.png
b/resources/src/mediawiki.ui/components/images/checked_disabled.png
deleted file mode 100644
index 8217815..0000000
--- a/resources/src/mediawiki.ui/components/images/checked_disabled.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.ui/components/images/checked_disabled.svg
b/resources/src/mediawiki.ui/components/images/checked_disabled.svg
deleted file mode 100644
index ba4010e..0000000
--- a/resources/src/mediawiki.ui/components/images/checked_disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg";
width="24" height="24"><path d="M4 12l5 5L20 5" stroke="#fff" stroke-width="3"
fill="none"/></svg>
--
To view, visit https://gerrit.wikimedia.org/r/372032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68848d48ea45c67124ac75be58748b4e9fb3085d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
