diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss index b20e3c3c4..fa1562f1d 100644 --- a/src/core/components/tabs/tabs.scss +++ b/src/core/components/tabs/tabs.scss @@ -1,7 +1,9 @@ +@import "~theme/globals"; + :host { --tabs-background: var(--core-tabs-background); --tabs-color: var(--core-tab-color); - --height: 56px; + --height: #{$core-tabs-height}; height: 100%; display: flex; flex-direction: column; @@ -54,6 +56,9 @@ border-bottom-color: var(--border-color-active); ion-tab-button { color: var(--color-active); + ion-label { + font-weight: var(--font-weight-active); + } } } } diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss index d814156b1..48bde4dd0 100644 --- a/src/core/features/mainmenu/pages/menu/menu.scss +++ b/src/core/features/mainmenu/pages/menu/menu.scss @@ -1,9 +1,10 @@ @import "~theme/globals"; :host{ - --menutabbar-size: 60px; + --menutabbar-size: #{$bottom-tabs-size}; ion-tab-bar { + height: var(--menutabbar-size); box-shadow: 0px -3px 3px rgba(var(--drop-shadow)); } diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss index 61be4373e..e721effad 100644 --- a/src/theme/globals.variables.scss +++ b/src/theme/globals.variables.scss @@ -293,6 +293,7 @@ $bottom-tabs-badge-color: $primary !default; $bottom-tabs-badge-text-color: get_contrast_color($bottom-tabs-badge-color) !default; $bottom-tabs-badge-color-dark: $primary !default; $bottom-tabs-badge-text-color-dark: get_contrast_color($bottom-tabs-badge-color-dark) !default; +$bottom-tabs-size: 56px !default; $core-text-hightlight-background-color: lighten($blue, 40%) !default; @@ -300,8 +301,10 @@ $core-tabs-background: $white !default; $core-tab-background: $core-tabs-background !default; $core-tab-color: $gray-dark !default; $core-tab-color-active: $dark !default; +$core-tab-font-weight-active: normal !default; $core-tab-border-color: $gray !default; $core-tab-border-color-active: $primary !default; +$core-tabs-height: 56px !default; $core-tabs-background-dark: $shade-75 !default; $core-tab-background-dark: $core-tabs-background-dark !default; @@ -388,7 +391,7 @@ $addon-forum-highlight-color: $gray-lighter !default; $addon-forum-border-color-dark: $gray-dark !default; $addon-forum-highlight-color-dark: $gray-darker !default; -$core-more-icon: null !default; +$core-more-icon-color: null !default; $core-more-item-border: null !default; $core-fixed-url: false !default; $core-dashboard-logo: false !default; diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss index 2bed42ebd..accf9e936 100644 --- a/src/theme/theme.light.scss +++ b/src/theme/theme.light.scss @@ -161,6 +161,7 @@ --core-tab-border-color: #{$core-tab-border-color}; --core-tab-color-active: #{$core-tab-color-active}; --core-tab-border-color-active: #{$core-tab-border-color-active}; + --core-tab-font-weight-active: #{$core-tab-font-weight-active}; core-tabs, core-tabs-outlet { ion-slide { @@ -169,6 +170,7 @@ --border-color: var(--core-tab-border-color); --color-active: var(--core-tab-color-active); --border-color-active: var(--core-tab-border-color-active); + --font-weight-active: var(--core-tab-font-weight-active); } } @@ -288,8 +290,8 @@ --core-dd-question-radius: 10px; --core-dd-question-border: var(--gray-darker); - @if ($core-more-icon) { - --core-more-icon: #{$core-more-icon}; + @if ($core-more-icon-color) { + --core-more-icon: #{$core-more-icon-color}; } @if ($core-more-item-border) {