From aa0dc59ce91d3480f02776085fa948cc5b6459bb Mon Sep 17 00:00:00 2001 From: Yoshie Muranaka Date: Mon, 27 Jul 2020 07:41:31 -0700 Subject: Change openpower env files to ibm - Adds VUE_APP_COMPANY_NAME value that is used for logo alt text - Update VUE_APP_ENV_NAME to ibm since this will need to match the env filenames Signed-off-by: Yoshie Muranaka Change-Id: Ie5b9fc3bedacb493939900a1de77a3a8a1f181c5 --- .env.ibm | 3 ++ .env.openpower | 2 -- src/env/assets/styles/_ibm.scss | 57 +++++++++++++++++++++++++++++++++++ src/env/assets/styles/_openpower.scss | 57 ----------------------------------- src/env/router/ibm.js | 6 ++++ src/env/router/openpower.js | 6 ---- src/env/store/ibm.js | 7 +++++ src/env/store/openpower.js | 7 ----- 8 files changed, 73 insertions(+), 72 deletions(-) create mode 100644 .env.ibm delete mode 100644 .env.openpower create mode 100644 src/env/assets/styles/_ibm.scss delete mode 100644 src/env/assets/styles/_openpower.scss create mode 100644 src/env/router/ibm.js delete mode 100644 src/env/router/openpower.js create mode 100644 src/env/store/ibm.js delete mode 100644 src/env/store/openpower.js diff --git a/.env.ibm b/.env.ibm new file mode 100644 index 00000000..8eb17d75 --- /dev/null +++ b/.env.ibm @@ -0,0 +1,3 @@ +NODE_ENV=production +VUE_APP_ENV_NAME=ibm +VUE_APP_COMPANY_NAME="IBM" \ No newline at end of file diff --git a/.env.openpower b/.env.openpower deleted file mode 100644 index 26c1c98e..00000000 --- a/.env.openpower +++ /dev/null @@ -1,2 +0,0 @@ -NODE_ENV=production -VUE_APP_ENV_NAME=openpower \ No newline at end of file diff --git a/src/env/assets/styles/_ibm.scss b/src/env/assets/styles/_ibm.scss new file mode 100644 index 00000000..f1bf4320 --- /dev/null +++ b/src/env/assets/styles/_ibm.scss @@ -0,0 +1,57 @@ +@font-face { + font-family: 'Plex'; + src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-Light.woff') format('woff'); + font-weight: 200; +} +@font-face { + font-family: 'Plex'; + src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-LightItalic.woff') format('woff'); + font-weight: 200; + font-style: italic; +} +@font-face { + font-family: 'Plex'; + src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-Regular.woff') format('woff'); + font-weight: 400; +} +@font-face { + font-family: 'Plex'; + src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-Italic.woff') format('woff'); + font-weight: 400; + font-style: italic; +} +@font-face { + font-family: 'Plex'; + src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-SemiBold.woff') format('woff'); + font-weight: 700; +} +@font-face { + font-family: 'Plex'; + src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-SemiBoldItalic.woff') format('woff'); + font-weight: 700; + font-style: italic; +} + +// IBM Plex with Bootstrap default as fallbacks +// https://getbootstrap.com/docs/4.4/content/reboot/#native-font-stack + +$font-family-base: 'Plex', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + +// IBM gray palette +$gray-100: #F4F4F4; +// $gray-200: #E0E0E0; Use default OpenBMC $gray-200 +// $gray-300: #C6C6C6; Use default OpenBMC $gray-300 +$gray-400: #A8A8A8; +$gray-500: #8D8D8D; +$gray-600: #6F6F6F; +$gray-700: #525252; +$gray-800: #333333; +$gray-900: #161616; + +// IBM theme colors +$theme-colors: ( + "primary": #0F62FE, + "danger": #DA1E28, + "success": #24A146, + "warning": #F1C21B +); \ No newline at end of file diff --git a/src/env/assets/styles/_openpower.scss b/src/env/assets/styles/_openpower.scss deleted file mode 100644 index f1bf4320..00000000 --- a/src/env/assets/styles/_openpower.scss +++ /dev/null @@ -1,57 +0,0 @@ -@font-face { - font-family: 'Plex'; - src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-Light.woff') format('woff'); - font-weight: 200; -} -@font-face { - font-family: 'Plex'; - src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-LightItalic.woff') format('woff'); - font-weight: 200; - font-style: italic; -} -@font-face { - font-family: 'Plex'; - src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-Regular.woff') format('woff'); - font-weight: 400; -} -@font-face { - font-family: 'Plex'; - src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-Italic.woff') format('woff'); - font-weight: 400; - font-style: italic; -} -@font-face { - font-family: 'Plex'; - src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-SemiBold.woff') format('woff'); - font-weight: 700; -} -@font-face { - font-family: 'Plex'; - src: url('~@/env/assets/fonts/IBM_Plex_Sans/IBMPlexSans-SemiBoldItalic.woff') format('woff'); - font-weight: 700; - font-style: italic; -} - -// IBM Plex with Bootstrap default as fallbacks -// https://getbootstrap.com/docs/4.4/content/reboot/#native-font-stack - -$font-family-base: 'Plex', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - -// IBM gray palette -$gray-100: #F4F4F4; -// $gray-200: #E0E0E0; Use default OpenBMC $gray-200 -// $gray-300: #C6C6C6; Use default OpenBMC $gray-300 -$gray-400: #A8A8A8; -$gray-500: #8D8D8D; -$gray-600: #6F6F6F; -$gray-700: #525252; -$gray-800: #333333; -$gray-900: #161616; - -// IBM theme colors -$theme-colors: ( - "primary": #0F62FE, - "danger": #DA1E28, - "success": #24A146, - "warning": #F1C21B -); \ No newline at end of file diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js new file mode 100644 index 00000000..dccb2de5 --- /dev/null +++ b/src/env/router/ibm.js @@ -0,0 +1,6 @@ +import router from '@/router'; + +// Use router.addRoutes() to add layer specific routes +// https://router.vuejs.org/api/#router-addroutes + +export default router; diff --git a/src/env/router/openpower.js b/src/env/router/openpower.js deleted file mode 100644 index dccb2de5..00000000 --- a/src/env/router/openpower.js +++ /dev/null @@ -1,6 +0,0 @@ -import router from '@/router'; - -// Use router.addRoutes() to add layer specific routes -// https://router.vuejs.org/api/#router-addroutes - -export default router; diff --git a/src/env/store/ibm.js b/src/env/store/ibm.js new file mode 100644 index 00000000..70c9b98a --- /dev/null +++ b/src/env/store/ibm.js @@ -0,0 +1,7 @@ +import store from '@/store'; + +// Use store.registerModule() to register env specific +// store modules +// https://vuex.vuejs.org/api/#registermodule + +export default store; diff --git a/src/env/store/openpower.js b/src/env/store/openpower.js deleted file mode 100644 index 70c9b98a..00000000 --- a/src/env/store/openpower.js +++ /dev/null @@ -1,7 +0,0 @@ -import store from '@/store'; - -// Use store.registerModule() to register env specific -// store modules -// https://vuex.vuejs.org/api/#registermodule - -export default store; -- cgit v1.2.3