From ff5f1d80382a8d1d7e42ebdae74529aab80cbac9 Mon Sep 17 00:00:00 2001 From: Bill Date: Thu, 30 Sep 2021 00:37:21 -0400 Subject: [PATCH] Style updates --- src/App.scss | 3 +++ src/assets/styles/bootstrap/_variables.scss | 10 +++++----- src/index.scss | 2 -- src/layout/card/NitroCardView.scss | 12 ++++++------ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/App.scss b/src/App.scss index 599692e8..9ae7fa7c 100644 --- a/src/App.scss +++ b/src/App.scss @@ -32,6 +32,9 @@ $inventory-height: 320px; $navigator-width: 400px; $navigator-height: 420px; +$chat-input-style-selector-widget-width: 200px; +$chat-input-style-selector-widget-height: 200px; + .nitro-app { width: 100%; height: 100%; diff --git a/src/assets/styles/bootstrap/_variables.scss b/src/assets/styles/bootstrap/_variables.scss index feb71255..374a9abb 100644 --- a/src/assets/styles/bootstrap/_variables.scss +++ b/src/assets/styles/bootstrap/_variables.scss @@ -610,7 +610,7 @@ $aspect-ratios: ( // scss-docs-start font-variables // stylelint-disable value-keyword-case -$font-family-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; +$font-family-sans-serif: GameUbuntu, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; // stylelint-enable value-keyword-case $font-family-base: var(--#{$variable-prefix}font-sans-serif) !default; @@ -1381,15 +1381,15 @@ $form-feedback-tooltip-border-radius: $tooltip-border-radius !default; // scss-docs-start popover-variables $popover-font-size: $font-size-sm !default; -$popover-bg: $white !default; +$popover-bg: $light !default; $popover-max-width: 276px !default; $popover-border-width: $border-width !default; -$popover-border-color: rgba($black, .2) !default; -$popover-border-radius: $border-radius-lg !default; +$popover-border-color: $border-color !default; +$popover-border-radius: $border-radius !default; $popover-inner-border-radius: subtract($popover-border-radius, $popover-border-width) !default; $popover-box-shadow: $box-shadow !default; -$popover-header-bg: shade-color($popover-bg, 6%) !default; +$popover-header-bg: $primary !default; $popover-header-color: $headings-color !default; $popover-header-padding-y: .5rem !default; $popover-header-padding-x: $spacer !default; diff --git a/src/index.scss b/src/index.scss index d3842a6a..d5baf038 100644 --- a/src/index.scss +++ b/src/index.scss @@ -3,8 +3,6 @@ html, body { - font-family: GameUbuntu, sans-serif; - margin: 0; padding: 0; width: 100%; height: 100%; diff --git a/src/layout/card/NitroCardView.scss b/src/layout/card/NitroCardView.scss index 7e82a515..9f11cdef 100644 --- a/src/layout/card/NitroCardView.scss +++ b/src/layout/card/NitroCardView.scss @@ -4,12 +4,6 @@ $nitro-card-tabs-height: 33px; .nitro-card { pointer-events: all; resize: both; - - @import './accordion/NitroCardAccordionView'; - @import './content/NitroCardContentView'; - @import './grid/NitroCardGridView'; - @import './header/NitroCardHeaderView'; - @import './tabs/NitroCardTabsView'; } .nitro-card-responsive { @@ -46,3 +40,9 @@ $nitro-card-tabs-height: 33px; } } } + +@import './accordion/NitroCardAccordionView'; +@import './content/NitroCardContentView'; +@import './grid/NitroCardGridView'; +@import './header/NitroCardHeaderView'; +@import './tabs/NitroCardTabsView';