Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/380795 )
Change subject: [BREAKING CHANGE] Drop the `constructive` flag entirely
......................................................................
[BREAKING CHANGE] Drop the `constructive` flag entirely
Bug: T156874
Change-Id: I69f9164f5e06e990e3ffec3e2099147c5ba7b8c0
---
M demos/pages/icons.js
M php/mixins/FlaggedElement.php
M php/themes/WikimediaUITheme.php
M src/mixins/FlaggedElement.js
M src/themes/apex/elements.less
M src/themes/apex/tools.less
M src/themes/apex/windows.less
M src/themes/wikimediaui/WikimediaUITheme.js
M src/themes/wikimediaui/elements.less
M src/themes/wikimediaui/icons-alerts.json
M src/themes/wikimediaui/icons-content.json
M src/themes/wikimediaui/icons-editing-advanced.json
M src/themes/wikimediaui/icons-editing-core.json
M src/themes/wikimediaui/icons-editing-list.json
M src/themes/wikimediaui/icons-editing-styling.json
M src/themes/wikimediaui/icons-interactions.json
M src/themes/wikimediaui/icons-layout.json
M src/themes/wikimediaui/icons-location.json
M src/themes/wikimediaui/icons-media.json
M src/themes/wikimediaui/icons-moderation.json
M src/themes/wikimediaui/icons-movement.json
M src/themes/wikimediaui/icons-user.json
M src/themes/wikimediaui/tools.less
M src/themes/wikimediaui/windows.less
24 files changed, 13 insertions(+), 73 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/95/380795/1
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 75a9f85..24d30eb 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -249,7 +249,6 @@
flags: [],
data: {
progressive: false,
- constructive: false,
destructive: false
}
} ),
@@ -258,7 +257,6 @@
flags: [ 'progressive' ],
data: {
progressive: true,
- constructive: false,
destructive: false
}
} ),
@@ -267,7 +265,6 @@
flags: [ 'destructive' ],
data: {
progressive: false,
- constructive: false,
destructive: true
}
} )
@@ -282,7 +279,6 @@
} )
.selectItemByData( {
progressive: false,
- constructive: false,
destructive: false
} );
diff --git a/php/mixins/FlaggedElement.php b/php/mixins/FlaggedElement.php
index 7121660..97e45b0 100644
--- a/php/mixins/FlaggedElement.php
+++ b/php/mixins/FlaggedElement.php
@@ -26,8 +26,7 @@
/**
* @param array $config Configuration options
* @param string|string[] $config['flags'] Flags describing importance
and functionality, e.g.
- * 'primary', 'safe', 'progressive', or 'destructive'. The former
'constructive' value was
- * deprecated since v0.23.2 and will be removed. It is equivalent to
'progressive' for now.
+ * 'primary', 'safe', 'progressive', or 'destructive'.
*/
public function initializeFlaggedElement( array $config = [] ) {
// Properties
diff --git a/php/themes/WikimediaUITheme.php b/php/themes/WikimediaUITheme.php
index 8c3f911..f93726f 100644
--- a/php/themes/WikimediaUITheme.php
+++ b/php/themes/WikimediaUITheme.php
@@ -11,7 +11,6 @@
'warning' => false,
'invert' => false,
'progressive' => false,
- 'constructive' => false,
'destructive' => false
];
@@ -30,7 +29,6 @@
} elseif ( !$element->isDisabled() ) {
// Any other kind of button, use the right
colored icon if available
$variants['progressive'] = $element->hasFlag(
'progressive' );
- $variants['constructive'] = $element->hasFlag(
'constructive' );
$variants['destructive'] = $element->hasFlag(
'destructive' );
$variants['warning'] = $element->hasFlag(
'warning' );
}
diff --git a/src/mixins/FlaggedElement.js b/src/mixins/FlaggedElement.js
index 1479bc1..c2028c9 100644
--- a/src/mixins/FlaggedElement.js
+++ b/src/mixins/FlaggedElement.js
@@ -9,7 +9,6 @@
*
* - **progressive**: Progressive styling is applied to convey that the
widget will move the user forward in a process.
* - **destructive**: Destructive styling is applied to convey that the widget
will remove something.
- * - **constructive**: Constructive styling is deprecated since v0.23.2 and
equivalent to progressive.
*
* The flags affect the appearance of the buttons:
*
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index b416814..ed59aae 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -130,7 +130,6 @@
}
&.oo-ui-flaggedElement {
- &-constructive > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label, // Deprecated since v0.23.2
&-progressive > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
color: @progressive;
}
@@ -217,7 +216,6 @@
}
&.oo-ui-flaggedElement {
- &-constructive, // Deprecated since v0.23.2
&-progressive {
> .oo-ui-buttonElement-button {
border: 1px solid @progressive-border;
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index c61581b..317f4fb 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -385,7 +385,6 @@
}
&.oo-ui-flaggedElement {
- &-constructive, // Deprecated since v0.23.2
&-progressive {
> .oo-ui-popupToolGroup-handle {
border: 1px solid @progressive-border;
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 14353fc..17bb319 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -86,7 +86,6 @@
}
&.oo-ui-flaggedElement {
- &-constructive, // Deprecated since v0.23.2
&-progressive {
&:hover {
background-color: rgba( 8, 126,
204, 0.05 );
@@ -195,7 +194,6 @@
}
&.oo-ui-flaggedElement {
- &-constructive, // Deprecated since
v0.23.2
&-progressive {
&:hover {
background-color: rgba(
8, 126, 204, 0.05 );
diff --git a/src/themes/wikimediaui/WikimediaUITheme.js
b/src/themes/wikimediaui/WikimediaUITheme.js
index 16f4c1c..e19921f 100644
--- a/src/themes/wikimediaui/WikimediaUITheme.js
+++ b/src/themes/wikimediaui/WikimediaUITheme.js
@@ -25,7 +25,6 @@
warning: false,
invert: false,
progressive: false,
- constructive: false,
destructive: false
},
// Parent method
@@ -48,7 +47,6 @@
} else if ( !element.isDisabled() ) {
// Any other kind of button, use the right colored icon
/ indicator if available
variants.progressive = element.hasFlag( 'progressive' );
- variants.constructive = element.hasFlag( 'constructive'
);
variants.destructive = element.hasFlag( 'destructive' );
variants.warning = element.hasFlag( 'warning' );
}
diff --git a/src/themes/wikimediaui/elements.less
b/src/themes/wikimediaui/elements.less
index 237244f..e2e544c 100644
--- a/src/themes/wikimediaui/elements.less
+++ b/src/themes/wikimediaui/elements.less
@@ -227,8 +227,7 @@
}
&.oo-ui-flaggedElement {
- &-progressive,
- &-constructive { // `constructive` got
deprecated in 0.16.1, see T110555
+ &-progressive {
.mw-frameless-button-colored(
~'.oo-ui-buttonElement-button', @color-progressive, @color-progressive--hover,
@color-progressive--active, @color-progressive--focus );
}
@@ -375,8 +374,7 @@
}
&.oo-ui-flaggedElement {
- &-progressive,
- &-constructive { // `constructive` got
deprecated in 0.16.1
+ &-progressive {
.mw-framed-button-colored(
~'.oo-ui-buttonElement-button', @color-progressive,
@background-color-framed--hover, @border-color-framed-progressive--hover,
@color-progressive--active, @color-progressive--focus );
}
@@ -387,8 +385,7 @@
&.oo-ui-flaggedElement-primary {
&.oo-ui-flaggedElement {
- &-progressive,
- &-constructive { // `constructive` got
deprecated in 0.16.1
+ &-progressive {
.mw-framed-primary-button-colored( ~'.oo-ui-buttonElement-button',
@color-progressive, @color-progressive--hover, @color-progressive--active,
@color-progressive--focus );
}
diff --git a/src/themes/wikimediaui/icons-alerts.json
b/src/themes/wikimediaui/icons-alerts.json
index fd2f35e..817cb62 100644
--- a/src/themes/wikimediaui/icons-alerts.json
+++ b/src/themes/wikimediaui/icons-alerts.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-content.json
b/src/themes/wikimediaui/icons-content.json
index e952108..3358bff 100644
--- a/src/themes/wikimediaui/icons-content.json
+++ b/src/themes/wikimediaui/icons-content.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
@@ -72,7 +69,7 @@
"ltr": "images/icons/newspaper-ltr.svg",
"rtl": "images/icons/newspaper-rtl.svg"
} },
- "tag": { "file": "images/icons/tag.svg", "variants": [
"destructive", "warning", "constructive" ] },
+ "tag": { "file": "images/icons/tag.svg", "variants": [
"destructive", "warning", "progressive" ] },
"upload": { "file": {
"ltr": "images/icons/upload-ltr.svg",
"rtl": "images/icons/upload-rtl.svg"
diff --git a/src/themes/wikimediaui/icons-editing-advanced.json
b/src/themes/wikimediaui/icons-editing-advanced.json
index 36301fc..0eb6e4c 100644
--- a/src/themes/wikimediaui/icons-editing-advanced.json
+++ b/src/themes/wikimediaui/icons-editing-advanced.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-editing-core.json
b/src/themes/wikimediaui/icons-editing-core.json
index 4515405..9a9293c 100644
--- a/src/themes/wikimediaui/icons-editing-core.json
+++ b/src/themes/wikimediaui/icons-editing-core.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-editing-list.json
b/src/themes/wikimediaui/icons-editing-list.json
index 3edb545..8ebef98 100644
--- a/src/themes/wikimediaui/icons-editing-list.json
+++ b/src/themes/wikimediaui/icons-editing-list.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-editing-styling.json
b/src/themes/wikimediaui/icons-editing-styling.json
index 85e47ee..7b1a0ac 100644
--- a/src/themes/wikimediaui/icons-editing-styling.json
+++ b/src/themes/wikimediaui/icons-editing-styling.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-interactions.json
b/src/themes/wikimediaui/icons-interactions.json
index 1fb333a..aee1370 100644
--- a/src/themes/wikimediaui/icons-interactions.json
+++ b/src/themes/wikimediaui/icons-interactions.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
@@ -22,14 +19,14 @@
}
},
"images": {
- "add": { "file": "images/icons/add.svg", "variants": [
"constructive", "progressive" ] },
+ "add": { "file": "images/icons/add.svg", "variants": [
"progressive" ] },
"advanced": { "file": "images/icons/advanced.svg" },
"browser": { "file": {
"ltr": "images/icons/browser-ltr.svg",
"rtl": "images/icons/browser-rtl.svg"
} },
"cancel": { "file": "images/icons/cancel.svg", "variants": [
"destructive" ] },
- "check": { "file": "images/icons/check.svg", "variants": [
"constructive", "progressive", "destructive" ] },
+ "check": { "file": "images/icons/check.svg", "variants": [
"progressive", "destructive" ] },
"clear": { "file": "images/icons/clear.svg" },
"clock": { "file": "images/icons/clock.svg" },
"close": { "file": "images/icons/close.svg" },
diff --git a/src/themes/wikimediaui/icons-layout.json
b/src/themes/wikimediaui/icons-layout.json
index 21b57cc..4b878e9 100644
--- a/src/themes/wikimediaui/icons-layout.json
+++ b/src/themes/wikimediaui/icons-layout.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-location.json
b/src/themes/wikimediaui/icons-location.json
index 4ca6635..0a14b8d 100644
--- a/src/themes/wikimediaui/icons-location.json
+++ b/src/themes/wikimediaui/icons-location.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-media.json
b/src/themes/wikimediaui/icons-media.json
index afdb9e5..06ccbc8 100644
--- a/src/themes/wikimediaui/icons-media.json
+++ b/src/themes/wikimediaui/icons-media.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-moderation.json
b/src/themes/wikimediaui/icons-moderation.json
index 8f0ff15..87d1640 100644
--- a/src/themes/wikimediaui/icons-moderation.json
+++ b/src/themes/wikimediaui/icons-moderation.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
@@ -45,12 +42,12 @@
"ltr": "images/icons/unLock-ltr.svg",
"rtl": "images/icons/unLock-rtl.svg"
}, "variants": [ "destructive" ] },
- "star": { "file": "images/icons/star.svg", "variants": [
"constructive", "progressive" ] },
+ "star": { "file": "images/icons/star.svg", "variants": [
"progressive" ] },
"halfStar": { "file": {
"ltr": "images/icons/halfStar-ltr.svg",
"rtl": "images/icons/halfStar-rtl.svg"
- }, "variants": [ "constructive", "progressive" ] },
- "unStar": { "file": "images/icons/unStar.svg", "variants": [
"constructive", "progressive" ] },
+ }, "variants": [ "progressive" ] },
+ "unStar": { "file": "images/icons/unStar.svg", "variants": [
"progressive" ] },
"trash": { "file": "images/icons/trash.svg", "variants": [
"destructive" ] },
"unTrash": { "file": {
"ltr": "images/icons/unTrash-ltr.svg",
diff --git a/src/themes/wikimediaui/icons-movement.json
b/src/themes/wikimediaui/icons-movement.json
index 7ba002a..bea0823 100644
--- a/src/themes/wikimediaui/icons-movement.json
+++ b/src/themes/wikimediaui/icons-movement.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/icons-user.json
b/src/themes/wikimediaui/icons-user.json
index 5a70c5e..c4b36c2 100644
--- a/src/themes/wikimediaui/icons-user.json
+++ b/src/themes/wikimediaui/icons-user.json
@@ -11,9 +11,6 @@
"color": "#36c",
"global": true
},
- "constructive": {
- "color": "#36c"
- },
"destructive": {
"color": "#d33"
},
diff --git a/src/themes/wikimediaui/tools.less
b/src/themes/wikimediaui/tools.less
index 2a0c0c3..f1dc8fd 100644
--- a/src/themes/wikimediaui/tools.less
+++ b/src/themes/wikimediaui/tools.less
@@ -437,8 +437,7 @@
}
&.oo-ui-flaggedElement {
- &-progressive,
- &-constructive { // `constructive` got deprecated in 0.16.1,
see T110555
+ &-progressive {
.mw-framed-primary-button-colored(
~'.oo-ui-popupToolGroup-handle', @color-progressive, @color-progressive--hover,
@color-progressive--active, @color-progressive--focus );
}
diff --git a/src/themes/wikimediaui/windows.less
b/src/themes/wikimediaui/windows.less
index a1347fa..7faddad 100644
--- a/src/themes/wikimediaui/windows.less
+++ b/src/themes/wikimediaui/windows.less
@@ -94,8 +94,7 @@
}
&.oo-ui-flaggedElement {
- &-progressive,
- &-constructive { // `constructive` got
deprecated in v0.16.1
+ &-progressive {
.oo-ui-buttonElement-button {
&:hover {
background-color: @background-color-progressive; // Context-specific color var
“misuse”
@@ -218,8 +217,7 @@
}
&.oo-ui-flaggedElement {
- &-progressive,
- &-constructive { // `constructive` got
deprecated in v0.16.1
+ &-progressive {
&:hover {
background-color: rgba(
8, 126, 204, 0.05 );
}
--
To view, visit https://gerrit.wikimedia.org/r/380795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69f9164f5e06e990e3ffec3e2099147c5ba7b8c0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
