jenkins-bot has submitted this change and it was merged.
Change subject: Use mw-ui-input core module for inputs
......................................................................
Use mw-ui-input core module for inputs
\o/ upstreaming
See: Ida765b97e6574bdc8fbba88a08ec98ec12f3dc95
Change-Id: I478e81bbf7e577f19a7d9f31d85e51ca93fe8f4c
---
M includes/View.php
M modules/new/styles/mediawiki.ui/forms.less
2 files changed, 3 insertions(+), 74 deletions(-)
Approvals:
SG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/View.php b/includes/View.php
index ffda877..c975b6b 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -45,6 +45,7 @@
$styles = array(
'mediawiki.ui',
'mediawiki.ui.button',
+ 'mediawiki.ui.input',
'ext.flow.styles',
'ext.flow.mediawiki.ui.tooltips',
'ext.flow.mediawiki.ui.form',
diff --git a/modules/new/styles/mediawiki.ui/forms.less
b/modules/new/styles/mediawiki.ui/forms.less
index 588f4a8..2fa8b46 100644
--- a/modules/new/styles/mediawiki.ui/forms.less
+++ b/modules/new/styles/mediawiki.ui/forms.less
@@ -16,61 +16,6 @@
}
}
-// Placeholder text styling helper
-.field-placeholder-styling() {
- font-style: italic;
- font-weight: normal;
-}
-
-// Input [Draft]
-//
-// Style an input using MediaWiki UI.
-// Currently in draft status and subject to change.
-//
-// Markup:
-// <form>
-// <input value="input" class="mw-ui-input">
-// <textarea class="mw-ui-input"></<textarea>
-// </form>
-//
-// Styleguide 4.1.
-.mw-ui-input {
- .box-sizing(border-box);
- width: 100%;
- padding: .3em .3em .3em .6em;
- display: block;
- color: inherit;
- font-family: inherit;
- font-size: inherit;
- line-height: inherit;
- // Transition for box-shadow @winter
- .transition(~"border linear .2s, box-shadow linear .2s");
-
- // Placeholder text styling must be set individually for each browser
@winter
- &::-webkit-input-placeholder { // webkit
- .field-placeholder-styling;
- }
- &::-moz-placeholder { // FF 4-18
- .field-placeholder-styling;
- }
- &:-moz-placeholder { // FF >= 19
- .field-placeholder-styling;
- }
- &:-ms-input-placeholder { // IE >= 10
- .field-placeholder-styling;
- }
-
- &:focus {
- box-shadow: inset .45em 0 0 #5088f7;
- -moz-box-shadow: inset .45em 0 0 #5088f7;
- -webkit-box-shadow: inset .45em 0 0 #5088f7;
- }
-}
-
-textarea.mw-ui-input {
- min-height: 8em;
-}
-
// Make all text fields 100% wide by default
.mw-ui-fieldtype-text,
.mw-ui-fieldtag-textarea {
@@ -89,11 +34,6 @@
margin: 0;
}
}
-
-.mw-ui-input:focus {
- border-color: @colorGrayDark;
-}
-
.mw-ui-field-icon {
display: none;
@@ -283,22 +223,10 @@
}
}
-// @todo: document
-.mw-ui-input-large {
- // Attach these two inputs together to make them seem like one
congruous input
- margin-top: 0;
- margin-bottom: 0;
+input.mw-ui-input-large {
+ padding-left: .75em;
}
textarea.mw-ui-input-large {
padding-left: @topicIndent;
- border-top-width: 0;
-}
-
-// Make the new topic input mimic new topic text
-input.mw-ui-input-large {
- padding-left: .75em;
- font-size: 1.75em;
- font-weight: bold;
- line-height: 1.25em;
}
--
To view, visit https://gerrit.wikimedia.org/r/149174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I478e81bbf7e577f19a7d9f31d85e51ca93fe8f4c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: SG <shah...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
