jenkins-bot has submitted this change and it was merged.
Change subject: No-js tweaks
......................................................................
No-js tweaks
Apply a few small tweaks to clean up the no javascript interface. This is
far from perfect but is an incremental improvement over the existing no
javascript version.
Bug: 58019
Change-Id: Ib408f1da3827027fe685e371f12711e3941b7021
---
M modules/base/styles/actionbox.less
M modules/discussion/styles/nojs.less
M modules/mediawiki.ui/styles/agora-override-buttons.less
M modules/mediawiki.ui/styles/agora-override-forms.less
4 files changed, 80 insertions(+), 55 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, but someone else must approve
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/styles/actionbox.less
b/modules/base/styles/actionbox.less
index e2f0a45..0973ec1 100644
--- a/modules/base/styles/actionbox.less
+++ b/modules/base/styles/actionbox.less
@@ -66,17 +66,26 @@
.flow-tipsy-flyout {
display: block;
- // give the action menu an animated width
- ul li .mw-ui-button {
- transition: width 0.1s, text-indent 0.1s, padding-right
0.1s;
- }
-
- // unless when hovered, shorten buttons to only display the icon
+ // unless hovered, shorten buttons to only display the icon
&:not(:hover) ul li .mw-ui-button {
width: 0;
- text-indent: -9999px;
+ text-indent: 4px;
padding-right: 4px;
}
+
+ ul {
+ // Undo margin, from .mw-content-ltr ul, around action
list
+ margin: 0;
+ padding: 0;
+
+ li .mw-ui-button {
+ // give the action menu an animated width
+ transition: width 0.1s, text-indent 0.1s,
padding-right 0.1s;
+ // prevent height changes while animating
+ max-height: 30px;
+ overflow: hidden;
+ }
+ }
}
}
diff --git a/modules/discussion/styles/nojs.less
b/modules/discussion/styles/nojs.less
index e1bf085..7314c0a 100644
--- a/modules/discussion/styles/nojs.less
+++ b/modules/discussion/styles/nojs.less
@@ -12,6 +12,18 @@
.flow-tipsy-flyout {
position: inherit;
top: 0;
+
+ ul {
+ // Core applies margin to all uls, but we dont want it
in this case
+ margin: 0;
+ }
+
+ a {
+ // Unfortunatly the anchors are receiving gray from the
titlebar's
+ // mw-ui-button. Soon that will be removed, but until
then undo it
+ background: #FFF;
+ }
+
}
// shrink textarea's until they are focused
diff --git a/modules/mediawiki.ui/styles/agora-override-buttons.less
b/modules/mediawiki.ui/styles/agora-override-buttons.less
index 22d7598..05e3522 100644
--- a/modules/mediawiki.ui/styles/agora-override-buttons.less
+++ b/modules/mediawiki.ui/styles/agora-override-buttons.less
@@ -3,7 +3,8 @@
@import 'settings/colors.less';
@import 'mixins/buttons.less';
-.mw-ui-button {
+// .flow-container ensures greater specificity than core rules
+.flow-container .mw-ui-button {
font-weight: bold;
border-radius: 3px;
cursor: pointer;
diff --git a/modules/mediawiki.ui/styles/agora-override-forms.less
b/modules/mediawiki.ui/styles/agora-override-forms.less
index 2e9a27a..320fbfd 100644
--- a/modules/mediawiki.ui/styles/agora-override-forms.less
+++ b/modules/mediawiki.ui/styles/agora-override-forms.less
@@ -1,54 +1,57 @@
-.field-placeholder-styling(@color: #aaa) {
- font-style: italic;
- font-weight: normal;
- color: @color;
-}
-
-.mw-ui-input {
- border: 1px solid #e6e6e5;
- color: #6d6e70;
-
- padding: 6px 10px 6px 15px;
-
- &:hover {
- border: 1px solid #c0c0c0;
+// .flow-container ensures greater specificity than core rules
+.flow-container {
+ .field-placeholder-styling(@color: #aaa) {
+ font-style: italic;
+ font-weight: normal;
+ color: @color;
}
- &:focus {
- box-shadow: 7px 0 0 #347bff inset;
- border: 1px solid #c0c0c0;
+ .mw-ui-input {
+ border: 1px solid #e6e6e5;
+ color: #6d6e70;
+
+ padding: 6px 10px 6px 15px;
+
+ &:hover {
+ border: 1px solid #c0c0c0;
+ }
+
+ &:focus {
+ box-shadow: 7px 0 0 #347bff inset;
+ border: 1px solid #c0c0c0;
+ }
+
+ /*
+ * Duplication because browsers ignore groups containing an
invalid selector.
+ * Only one of the below is valid per-browser.
+ * @see http://stackoverflow.com/a/2610741
+ */
+ &::-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;
+ }
}
- /*
- * Duplication because browsers ignore groups containing an invalid
selector.
- * Only one of the below is valid per-browser.
- * @see http://stackoverflow.com/a/2610741
- */
- &::-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;
- }
-}
+ // make it similar to .mw-ui-button
+ a.mw-ui-input,
+ input.mw-ui-input {
+ display: inline-block;
+ vertical-align: middle;
-// make it similar to .mw-ui-button
-a.mw-ui-input,
-input.mw-ui-input {
- display: inline-block;
- vertical-align: middle;
+ height: 34px;
+ }
- height: 34px;
-}
-
-// padding messes up textarea's right scroll bar & bottom right resize grabber
-// in FF, so hide it as long as it's not necessary
-textarea.mw-ui-input:empty {
- overflow: hidden;
+ // padding messes up textarea's right scroll bar & bottom right resize
grabber
+ // in FF, so hide it as long as it's not necessary
+ textarea.mw-ui-input:empty {
+ overflow: hidden;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/110421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib408f1da3827027fe685e371f12711e3941b7021
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
