diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/assets/styles/bmc/_sila/_base.scss | 5 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_forms.scss | 8 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_modal.scss | 2 | ||||
-rw-r--r-- | src/components/_sila/AppNavigation/AppNavigation.vue | 3 | ||||
-rw-r--r-- | src/env/assets/styles/_sila.scss | 10 | ||||
-rw-r--r-- | src/env/components/AppNavigation/sila.js | 29 | ||||
-rw-r--r-- | src/views/_sila/Fans/Static/FansStaticPage.vue | 2 |
7 files changed, 17 insertions, 42 deletions
diff --git a/src/assets/styles/bmc/_sila/_base.scss b/src/assets/styles/bmc/_sila/_base.scss index 6a8ead73..e95a1ce1 100644 --- a/src/assets/styles/bmc/_sila/_base.scss +++ b/src/assets/styles/bmc/_sila/_base.scss @@ -63,13 +63,12 @@ h5, } h6, -.h6 { +.h6, label { font-size: 0.825rem !important; font-weight: 500; line-height: 1.2; } - .navbar-brand { font-size: 1.4rem !important; } @@ -92,9 +91,11 @@ h6, .app-header .navbar-text, .app-header .nav-link, .app-header .btn-link { &:hover { background-color: $red-40 !important; + border-radius: $border-radius; } &:active { background-color: $red-active !important; + border-radius: $border-radius; } &:focus { outline: 0; diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss index f0de774e..2d8c0e14 100644 --- a/src/assets/styles/bmc/_sila/_forms.scss +++ b/src/assets/styles/bmc/_sila/_forms.scss @@ -16,6 +16,10 @@ .form-group { margin-bottom: $spacer * 2; + & > label { + color: $text-tretiatry; + margin-bottom: $spacer / 4; + } } .custom-select, @@ -110,8 +114,8 @@ .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after, .custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before, .custom-control-input:checked ~ .custom-control-label::before { - border: 1px solid $red; - background-color: $red; + border: 1px solid $red !important; + background-color: $red !important; box-shadow: 0px 0px 0px 3px $white inset; cursor: pointer; &:focus { diff --git a/src/assets/styles/bmc/_sila/_modal.scss b/src/assets/styles/bmc/_sila/_modal.scss index 91412338..5f40d5e1 100644 --- a/src/assets/styles/bmc/_sila/_modal.scss +++ b/src/assets/styles/bmc/_sila/_modal.scss @@ -42,7 +42,7 @@ .custom-file-input ~ .custom-file-label { background-color: transparent; - border: 1px dashed rgba(12, 28, 41, 0.6); + border: 1px dashed $text-tretiatry; box-sizing: border-box; border-radius: $border-radius; height: 100%; diff --git a/src/components/_sila/AppNavigation/AppNavigation.vue b/src/components/_sila/AppNavigation/AppNavigation.vue index 6f5dfa23..a03a1cd0 100644 --- a/src/components/_sila/AppNavigation/AppNavigation.vue +++ b/src/components/_sila/AppNavigation/AppNavigation.vue @@ -11,7 +11,6 @@ :to="navItem.route" :data-test-id="`nav-item-${navItem.id}`" > - <component :is="navItem.icon" /> {{ navItem.label }} </b-nav-item> @@ -22,7 +21,6 @@ variant="link" :data-test-id="`nav-button-${navItem.id}`" > - <component :is="navItem.icon" /> {{ navItem.label }} <icon-expand class="icon-expand" /> </b-button> @@ -211,6 +209,7 @@ svg { left: 0; z-index: $zindex-fixed; overflow-y: auto; + background-color: $white; transform: translateX(-$navigation-width); transition: transform $exit-easing--productive $duration--moderate-02; border-right: 1px solid theme-color-level('light', 2.85); diff --git a/src/env/assets/styles/_sila.scss b/src/env/assets/styles/_sila.scss index 0b234461..e54fcb58 100644 --- a/src/env/assets/styles/_sila.scss +++ b/src/env/assets/styles/_sila.scss @@ -79,12 +79,12 @@ $surface-secondary: #F3F4F5; $on-surface-secondary: #040a0f99; $on-surface-tretiatry: #040A0F4D; -$text-primary: #0C1C29; -$text-secondary: #0C1C29E5; -$text-tretiatry: #0c1c2999; -$text-quaternary: #0c1c294d; +$text-primary: rgb(12, 28, 41); +$text-secondary: rgba(12, 28, 41, 0.8); +$text-tretiatry: rgba(12, 28, 41, 0.6); +$text-quaternary: rgba(12, 28, 41, 0.3); -$login-page-description-color: #0c1c2999; +$login-page-description-color: rgba(12, 28, 41, 0.6); $border-radius: 8px; diff --git a/src/env/components/AppNavigation/sila.js b/src/env/components/AppNavigation/sila.js index 09093d6b..4056a0d0 100644 --- a/src/env/components/AppNavigation/sila.js +++ b/src/env/components/AppNavigation/sila.js @@ -1,32 +1,10 @@ -import IconDashboard from '@carbon/icons-vue/es/dashboard/16'; -import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16'; -import IconDataCheck from '@carbon/icons-vue/es/data--check/16'; -import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; -import IconSettings from '@carbon/icons-vue/es/settings/16'; -import IconSecurity from '@carbon/icons-vue/es/security/16'; -import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; -import IconDataBase from '@carbon/icons-vue/es/data--base--alt/16'; -import IconChip from '@carbon/icons-vue/es/chip/16'; - const AppNavigationMixin = { - components: { - iconOverview: IconDashboard, - iconLogs: IconTextLinkAnalysis, - iconHealth: IconDataCheck, - iconControl: IconSettingsAdjust, - iconSettings: IconSettings, - iconSecurityAndAccess: IconSecurity, - iconExpand: IconChevronUp, - iconResourceManagement: IconDataBase, - iconChip: IconChip, - }, data() { return { navigationItems: [ { id: 'overview', label: this.$t('appNavigation.system'), - icon: 'iconOverview', children: [ { id: 'overview', @@ -53,7 +31,6 @@ const AppNavigationMixin = { { id: 'logs', label: this.$t('appNavigation.logs'), - icon: 'iconLogs', children: [ { id: 'event-logs', @@ -70,7 +47,6 @@ const AppNavigationMixin = { { id: 'hardware-status', label: this.$t('appNavigation.hardwareStatus'), - icon: 'iconHealth', children: [ { id: 'sensors', @@ -93,7 +69,6 @@ const AppNavigationMixin = { { id: 'operations', label: this.$t('appNavigation.operations'), - icon: 'iconControl', children: [ { id: 'factory-reset', @@ -140,7 +115,6 @@ const AppNavigationMixin = { { id: 'processors', label: this.$t('appNavigation.processors'), - icon: 'iconChip', children: [ { id: 'processors/dynamic', @@ -152,7 +126,6 @@ const AppNavigationMixin = { { id: 'settings', label: this.$t('appNavigation.settings'), - icon: 'iconSettings', children: [ { id: 'power-restore-policy', @@ -164,7 +137,6 @@ const AppNavigationMixin = { { id: 'security-and-access', label: this.$t('appNavigation.securityAndAccess'), - icon: 'iconSecurityAndAccess', children: [ { id: 'sessions', @@ -196,7 +168,6 @@ const AppNavigationMixin = { { id: 'resource-management', label: this.$t('appNavigation.resourceManagement'), - icon: 'iconResourceManagement', children: [ { id: 'power', diff --git a/src/views/_sila/Fans/Static/FansStaticPage.vue b/src/views/_sila/Fans/Static/FansStaticPage.vue index 810aeb4b..311ea8fe 100644 --- a/src/views/_sila/Fans/Static/FansStaticPage.vue +++ b/src/views/_sila/Fans/Static/FansStaticPage.vue @@ -10,7 +10,7 @@ :fields="fields" :empty-text="$t('global.table.emptyMessage')" > - <template #cell(status)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> |