jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki theme: Remove support for frameless primary buttons
......................................................................
MediaWiki theme: Remove support for frameless primary buttons
This reverts some of d6b05bc00e8261c371281365bfdfaad8dfb18abe.
In MediaWiki theme, now all buttons inserted into a toolbar will lose
the strict borders and look vaguely frameless. This was the intent of
the original patch. Frameless primary buttons make no sense in any
other context.
(It is still possible to put a frameless button into a toolbar, but it
will look rather silly.)
Bug: T103403
Change-Id: I9c70f447a1f000fbbd5f96ce9064f74f5fe809a1
---
M demos/pages/toolbars.js
M demos/pages/widgets.js
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/tools.less
4 files changed, 17 insertions(+), 42 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js
index 4a58a33..9d257e0 100644
--- a/demos/pages/toolbars.js
+++ b/demos/pages/toolbars.js
@@ -217,8 +217,8 @@
}
] );
- saveButton = new OO.ui.ButtonWidget( { label: 'Save', framed: false,
flags: [ 'progressive', 'primary' ] } );
- deleteButton = new OO.ui.ButtonWidget( { label: 'Delete', framed:
false, flags: [ 'destructive' ] } );
+ saveButton = new OO.ui.ButtonWidget( { label: 'Save', flags: [
'progressive', 'primary' ] } );
+ deleteButton = new OO.ui.ButtonWidget( { label: 'Delete', flags: [
'destructive' ] } );
actionButton = new OO.ui.ButtonWidget( { label: 'Action' } );
actionButtonDisabled = new OO.ui.ButtonWidget( { label: 'Disabled',
disabled: true } );
toolbars[ 1 ].$actions
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index d4880b5..5c0843c 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -418,18 +418,6 @@
new OO.ui.FieldLayout(
new OO.ui.ButtonWidget( {
framed: false,
- flags: [ 'progressive',
'primary' ],
- icon: 'check',
- label: 'Primary'
- } ),
- {
- label: 'ButtonWidget
(frameless, primary, progressive)\u200E',
- align: 'top'
- }
- ),
- new OO.ui.FieldLayout(
- new OO.ui.ButtonWidget( {
- framed: false,
flags: [ 'warning' ],
icon: 'alert',
label: 'Warning'
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index fa1b9d7..edf944b 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -29,7 +29,7 @@
height: @icon-size;
}
- &-frameless:not( .oo-ui-flaggedElement-primary ) {
+ &-frameless {
> .oo-ui-buttonElement-button {
&:focus {
box-shadow: inset 0 0 0 1px rgba(0,0,0,0.2), 0
0 0 1px rgba(0,0,0,0.2);
@@ -98,25 +98,6 @@
margin: 0.1em 0;
padding: 0.2em 0.8em;
border-radius: @border-radius;
- }
-
- // Support <input/> from ButtonInputWidget
- > input.oo-ui-buttonElement-button,
- &.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- line-height: @icon-size;
- }
-
- &.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
- border: 1px solid @disabled-background;
- }
-
- &.oo-ui-widget-enabled > .oo-ui-buttonElement-button {
- border: @neutral-button-border;
- }
- }
-
- &-framed, &-frameless.oo-ui-flaggedElement-primary {
- > .oo-ui-buttonElement-button {
&:hover,
&:focus {
@@ -130,6 +111,11 @@
);
}
+ // Support <input/> from ButtonInputWidget
+ > input.oo-ui-buttonElement-button,
+ &.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
+ line-height: @icon-size;
+ }
&.oo-ui-iconElement {
> .oo-ui-buttonElement-button > .oo-ui-iconElement-icon
{
@@ -159,12 +145,14 @@
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
color: @disabled-framed-text;
background: @disabled-background;
+ border: 1px solid @disabled-background;
}
&.oo-ui-widget-enabled {
> .oo-ui-buttonElement-button {
color: @text;
background-color: @background;
+ border: @neutral-button-border;
&:hover {
background-color:
darken(@background,8%);
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index 9112c1a..060d1a6 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -24,19 +24,18 @@
}
&-actions {
- > .oo-ui-buttonElement-framed,
- > .oo-ui-buttonElement-framed:last-child {
- margin-top: 0.25em;
- margin-bottom: 0.25em;
- margin-right: 0.5em;
- }
-
- > .oo-ui-buttonElement-frameless.oo-ui-labelElement {
+ > .oo-ui-buttonElement.oo-ui-labelElement {
margin: 0;
+
> .oo-ui-buttonElement-button {
+ border: 0;
+ border-radius: 0;
+ margin: 0;
padding: 1.0546875em 0.3125em;
+
> .oo-ui-labelElement-label {
margin: 0 1em;
+ line-height: inherit;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/222570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c70f447a1f000fbbd5f96ce9064f74f5fe809a1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
