From 6d15349c45f611ce90b957be1c982c3836e0844e Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Mon, 14 Nov 2022 16:28:41 +0000 Subject: [PATCH] Fix brand for csp (#7428) --- shell/assets/brand/csp/dark/rancher-logo.svg | 148 +++++++++++++++++++ shell/assets/brand/csp/favicon.png | Bin 0 -> 823 bytes shell/assets/brand/csp/metadata.json | 3 + shell/assets/brand/csp/rancher-logo.svg | 130 ++++++++++++++++ shell/assets/styles/app.scss | 2 +- shell/assets/styles/themes/_csp.scss | 25 ++++ shell/config/private-label.js | 5 +- shell/mixins/brand.js | 4 +- shell/utils/favicon.js | 2 + 9 files changed, 315 insertions(+), 4 deletions(-) create mode 100644 shell/assets/brand/csp/dark/rancher-logo.svg create mode 100644 shell/assets/brand/csp/favicon.png create mode 100644 shell/assets/brand/csp/metadata.json create mode 100644 shell/assets/brand/csp/rancher-logo.svg create mode 100644 shell/assets/styles/themes/_csp.scss diff --git a/shell/assets/brand/csp/dark/rancher-logo.svg b/shell/assets/brand/csp/dark/rancher-logo.svg new file mode 100644 index 0000000000..4bd2f0bb9f --- /dev/null +++ b/shell/assets/brand/csp/dark/rancher-logo.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + diff --git a/shell/assets/brand/csp/favicon.png b/shell/assets/brand/csp/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..2afa47da314e7b6665a9868999b3f88a622f1ca1 GIT binary patch literal 823 zcmV-71IYY|P)*@_NEx*agp|7pn;ouH5E^&v1M`T~!;^AR>cH-yeD@{joh=t75(rkl( zDojSn(a;(`IM?0Wk)xow#KYz3>Gt^e>+bFOQA>iBlX#7ZV|#a0Z);L*XnKx|Q*CLNr=|M)`|9oO&)3$H zqoMfu`O4DKL0?)KJvj9B_3rWTe36bdRZv1;Tdupg{{H?nR8LoOZF`W7*4*2+!M{jl zV7|!5;N;{!Tvs+#P+4AParaxU-?~`F80000EbW%=J0IwXW@hGtJC-1JU z?C^b2Kmq^&0Zd6mK~y-)&68Dg0x=MPgCCV$+#QM)hq_RAcXxMp?;mfj!$5n(9dDg} z51C2!%WRU(5+ai;kOzf`Aw;G`0hA1pqafu(AuLDV3G!&o{&y*uo(I z2VL|Bpjnd_TnBJVAJu;dqlj&4wTW)FdDL1>z7}49yAP8dCU~p4w#y!Ce2~A~^Xr?d zHp74Tay&wb#;GJCVL?I|!RD BeF*>n literal 0 HcmV?d00001 diff --git a/shell/assets/brand/csp/metadata.json b/shell/assets/brand/csp/metadata.json new file mode 100644 index 0000000000..50613f4e07 --- /dev/null +++ b/shell/assets/brand/csp/metadata.json @@ -0,0 +1,3 @@ +{ + "hasStylesheet": "true" +} \ No newline at end of file diff --git a/shell/assets/brand/csp/rancher-logo.svg b/shell/assets/brand/csp/rancher-logo.svg new file mode 100644 index 0000000000..e7ebce2940 --- /dev/null +++ b/shell/assets/brand/csp/rancher-logo.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + diff --git a/shell/assets/styles/app.scss b/shell/assets/styles/app.scss index 9ee2eb4a76..451b6be57d 100644 --- a/shell/assets/styles/app.scss +++ b/shell/assets/styles/app.scss @@ -16,7 +16,7 @@ @import "./themes/light"; @import "./themes/dark"; @import './themes/_suse.scss'; - +@import './themes/_csp.scss'; @import "./global/columns"; @import "./global/cards"; diff --git a/shell/assets/styles/themes/_csp.scss b/shell/assets/styles/themes/_csp.scss new file mode 100644 index 0000000000..cf5ff517dd --- /dev/null +++ b/shell/assets/styles/themes/_csp.scss @@ -0,0 +1,25 @@ +.csp { + $primary: hsl(151, 59%, 46%); + $info: mix($primary, $secondary, 50%); + $selected: rgba($primary, .5); + + --primary : #{$primary}; + --primary-text : #fff; + --primary-hover-bg : #{darken($primary, 10%)}; + --primary-hover-text : #{saturate($lightest, 20%)}; + --primary-active-bg : #{darken($primary, 25%)}; + --primary-active-text : #{contrast-color(darken($primary, 25%))}; + --primary-border : #($primary); + --primary-banner-bg : #{rgba($primary, 0.15)}; + --primary-light-bg : #{rgba($primary, 0.05)}; + + --info : #{$info}; + --info-text : #{contrast-color($info)}; + --info-hover-bg : #{darken($info, 10%)}; + --info-hover-text : #{saturate($lightest, 20%)}; + --info-active-bg : #{darken($info, 25%)}; + --info-active-text : #{contrast-color(darken($info, 25%))}; + --info-border : #($info); + --info-banner-bg : #{rgba($info, 0.15)}; + --info-light-bg : #{rgba($info, 0.05)}; +} diff --git a/shell/config/private-label.js b/shell/config/private-label.js index 187b4852d8..b5a005f2bd 100644 --- a/shell/config/private-label.js +++ b/shell/config/private-label.js @@ -7,7 +7,10 @@ export const DOCS_BASE = 'https://rancher.com/docs/rancher/v2.7/en'; const STANDARD_VENDOR = 'Rancher'; const STANDARD_PRODUCT = 'Explorer'; -const CUSTOM_VENDOR = { suse: 'Rancher Prime' }; +const CUSTOM_VENDOR = { + suse: 'Rancher Prime', + csp: 'SUSE Rancher' +}; let mode = STANDARD; let vendor = STANDARD_VENDOR; diff --git a/shell/mixins/brand.js b/shell/mixins/brand.js index f9f2a6cec5..0a268ca006 100644 --- a/shell/mixins/brand.js +++ b/shell/mixins/brand.js @@ -94,7 +94,7 @@ export default { const brandSetting = findBy(this.globalSettings, 'id', SETTING.BRAND); if (brandSetting) { - brandSetting.value = 'suse'; + brandSetting.value = 'csp'; brandSetting.save(); } else { const schema = this.$store.getters['management/schemaFor'](MANAGEMENT.SETTING); @@ -102,7 +102,7 @@ export default { if (url) { this.$store.dispatch('management/create', { - type: MANAGEMENT.SETTING, metadata: { name: SETTING.BRAND }, value: 'suse', default: '' + type: MANAGEMENT.SETTING, metadata: { name: SETTING.BRAND }, value: 'csp', default: '' }).then(setting => setting.save()); } } diff --git a/shell/utils/favicon.js b/shell/utils/favicon.js index ded70ca9ad..0ab7cb580d 100644 --- a/shell/utils/favicon.js +++ b/shell/utils/favicon.js @@ -18,6 +18,8 @@ export function setFavIcon(store) { if (brandSetting?.value === 'suse') { brandImage = require('~shell/assets/brand/suse/favicon.png'); + } else if (brandSetting?.value === 'csp') { + brandImage = require('~shell/assets/brand/csp/favicon.png'); } link.href = res?.value || brandImage || defaultFavIcon;