Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/194854
Change subject: Using $wgResourceLoaderLESSVars for most LESS vars ...................................................................... Using $wgResourceLoaderLESSVars for most LESS vars This change should make it easier to adapt the look of BlueSpiceSkin to the requirements of customers. It also enables extensions like FlexiSkin to modify the variables by using 'ResourceLoaderGetLessVars' (1.25+) hook. I don't know why, but having 'bs-skin-path' variable in the array breaks the function. This should be subject to future improvements. Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d (cherry picked from commit ab9dc6e3917188f1bcb6132bb4b5804a312bd3bc) --- M BlueSpiceSkin.php M resources/variables.less 2 files changed, 33 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin refs/changes/54/194854/1 diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index 772eecc..e193e40 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -86,4 +86,36 @@ $wgDefaultSkin = 'bluespiceskin'; $wgSkipSkins = array( 'chick', 'cologneblue', 'common', 'modern', 'monobook', - 'myskin', 'nostalgia', 'simple', 'standard' ); \ No newline at end of file + 'myskin', 'nostalgia', 'simple', 'standard' ); + +// Set LESS global variables + $localBasePath = dirname( __DIR__ ); + $wgResourceLoaderLESSImportPaths = array_merge( $wgResourceLoaderLESSImportPaths, array( + "$localBasePath/resources/", + ) ); + +$wgResourceLoaderLESSVars += array( + 'body-font-size' => '1em', + 'bs-color-primary' => '#3e5389', //blue + 'bs-color-secondary' => '#ffae00', //orange + 'bs-color-tertiary' => '#b73a3a', //red + 'bs-color-neutral' => '#929292', //grey + 'bs-color-neutral2' => '#ABABAB', //lighten(@bs-color-neutral1, 10%); - LESS / RL issue + 'bs-color-neutral3' => '#C4C4C4', //lighten(@bs-color-neutral1, 20%)', + 'bs-color-neutral4' => '#787878', //darken(@bs-color-neutral1, 10%)', + 'bs-color-dark-blue' => 'rgb(62, 83, 137)', + 'bs-color-bright-blue-a' => 'rgba(205, 223, 242, 0.6)', + 'bs-color-middle-blue-a' => 'rgba(62, 83, 137, 0.44)', + 'bs-color-middle-blue' => 'rgba(152, 167, 196)', + 'bs-color-light-grey' => 'rgb(211, 211, 211)', + 'bs-color-dark-grey' => 'rgb(186, 186, 186)', + 'bs-color-darker-grey' => '#494949', + 'bs-color-content-default' => '#252525', + 'bs-color-redlink' => '#ba0000', + 'bs-font-default' => '"Source Sans Pro", sans-serif', + 'bs-font-roboto' => '"RobotoSlab"', + 'bs-box-shadow' => '0px 4px 20px 0px rgba(9, 7, 9, 0.45)', + 'bs-width-page' => '1222px', + 'bs-width-navcol' => '276px', + 'bs-margin-left-content' => '302px' +); \ No newline at end of file diff --git a/resources/variables.less b/resources/variables.less index 985d8cf..d9f362d 100644 --- a/resources/variables.less +++ b/resources/variables.less @@ -1,32 +1,4 @@ -@body-font-size: 1em; @bs-skin-path: ""; - -// BlueSpice -// INT:https://wiki.hallowelt.biz/index.php/Blue_spice/Style_Guide/Allgemeine_Designobjekte -@bs-color-primary: #3e5389; //blue -@bs-color-secondary: #ffae00; //orange -@bs-color-tertiary: #b73a3a; //red -@bs-color-neutral: #929292; //grey -@bs-color-neutral2: #ABABAB; //lighten(@bs-color-neutral1, 10%); - LESS / RL issue -@bs-color-neutral3: #C4C4C4; //lighten(@bs-color-neutral1, 20%); -@bs-color-neutral4: #787878; //darken(@bs-color-neutral1, 10%); -@bs-color-dark-blue: rgb(62, 83, 137); -@bs-color-bright-blue-a: rgba(205, 223, 242, 0.6); -@bs-color-middle-blue-a: rgba(62, 83, 137, 0.44); -@bs-color-middle-blue: rgba(152, 167, 196); -@bs-color-light-grey: rgb(211, 211, 211); -@bs-color-dark-grey: rgb(186, 186, 186); -@bs-color-darker-grey: #494949; -@bs-color-content-default: #252525; -@bs-color-redlink: #ba0000; -//@bs-font-default: "Neue Helvetica", Helvetica, Arial, sans-serif; -@bs-font-default: "Source Sans Pro", sans-serif; -@bs-font-roboto: "RobotoSlab"; -@bs-box-shadow: 0px 4px 20px 0px rgba(9, 7, 9, 0.45); - -@bs-width-page: 1222px; -@bs-width-navcol: 276px; -@bs-margin-left-content: 302px; .border-radius(@radius) { -webkit-border-radius: @radius; -- To view, visit https://gerrit.wikimedia.org/r/194854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: REL1_23 Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
