Harej has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333307 )
Change subject: Changing color names internally to match interface names. ...................................................................... Changing color names internally to match interface names. Bug: T155609 Change-Id: Ia09673e4ce0c22a83e5df9cbe482821072d4a4de --- M extension.json M i18n/en.json M i18n/qqq.json M includes/CollaborationHubContentEditor.php M includes/SpecialCreateCollaborationHub.php M includes/content/CollaborationHubContent.php M includes/content/CollaborationHubContentSchema.php M includes/content/CollaborationKitIcon.php M includes/content/CollaborationListContent.php M modules/ext.CollaborationKit.colourbrowser.styles.less M modules/ext.CollaborationKit.edit.styles.less M modules/ext.CollaborationKit.hub.styles.less M modules/ext.CollaborationKit.hub.subpage.styles.less M modules/ext.CollaborationKit.list.styles.less M modules/ext.CollaborationKit.mixins.less 15 files changed, 405 insertions(+), 405 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit refs/changes/07/333307/1 diff --git a/extension.json b/extension.json index 427f70d..a7bafb7 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "CollaborationKit", - "version": "0.2", + "version": "0.3", "author": [ "Kim Schoonover", "Brian Wolff", "James Hare" ], "url": "https://www.mediawiki.org/wiki/Extension:CollaborationKit", "descriptionmsg": "collaborationkit-desc", @@ -142,28 +142,28 @@ "collaborationkit-colour-select", "collaborationkit-colour-launchbutton", "cancel", - "collaborationkit-red1", - "collaborationkit-red2", - "collaborationkit-grey1", - "collaborationkit-grey2", - "collaborationkit-blue1", - "collaborationkit-blue2", - "collaborationkit-blue3", - "collaborationkit-blue4", - "collaborationkit-blue5", - "collaborationkit-blue6", - "collaborationkit-purple1", - "collaborationkit-purple2", - "collaborationkit-purple3", - "collaborationkit-purple4", - "collaborationkit-purple5", - "collaborationkit-yellow1", - "collaborationkit-yellow2", - "collaborationkit-yellow3", - "collaborationkit-yellow4", - "collaborationkit-green1", - "collaborationkit-green2", - "collaborationkit-green3", + "collaborationkit-darkred", + "collaborationkit-red", + "collaborationkit-darkgrey", + "collaborationkit-lightgrey", + "collaborationkit-skyblue", + "collaborationkit-blue", + "collaborationkit-bluegrey", + "collaborationkit-navyblue", + "collaborationkit-darkblue", + "collaborationkit-aquamarine", + "collaborationkit-violet", + "collaborationkit-purple", + "collaborationkit-mauve", + "collaborationkit-lightmauve", + "collaborationkit-salmon", + "collaborationkit-orange", + "collaborationkit-yellow", + "collaborationkit-gold", + "collaborationkit-pastelyellow", + "collaborationkit-forestgreen", + "collaborationkit-brightgreen", + "collaborationkit-khaki", "collaborationkit-black" ], "styles": "ext.CollaborationKit.colourbrowser.styles.less" @@ -212,28 +212,28 @@ "selectorWithVariant": ".mw-ck-theme-{variant}.mw-ck-list-{name} ul", "class": "ResourceLoaderListStyleModule", "variants": { - "red1": { "color": "#700", "global": true }, - "red2": { "color": "#b11", "global": true }, - "grey1": { "color": "#444", "global": true }, - "grey2": { "color": "#ccc", "global": true }, - "blue1": { "color": "#3af", "global": true }, - "blue2": { "color": "#24e", "global": true }, - "blue3": { "color": "#abcdef", "global": true }, - "blue4": { "color": "#159", "global": true }, - "blue5": { "color": "#008", "global": true }, - "blue6": { "color": "#4cc", "global": true }, - "purple1": { "color": "#b8d", "global": true }, - "purple2": { "color": "#628", "global": true }, - "purple3": { "color": "#605", "global": true }, - "purple4": { "color": "#936", "global": true }, - "purple5": { "color": "#faa", "global": true }, - "yellow1": { "color": "#d52", "global": true }, - "yellow2": { "color": "#fc3", "global": true }, - "yellow3": { "color": "#b91", "global": true }, - "yellow4": { "color": "#ffb", "global": true }, - "green1": { "color": "#051", "global": true }, - "green2": { "color": "#af5", "global": true }, - "green3": { "color": "#663", "global": true } + "darkred": { "color": "#700", "global": true }, + "red": { "color": "#b11", "global": true }, + "darkgrey": { "color": "#444", "global": true }, + "lightgrey": { "color": "#ccc", "global": true }, + "skyblue": { "color": "#3af", "global": true }, + "blue": { "color": "#24e", "global": true }, + "bluegrey": { "color": "#abcdef", "global": true }, + "navyblue": { "color": "#159", "global": true }, + "darkblue": { "color": "#008", "global": true }, + "aquamarine": { "color": "#4cc", "global": true }, + "violet": { "color": "#b8d", "global": true }, + "purple": { "color": "#628", "global": true }, + "mauve": { "color": "#605", "global": true }, + "lightmauve": { "color": "#936", "global": true }, + "salmon": { "color": "#faa", "global": true }, + "orange": { "color": "#d52", "global": true }, + "yellow": { "color": "#fc3", "global": true }, + "gold": { "color": "#b91", "global": true }, + "pastelyellow": { "color": "#ffb", "global": true }, + "forestgreen": { "color": "#051", "global": true }, + "brightgreen": { "color": "#af5", "global": true }, + "khaki": { "color": "#663", "global": true } }, "images": { "square": "images/blot.svg" @@ -244,28 +244,28 @@ "selectorWithVariant": ".mw-ck-theme-{variant} .mw-ck-icon-{name}, .mw-ck-icon-{name}-{variant}", "class": "ResourceLoaderImageModule", "variants": { - "red1": { "color": "#700", "global": true }, - "red2": { "color": "#b11", "global": true }, - "grey1": { "color": "#444", "global": true }, - "grey2": { "color": "#ccc", "global": true }, - "blue1": { "color": "#3af", "global": true }, - "blue2": { "color": "#24e", "global": true }, - "blue3": { "color": "#abcdef", "global": true }, - "blue4": { "color": "#159", "global": true }, - "blue5": { "color": "#008", "global": true }, - "blue6": { "color": "#4cc", "global": true }, - "purple1": { "color": "#b8d", "global": true }, - "purple2": { "color": "#628", "global": true }, - "purple3": { "color": "#605", "global": true }, - "purple4": { "color": "#936", "global": true }, - "purple5": { "color": "#faa", "global": true }, - "yellow1": { "color": "#d52", "global": true }, - "yellow2": { "color": "#fc3", "global": true }, - "yellow3": { "color": "#b91", "global": true }, - "yellow4": { "color": "#ffb", "global": true }, - "green1": { "color": "#051", "global": true }, - "green2": { "color": "#af5", "global": true }, - "green3": { "color": "#663", "global": true } + "darkred": { "color": "#700", "global": true }, + "red": { "color": "#b11", "global": true }, + "darkgrey": { "color": "#444", "global": true }, + "lightgrey": { "color": "#ccc", "global": true }, + "skyblue": { "color": "#3af", "global": true }, + "blue": { "color": "#24e", "global": true }, + "bluegrey": { "color": "#abcdef", "global": true }, + "navyblue": { "color": "#159", "global": true }, + "darkblue": { "color": "#008", "global": true }, + "aquamarine": { "color": "#4cc", "global": true }, + "violet": { "color": "#b8d", "global": true }, + "purple": { "color": "#628", "global": true }, + "mauve": { "color": "#605", "global": true }, + "lightmauve": { "color": "#936", "global": true }, + "salmon": { "color": "#faa", "global": true }, + "orange": { "color": "#d52", "global": true }, + "yellow": { "color": "#fc3", "global": true }, + "gold": { "color": "#b91", "global": true }, + "pastelyellow": { "color": "#ffb", "global": true }, + "forestgreen": { "color": "#051", "global": true }, + "brightgreen": { "color": "#af5", "global": true }, + "khaki": { "color": "#663", "global": true } }, "images": { "addimage": "images/icons/addimage.svg", diff --git a/i18n/en.json b/i18n/en.json index 893ee35..d5ed66b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -90,28 +90,28 @@ "collaborationkit-hubimage-browser": "Media browser", "collaborationkit-hubimage-select": "Select", "collaborationkit-subpage-toc-label": "Part of a project:", - "collaborationkit-red1": "Dark red", - "collaborationkit-red2": "Red", - "collaborationkit-grey1": "Dark grey", - "collaborationkit-grey2": "Light grey", - "collaborationkit-blue1": "Sky blue", - "collaborationkit-blue2": "Blue", - "collaborationkit-blue3": "Blue grey", - "collaborationkit-blue4": "Navy blue", - "collaborationkit-blue5": "Dark blue", - "collaborationkit-blue6": "Aquamarine", - "collaborationkit-purple1": "Violet", - "collaborationkit-purple2": "Purple", - "collaborationkit-purple3": "Mauve", - "collaborationkit-purple4": "Light mauve", - "collaborationkit-purple5": "Salmon", - "collaborationkit-yellow1": "Orange", - "collaborationkit-yellow2": "Yellow", - "collaborationkit-yellow3": "Gold", - "collaborationkit-yellow4": "Pastel yellow", - "collaborationkit-green1": "Forest green", - "collaborationkit-green2": "Bright green", - "collaborationkit-green3": "Khaki", + "collaborationkit-darkred": "Dark red", + "collaborationkit-red": "Red", + "collaborationkit-darkgrey": "Dark grey", + "collaborationkit-lightgrey": "Light grey", + "collaborationkit-skyblue": "Sky blue", + "collaborationkit-blue": "Blue", + "collaborationkit-bluegrey": "Blue grey", + "collaborationkit-navyblue": "Navy blue", + "collaborationkit-darkblue": "Dark blue", + "collaborationkit-aquamarine": "Aquamarine", + "collaborationkit-violet": "Violet", + "collaborationkit-purple": "Purple", + "collaborationkit-mauve": "Mauve", + "collaborationkit-lightmauve": "Light mauve", + "collaborationkit-salmon": "Salmon", + "collaborationkit-orange": "Orange", + "collaborationkit-yellow": "Yellow", + "collaborationkit-gold": "Gold", + "collaborationkit-pastelyellow": "Pastel yellow", + "collaborationkit-forestgreen": "Forest green", + "collaborationkit-brightgreen": "Bright green", + "collaborationkit-khaki": "Khaki", "collaborationkit-black": "Black", "collaborationkit-column-active": "Active members", "collaborationkit-column-inactive": "Inactive members", diff --git a/i18n/qqq.json b/i18n/qqq.json index c08a6e0..2441d6f 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -92,28 +92,28 @@ "collaborationkit-hubimage-browser": "Header label for the hub image browser", "collaborationkit-hubimage-select": "Button for selecting an image in the hub image browser\n{{Identical|Select}}", "collaborationkit-subpage-toc-label": "Label for the toc on a Collaboration Hub subpage", - "collaborationkit-red1": "Color label", - "collaborationkit-red2": "Color label\n{{Identical|Red}}", - "collaborationkit-grey1": "Color label", - "collaborationkit-grey2": "Color label", - "collaborationkit-blue1": "Color label", - "collaborationkit-blue2": "Color label\n{{Identical|Blue}}", - "collaborationkit-blue3": "Color label", - "collaborationkit-blue4": "Color label", - "collaborationkit-blue5": "Color label", - "collaborationkit-blue6": "Color label", - "collaborationkit-purple1": "Color label", - "collaborationkit-purple2": "Color label\n{{Identical|Purple}}", - "collaborationkit-purple3": "Color label", - "collaborationkit-purple4": "Color label", - "collaborationkit-purple5": "Color label", - "collaborationkit-yellow1": "Color label\n{{Identical|Orange}}", - "collaborationkit-yellow2": "Color label\n{{Identical|Yellow}}", - "collaborationkit-yellow3": "Color label", - "collaborationkit-yellow4": "Color label", - "collaborationkit-green1": "Color label", - "collaborationkit-green2": "Color label", - "collaborationkit-green3": "Color label", + "collaborationkit-darkred": "Color label", + "collaborationkit-red": "Color label\n{{Identical|Red}}", + "collaborationkit-darkgrey": "Color label", + "collaborationkit-lightgrey": "Color label", + "collaborationkit-skyblue": "Color label", + "collaborationkit-blue": "Color label\n{{Identical|Blue}}", + "collaborationkit-bluegrey": "Color label", + "collaborationkit-navyblue": "Color label", + "collaborationkit-darkblue": "Color label", + "collaborationkit-aquamarine": "Color label", + "collaborationkit-violet": "Color label", + "collaborationkit-purple": "Color label\n{{Identical|Purple}}", + "collaborationkit-mauve": "Color label", + "collaborationkit-lightmauve": "Color label", + "collaborationkit-salmon": "Color label", + "collaborationkit-orange": "Color label\n{{Identical|Orange}}", + "collaborationkit-yellow": "Color label\n{{Identical|Yellow}}", + "collaborationkit-gold": "Color label", + "collaborationkit-pastelyellow": "Color label", + "collaborationkit-forestgreen": "Color label", + "collaborationkit-brightgreen": "Color label", + "collaborationkit-khaki": "Color label", "collaborationkit-black": "Color label\n{{Identical|Black}}", "collaborationkit-column-active": "Column header for the list of active members of a collaboration hub project", "collaborationkit-column-inactive": "Column header for the list of members of a project who are no longer active on wiki.", diff --git a/includes/CollaborationHubContentEditor.php b/includes/CollaborationHubContentEditor.php index f15954c..e6edcf3 100644 --- a/includes/CollaborationHubContentEditor.php +++ b/includes/CollaborationHubContentEditor.php @@ -58,7 +58,7 @@ $colours[ 'collaborationkit-' . $colour ] = $colour; } if ( $parts[4] == '' ) { - $selectedColour = 'blue5'; + $selectedColour = 'darkblue'; } else { $selectedColour = $parts[4]; } diff --git a/includes/SpecialCreateCollaborationHub.php b/includes/SpecialCreateCollaborationHub.php index 687d541..4401229 100644 --- a/includes/SpecialCreateCollaborationHub.php +++ b/includes/SpecialCreateCollaborationHub.php @@ -71,7 +71,7 @@ 'cssclass' => 'mw-ck-colour-input', 'label-message' => 'collaborationkit-hubedit-colour', 'options' => $this->getOptions( $colours ), - 'default' => 'blue5' + 'default' => 'darkblue' ]; /* Comment this out until it's actually implemented (T135408) diff --git a/includes/content/CollaborationHubContent.php b/includes/content/CollaborationHubContent.php index ccd1755..2ea7cd1 100644 --- a/includes/content/CollaborationHubContent.php +++ b/includes/content/CollaborationHubContent.php @@ -40,28 +40,28 @@ */ public static function getThemeColours() { return [ - 'red1', - 'red2', - 'grey1', - 'grey2', - 'blue1', - 'blue2', - 'blue3', - 'blue4', - 'blue5', - 'blue6', - 'purple1', - 'purple2', - 'purple3', - 'purple4', - 'purple5', - 'yellow1', - 'yellow2', - 'yellow3', - 'yellow4', - 'green1', - 'green2', - 'green3', + 'darkred', + 'red', + 'darkgrey', + 'lightgrey', + 'skyblue', + 'blue', + 'bluegrey', + 'navyblue', + 'darkblue', + 'aquamarine', + 'violet', + 'purple', + 'mauve', + 'lightmauve', + 'salmon', + 'orange', + 'yellow', + 'gold', + 'pastelyellow', + 'forestgreen', + 'brightgreen', + 'khaki', 'black' ]; } @@ -121,7 +121,7 @@ // Set colour to default if empty or missing if ( !isset( $data->colour ) || $data->colour == '' ) { - $this->themeColour = 'blue5'; + $this->themeColour = 'darkblue'; } else { $this->themeColour = $data->colour; } diff --git a/includes/content/CollaborationHubContentSchema.php b/includes/content/CollaborationHubContentSchema.php index 8f8d1de..69d3589 100644 --- a/includes/content/CollaborationHubContentSchema.php +++ b/includes/content/CollaborationHubContentSchema.php @@ -22,29 +22,29 @@ ], 'colour' => [ 'enum' => [ - 0 => 'red1', - 1 => 'red2', - 2 => 'grey1', - 3 => 'grey2', - 4 => 'blue1', - 5 => 'blue2', - 6 => 'blue3', - 7 => 'blue4', - 8 => 'blue5', - 9 => 'blue6', - 10 => 'purple1', - 11 => 'purple2', - 12 => 'purple3', - 13 => 'purple4', - 14 => 'purple5', - 15 => 'yellow1', - 16 => 'yellow2', - 17 => 'yellow3', - 18 => 'yellow4', - 19 => 'green1', - 20 => 'green2', - 21 => 'green3', - 22 => 'black', + 0 => 'darkred', + 1 => 'red', + 2 => 'darkgrey', + 3 => 'lightgrey', + 4 => 'skyblue', + 5 => 'blue', + 6 => 'bluegrey', + 7 => 'navyblue', + 8 => 'darkblue', + 9 => 'aquamarine', + 10 => 'violet', + 11 => 'purple', + 12 => 'mauve', + 13 => 'lightmauve', + 14 => 'salmon', + 15 => 'orange', + 16 => 'yellow', + 17 => 'gold', + 18 => 'pastelyellow', + 19 => 'forestgreen', + 20 => 'brightgreen', + 21 => 'khaki', + 22 => 'black' ], ], 'content' => [ diff --git a/includes/content/CollaborationKitIcon.php b/includes/content/CollaborationKitIcon.php index eae565d..0432b18 100644 --- a/includes/content/CollaborationKitIcon.php +++ b/includes/content/CollaborationKitIcon.php @@ -22,7 +22,7 @@ $iconsPreset = CollaborationKitIcon::getCannedIcons(); if ( !in_array( $icon, $iconsPreset ) && in_array( $fallback, $iconsPreset ) ) { - return CollaborationKitIcon::makeIcon( $fallback, $size, 'grey2', '#eee' ); + return CollaborationKitIcon::makeIcon( $fallback, $size, 'lightgrey', '#eee' ); } else { // makeicon falls back to making a random icon anyway, and we've ruled out all the other fallbacks at this point return CollaborationKitIcon::makeIcon( $icon, $size, $colour ); diff --git a/includes/content/CollaborationListContent.php b/includes/content/CollaborationListContent.php index af8cb9a..bb9103b 100644 --- a/includes/content/CollaborationListContent.php +++ b/includes/content/CollaborationListContent.php @@ -341,9 +341,9 @@ $text .= '[[File:' . $image->getName() . "|left|64px|alt=]]\n"; } else { if ( $this->displaymode == 'members' ) { - $placeholderIcon = 'mw-ck-icon-user-grey2'; + $placeholderIcon = 'mw-ck-icon-user-lightgrey'; } else { - $placeholderIcon = 'mw-ck-icon-page-grey2'; + $placeholderIcon = 'mw-ck-icon-page-lightgrey'; } $text .= Html::element( 'div', [ "class" => [ diff --git a/modules/ext.CollaborationKit.colourbrowser.styles.less b/modules/ext.CollaborationKit.colourbrowser.styles.less index b9feee5..9cd774d 100644 --- a/modules/ext.CollaborationKit.colourbrowser.styles.less +++ b/modules/ext.CollaborationKit.colourbrowser.styles.less @@ -35,71 +35,71 @@ display: none; } -.mw-ck-colour-red1 { - background-color: @red1; +.mw-ck-colour-darkred { + background-color: @darkred; } -.mw-ck-colour-red2 { - background-color: @red2; +.mw-ck-colour-red { + background-color: @red; } -.mw-ck-colour-grey1 { - background-color: @grey1; +.mw-ck-colour-darkgrey { + background-color: @darkgrey; } -.mw-ck-colour-grey2 { - background-color: @grey2; +.mw-ck-colour-lightgrey { + background-color: @lightgrey; } -.mw-ck-colour-blue1 { - background-color: @blue1; +.mw-ck-colour-skyblue { + background-color: @skyblue; } -.mw-ck-colour-blue2 { - background-color: @blue2; +.mw-ck-colour-blue { + background-color: @blue; } -.mw-ck-colour-blue3 { - background-color: @blue3; +.mw-ck-colour-bluegrey { + background-color: @bluegrey; } -.mw-ck-colour-blue4 { - background-color: @blue4; +.mw-ck-colour-navyblue { + background-color: @navyblue; } -.mw-ck-colour-blue5 { - background-color: @blue5; +.mw-ck-colour-darkblue { + background-color: @darkblue; } -.mw-ck-colour-blue6 { - background-color: @blue6; +.mw-ck-colour-aquamarine { + background-color: @aquamarine; } -.mw-ck-colour-purple1 { - background-color: @purple1; +.mw-ck-colour-violet { + background-color: @violet; } -.mw-ck-colour-purple2 { - background-color: @purple2; +.mw-ck-colour-purple { + background-color: @purple; } -.mw-ck-colour-purple3 { - background-color: @purple3; +.mw-ck-colour-mauve { + background-color: @mauve; } -.mw-ck-colour-purple4 { - background-color: @purple4; +.mw-ck-colour-lightmauve { + background-color: @lightmauve; } -.mw-ck-colour-purple5 { - background-color: @purple5; +.mw-ck-colour-salmon { + background-color: @salmon; } -.mw-ck-colour-yellow1 { - background-color: @yellow1; +.mw-ck-colour-orange { + background-color: @orange; } -.mw-ck-colour-yellow2 { - background-color: @yellow2; +.mw-ck-colour-yellow { + background-color: @yellow; } -.mw-ck-colour-yellow3 { - background-color: @yellow3; +.mw-ck-colour-gold { + background-color: @gold; } -.mw-ck-colour-yellow4 { - background-color: @yellow4; +.mw-ck-colour-pastelyellow { + background-color: @pastelyellow; } -.mw-ck-colour-green1 { - background-color: @green1; +.mw-ck-colour-forestgreen { + background-color: @forestgreen; } -.mw-ck-colour-green2 { - background-color: @green2; +.mw-ck-colour-brightgreen { + background-color: @brightgreen; } -.mw-ck-colour-green3 { - background-color: @green3; +.mw-ck-colour-khaki { + background-color: @khaki; } /* Black is special */ .mw-ck-colour-black { diff --git a/modules/ext.CollaborationKit.edit.styles.less b/modules/ext.CollaborationKit.edit.styles.less index 7231f50..a751e82 100644 --- a/modules/ext.CollaborationKit.edit.styles.less +++ b/modules/ext.CollaborationKit.edit.styles.less @@ -33,69 +33,69 @@ } } -.mw-ck-theme-red1 { - .ck-customeditor-toolbars( @red1 ); +.mw-ck-theme-darkred { + .ck-customeditor-toolbars( @darkred ); } -.mw-ck-theme-red2 { - .ck-customeditor-toolbars( @red2 ); +.mw-ck-theme-red { + .ck-customeditor-toolbars( @red ); } -.mw-ck-theme-grey1 { - .ck-customeditor-toolbars( @grey1 ); +.mw-ck-theme-darkgrey { + .ck-customeditor-toolbars( @darkgrey ); } -.mw-ck-theme-grey2 { - .ck-customeditor-toolbars( @grey2 ); +.mw-ck-theme-lightgrey { + .ck-customeditor-toolbars( @lightgrey ); } -.mw-ck-theme-blue1 { - .ck-customeditor-toolbars( @blue1 ); +.mw-ck-theme-skyblue { + .ck-customeditor-toolbars( @skyblue ); } -.mw-ck-theme-blue2 { - .ck-customeditor-toolbars( @blue2 ); +.mw-ck-theme-blue { + .ck-customeditor-toolbars( @blue ); } -.mw-ck-theme-blue3 { - .ck-customeditor-toolbars( @blue3 ); +.mw-ck-theme-bluegrey { + .ck-customeditor-toolbars( @bluegrey ); } -.mw-ck-theme-blue4 { - .ck-customeditor-toolbars( @blue4 ); +.mw-ck-theme-navyblue { + .ck-customeditor-toolbars( @navyblue ); } -.mw-ck-theme-blue5 { - .ck-customeditor-toolbars( @blue5 ); +.mw-ck-theme-darkblue { + .ck-customeditor-toolbars( @darkblue ); } -.mw-ck-theme-blue6 { - .ck-customeditor-toolbars( @blue6 ); +.mw-ck-theme-aquamarine { + .ck-customeditor-toolbars( @aquamarine ); } -.mw-ck-theme-purple1 { - .ck-customeditor-toolbars( @purple1 ); +.mw-ck-theme-violet { + .ck-customeditor-toolbars( @violet ); } -.mw-ck-theme-purple2 { - .ck-customeditor-toolbars( @purple2 ); +.mw-ck-theme-purple { + .ck-customeditor-toolbars( @purple ); } -.mw-ck-theme-purple3 { - .ck-customeditor-toolbars( @purple3 ); +.mw-ck-theme-mauve { + .ck-customeditor-toolbars( @mauve ); } -.mw-ck-theme-purple4 { - .ck-customeditor-toolbars( @purple4 ); +.mw-ck-theme-lightmauve { + .ck-customeditor-toolbars( @lightmauve ); } -.mw-ck-theme-purple5 { - .ck-customeditor-toolbars( @purple5 ); +.mw-ck-theme-salmon { + .ck-customeditor-toolbars( @salmon ); } -.mw-ck-theme-yellow1 { - .ck-customeditor-toolbars( @yellow1 ); +.mw-ck-theme-orange { + .ck-customeditor-toolbars( @orange ); } -.mw-ck-theme-yellow2 { - .ck-customeditor-toolbars( @yellow2 ); +.mw-ck-theme-yellow { + .ck-customeditor-toolbars( @yellow ); } -.mw-ck-theme-yellow3 { - .ck-customeditor-toolbars( @yellow3 ); +.mw-ck-theme-gold { + .ck-customeditor-toolbars( @gold ); } -.mw-ck-theme-yellow4 { - .ck-customeditor-toolbars( @yellow4 ); +.mw-ck-theme-pastelyellow { + .ck-customeditor-toolbars( @pastelyellow ); } -.mw-ck-theme-green1 { - .ck-customeditor-toolbars( @green1 ); +.mw-ck-theme-forestgreen { + .ck-customeditor-toolbars( @forestgreen ); } -.mw-ck-theme-green2 { - .ck-customeditor-toolbars( @green2 ); +.mw-ck-theme-brightgreen { + .ck-customeditor-toolbars( @brightgreen ); } -.mw-ck-theme-green3 { - .ck-customeditor-toolbars( @green3 ); +.mw-ck-theme-khaki { + .ck-customeditor-toolbars( @khaki ); } diff --git a/modules/ext.CollaborationKit.hub.styles.less b/modules/ext.CollaborationKit.hub.styles.less index 7bd6e20..2c14341 100644 --- a/modules/ext.CollaborationKit.hub.styles.less +++ b/modules/ext.CollaborationKit.hub.styles.less @@ -136,70 +136,70 @@ // Themes .mw-body .mw-ck-collaborationhub { - &.mw-ck-theme-red1 { - .chtheme( @red1 ); + &.mw-ck-theme-darkred { + .chtheme( @darkred ); } - &.mw-ck-theme-red2 { - .chtheme( @red2 ); + &.mw-ck-theme-red { + .chtheme( @red ); } - &.mw-ck-theme-grey1 { - .chtheme( @grey1 ); + &.mw-ck-theme-darkgrey { + .chtheme( @darkgrey ); } - &.mw-ck-theme-grey2 { - .chtheme( @grey2 ); + &.mw-ck-theme-lightgrey { + .chtheme( @lightgrey ); } - &.mw-ck-theme-blue1 { - .chtheme( @blue1 ); + &.mw-ck-theme-skyblue { + .chtheme( @skyblue ); } - &.mw-ck-theme-blue2 { - .chtheme( @blue2 ); + &.mw-ck-theme-blue { + .chtheme( @blue ); } - &.mw-ck-theme-blue3 { - .chtheme( @blue3 ); + &.mw-ck-theme-bluegrey { + .chtheme( @bluegrey ); } - &.mw-ck-theme-blue4 { - .chtheme( @blue4 ); + &.mw-ck-theme-navyblue { + .chtheme( @navyblue ); } - &.mw-ck-theme-blue5 { - .chtheme( @blue5 ); + &.mw-ck-theme-darkblue { + .chtheme( @darkblue ); } - &.mw-ck-theme-blue6 { - .chtheme( @blue6 ); + &.mw-ck-theme-aquamarine { + .chtheme( @aquamarine ); } - &.mw-ck-theme-purple1 { - .chtheme( @purple1 ); + &.mw-ck-theme-violet { + .chtheme( @violet ); } - &.mw-ck-theme-purple2 { - .chtheme( @purple2 ); + &.mw-ck-theme-purple { + .chtheme( @purple ); } - &.mw-ck-theme-purple3 { - .chtheme( @purple3 ); + &.mw-ck-theme-mauve { + .chtheme( @mauve ); } - &.mw-ck-theme-purple4 { - .chtheme( @purple4 ); + &.mw-ck-theme-lightmauve { + .chtheme( @lightmauve ); } - &.mw-ck-theme-purple5 { - .chtheme( @purple5 ); + &.mw-ck-theme-salmon { + .chtheme( @salmon ); } - &.mw-ck-theme-yellow1 { - .chtheme( @yellow1 ); + &.mw-ck-theme-orange { + .chtheme( @orange ); } - &.mw-ck-theme-yellow2 { - .chtheme( @yellow2 ); + &.mw-ck-theme-yellow { + .chtheme( @yellow ); } - &.mw-ck-theme-yellow3 { - .chtheme( @yellow3 ); + &.mw-ck-theme-gold { + .chtheme( @gold ); } - &.mw-ck-theme-yellow4 { - .chtheme( @yellow4 ); + &.mw-ck-theme-pastelyellow { + .chtheme( @pastelyellow ); } - &.mw-ck-theme-green1 { - .chtheme( @green1 ); + &.mw-ck-theme-forestgreen { + .chtheme( @forestgreen ); } - &.mw-ck-theme-green2 { - .chtheme( @green2 ); + &.mw-ck-theme-brightgreen { + .chtheme( @brightgreen ); } - &.mw-ck-theme-green3 { - .chtheme( @green3 ); + &.mw-ck-theme-khaki { + .chtheme( @khaki ); } } diff --git a/modules/ext.CollaborationKit.hub.subpage.styles.less b/modules/ext.CollaborationKit.hub.subpage.styles.less index 795518a..171feb2 100644 --- a/modules/ext.CollaborationKit.hub.subpage.styles.less +++ b/modules/ext.CollaborationKit.hub.subpage.styles.less @@ -88,69 +88,69 @@ // Themes -.mw-ck-theme-red1 { - .chsubtheme( @red1 ); +.mw-ck-theme-darkred { + .chsubtheme( @darkred ); } -.mw-ck-theme-red2 { - .chsubtheme( @red2 ); +.mw-ck-theme-red { + .chsubtheme( @red ); } -.mw-ck-theme-grey1 { - .chsubtheme( @grey1 ); +.mw-ck-theme-darkgrey { + .chsubtheme( @darkgrey ); } -.mw-ck-theme-grey2 { - .chsubtheme( @grey2 ); +.mw-ck-theme-lightgrey { + .chsubtheme( @lightgrey ); } -.mw-ck-theme-blue1 { - .chsubtheme( @blue1 ); +.mw-ck-theme-skyblue { + .chsubtheme( @skyblue ); } -.mw-ck-theme-blue2 { - .chsubtheme( @blue2 ); +.mw-ck-theme-blue { + .chsubtheme( @blue ); } -.mw-ck-theme-blue3 { - .chsubtheme( @blue3 ); +.mw-ck-theme-bluegrey { + .chsubtheme( @bluegrey ); } -.mw-ck-theme-blue4 { - .chsubtheme( @blue4 ); +.mw-ck-theme-navyblue { + .chsubtheme( @navyblue ); } -.mw-ck-theme-blue5 { - .chsubtheme( @blue5 ); +.mw-ck-theme-darkblue { + .chsubtheme( @darkblue ); } -.mw-ck-theme-blue6 { - .chsubtheme( @blue6 ); +.mw-ck-theme-aquamarine { + .chsubtheme( @aquamarine ); } -.mw-ck-theme-purple1 { - .chsubtheme( @purple1 ); +.mw-ck-theme-violet { + .chsubtheme( @violet ); } -.mw-ck-theme-purple2 { - .chsubtheme( @purple2 ); +.mw-ck-theme-purple { + .chsubtheme( @purple ); } -.mw-ck-theme-purple3 { - .chsubtheme( @purple3 ); +.mw-ck-theme-mauve { + .chsubtheme( @mauve ); } -.mw-ck-theme-purple4 { - .chsubtheme( @purple4 ); +.mw-ck-theme-lightmauve { + .chsubtheme( @lightmauve ); } -.mw-ck-theme-purple5 { - .chsubtheme( @purple5 ); +.mw-ck-theme-salmon { + .chsubtheme( @salmon ); } -.mw-ck-theme-yellow1 { - .chsubtheme( @yellow1 ); +.mw-ck-theme-orange { + .chsubtheme( @orange ); } -.mw-ck-theme-yellow2 { - .chsubtheme( @yellow2 ); +.mw-ck-theme-yellow { + .chsubtheme( @yellow ); } -.mw-ck-theme-yellow3 { - .chsubtheme( @yellow3 ); +.mw-ck-theme-gold { + .chsubtheme( @gold ); } -.mw-ck-theme-yellow4 { - .chsubtheme( @yellow4 ); +.mw-ck-theme-pastelyellow { + .chsubtheme( @pastelyellow ); } -.mw-ck-theme-green1 { - .chsubtheme( @green1 ); +.mw-ck-theme-forestgreen { + .chsubtheme( @forestgreen ); } -.mw-ck-theme-green2 { - .chsubtheme( @green2 ); +.mw-ck-theme-brightgreen { + .chsubtheme( @brightgreen ); } -.mw-ck-theme-green3 { - .chsubtheme( @green3 ); +.mw-ck-theme-khaki { + .chsubtheme( @khaki ); } diff --git a/modules/ext.CollaborationKit.list.styles.less b/modules/ext.CollaborationKit.list.styles.less index 39f670e..08ded8b 100644 --- a/modules/ext.CollaborationKit.list.styles.less +++ b/modules/ext.CollaborationKit.list.styles.less @@ -89,71 +89,71 @@ } } } -.mw-ck-theme-red1 { - .column-theme-header( @red1 ); +.mw-ck-theme-darkred { + .column-theme-header( @darkred ); } -.mw-ck-theme-red2 { - .column-theme-header( @red2 ); +.mw-ck-theme-red { + .column-theme-header( @red ); } -.mw-ck-theme-grey1 { - .column-theme-header( @grey1 ); +.mw-ck-theme-darkgrey { + .column-theme-header( @darkgrey ); } -.mw-ck-theme-grey2 { - .column-theme-header( @grey2 ); +.mw-ck-theme-lightgrey { + .column-theme-header( @lightgrey ); } -.mw-ck-theme-blue1 { - .column-theme-header( @blue1 ); +.mw-ck-theme-skyblue { + .column-theme-header( @skyblue ); } -.mw-ck-theme-blue2 { - .column-theme-header( @blue2 ); +.mw-ck-theme-blue { + .column-theme-header( @blue ); } -.mw-ck-theme-blue3 { - .column-theme-header( @blue3 ); +.mw-ck-theme-bluegrey { + .column-theme-header( @bluegrey ); } -.mw-ck-theme-blue4 { - .column-theme-header( @blue4 ); +.mw-ck-theme-navyblue { + .column-theme-header( @navyblue ); } -.mw-ck-theme-blue5 { - .column-theme-header( @blue5 ); +.mw-ck-theme-darkblue { + .column-theme-header( @darkblue ); } -.mw-ck-theme-blue6 { - .column-theme-header( @blue6 ); +.mw-ck-theme-aquamarine { + .column-theme-header( @aquamarine ); } -.mw-ck-theme-purple1 { - .column-theme-header( @purple1 ); +.mw-ck-theme-violet { + .column-theme-header( @violet ); } -.mw-ck-theme-purple2 { - .column-theme-header( @purple2 ); +.mw-ck-theme-purple { + .column-theme-header( @purple ); } -.mw-ck-theme-purple3 { - .column-theme-header( @purple3 ); +.mw-ck-theme-mauve { + .column-theme-header( @mauve ); } -.mw-ck-theme-purple4 { - .column-theme-header( @purple4 ); +.mw-ck-theme-lightmauve { + .column-theme-header( @lightmauve ); } -.mw-ck-theme-purple5 { - .column-theme-header( @purple5 ); +.mw-ck-theme-salmon { + .column-theme-header( @salmon ); } -.mw-ck-theme-yellow1 { - .column-theme-header( @yellow1 ); +.mw-ck-theme-orange { + .column-theme-header( @orange ); } -.mw-ck-theme-yellow2 { - .column-theme-header( @yellow2 ); +.mw-ck-theme-yellow { + .column-theme-header( @yellow ); } -.mw-ck-theme-yellow3 { - .column-theme-header( @yellow3 ); +.mw-ck-theme-gold { + .column-theme-header( @gold ); } -.mw-ck-theme-yellow4 { - .column-theme-header( @yellow4 ); +.mw-ck-theme-pastelyellow { + .column-theme-header( @pastelyellow ); } -.mw-ck-theme-green1 { - .column-theme-header( @green1 ); +.mw-ck-theme-forestgreen { + .column-theme-header( @forestgreen ); } -.mw-ck-theme-green2 { - .column-theme-header( @green2 ); +.mw-ck-theme-brightgreen { + .column-theme-header( @brightgreen ); } -.mw-ck-theme-green3 { - .column-theme-header( @green3 ); +.mw-ck-theme-khaki { + .column-theme-header( @khaki ); } /* @todo, should maybe replace styling from toccolours with this class */ diff --git a/modules/ext.CollaborationKit.mixins.less b/modules/ext.CollaborationKit.mixins.less index 4506eb5..37e2bc9 100644 --- a/modules/ext.CollaborationKit.mixins.less +++ b/modules/ext.CollaborationKit.mixins.less @@ -60,27 +60,27 @@ } } -@red1: #700; -@red2: #b11; -@grey1: #444; -@grey2: #ccc; -@blue1: #3af; -@blue2: #24e; -@blue3: #abcdef; -@blue4: #159; -@blue5: #008; -@blue6: #4cc; -@purple1: #b8d; -@purple2: #628; -@purple3: #605; -@purple4: #936; -@purple5: #faa; -@yellow1: #d52; -@yellow2: #fc3; -@yellow3: #b91; -@yellow4: #ffb; -@green1: #051; -@green2: #af5; -@green3: #663; +@darkred: #700; +@red: #b11; +@darkgrey: #444; +@lightgrey: #ccc; +@skyblue: #3af; +@blue: #24e; +@bluegrey: #abcdef; +@navyblue: #159; +@darkblue: #008; +@aquamarine: #4cc; +@violet: #b8d; +@purple: #628; +@mauve: #605; +@lightmauve: #936; +@salmon: #faa; +@orange: #d52; +@yellow: #fc3; +@gold: #b91; +@pastelyellow: #ffb; +@forestgreen: #051; +@brightgreen: #af5; +@khaki: #663; -@default: @grey2; +@default: @lightgrey; -- To view, visit https://gerrit.wikimedia.org/r/333307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia09673e4ce0c22a83e5df9cbe482821072d4a4de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CollaborationKit Gerrit-Branch: master Gerrit-Owner: Harej <jamesmh...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits