Merge pull request #1175 from prymitive/fix-scss-imports

fix(ui): avoid duplicating bootstrap styles
prymitive · Nov 21, 2019 · f9ac056 · f9ac056
2 parents a86a501 + aab5b29
commit f9ac056
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 45 deletions.
diff --git a/ui/src/App.scss b/ui/src/App.scss
@@ -1,40 +1,8 @@
 // bundled font assets, so we don't need to talk to Google Fonts API
 @import "src/Fonts.scss";
 
-$lead-font-weight: 400;
+@import "Theme.scss";
 
-// custom "dark" color, little less dark than flatly
-$blue: #455a64;
-// body background color should be same as navbar, so it blends into one
-$body-bg: $blue;
-// default is ~0.97rem
-$font-size-base: 1rem;
-
-// make links light gray by default instead of green
-$link-color: #7b8a8b; // $gray-700
-
-// make dark darker, default it's $gray-700
-$dark: #3b4247;
-
-// fix active tab color, for some reason it ends up with $primary as bg color
-$nav-tabs-link-active-bg: #fff;
-
-// pagination tweaks
-$pagination-color: #fff;
-$pagination-bg: #b4bcc2; // gray-500
-$pagination-hover-color: #fff;
-$pagination-hover-bg: #7b8a8b; // gray-700
-$pagination-active-bg: $pagination-hover-bg;
-$pagination-disabled-color: #fff;
-$pagination-disabled-bg: #dee2e6; // gray-300
-
-$enable-shadows: true;
-
-$btn-box-shadow: 0;
-$btn-focus-box-shadow: 0;
-$btn-active-box-shadow: 0;
-
-@import "~bootswatch/dist/flatly/variables";
 @import "~bootstrap/scss/bootstrap";
 @import "~bootswatch/dist/flatly/bootswatch";
 

diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/index.scss b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .components-grid-alertgrid-alertgroup-alert {
   &:hover {

diff --git a/ui/src/Components/Labels/BaseLabel/index.scss b/ui/src/Components/Labels/BaseLabel/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .components-label-with-hover:hover {
   filter: brightness(0.85);

diff --git a/ui/src/Components/Labels/FilterInputLabel/index.scss b/ui/src/Components/Labels/FilterInputLabel/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .components-filteredinputlabel-text {
   font-size: 1rem;
@@ -62,7 +62,7 @@ button.components-label.btn {
     background-color: $light;
   }
   &.btn-dark:hover {
-    // same as in App.scss
+    // same as in Theme.scss
     background-color: #3b4247;
   }
 }
diff --git a/ui/src/Components/Labels/LabelWithPercent/index.scss b/ui/src/Components/Labels/LabelWithPercent/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .components-labelWithPercent-percent {
   padding-top: 0.25rem;

diff --git a/ui/src/Components/MainModal/Configuration/InputRange.scss b/ui/src/Components/MainModal/Configuration/InputRange.scss
@@ -1,5 +1,5 @@
 // customize colors and fonts using bootstrap variables
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 $input-range-font-family: $font-family-sans-serif;
 $input-range-primary-color: $primary;

diff --git a/ui/src/Components/ManagedSilence/index.scss b/ui/src/Components/ManagedSilence/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .components-managed-silence {
   .card,

diff --git a/ui/src/Components/Modal/index.scss b/ui/src/Components/Modal/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .components-tab-inactive {
   &:hover {

diff --git a/ui/src/Components/NavBar/index.scss b/ui/src/Components/NavBar/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .navbar-brand {
   min-width: 2.5rem;

diff --git a/ui/src/Components/OverviewModal/index.scss b/ui/src/Components/OverviewModal/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 .navbar-brand {
   &:hover,

diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/index.scss b/ui/src/Components/SilenceModal/DateTimeSelect/index.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 $datepicker__background-color: $white;
 $datepicker__border-color: $gray-300;

diff --git a/ui/src/DarkTheme.scss b/ui/src/DarkTheme.scss
@@ -1,4 +1,4 @@
-@import "src/App.scss";
+@import "src/Theme.scss";
 
 $alertgroup-body-bg: #5a6e7b;
 $alertgroup-header-bg: #515658;

diff --git a/ui/src/Theme.scss b/ui/src/Theme.scss
@@ -0,0 +1,37 @@
+$lead-font-weight: 400;
+
+// custom "dark" color, little less dark than flatly
+$blue: #455a64;
+// body background color should be same as navbar, so it blends into one
+$body-bg: $blue;
+// default is ~0.97rem
+$font-size-base: 1rem;
+
+// make links light gray by default instead of green
+$link-color: #7b8a8b; // $gray-700
+
+// make dark darker, default it's $gray-700
+$dark: #3b4247;
+
+// fix active tab color, for some reason it ends up with $primary as bg color
+$nav-tabs-link-active-bg: #fff;
+
+// pagination tweaks
+$pagination-color: #fff;
+$pagination-bg: #b4bcc2; // gray-500
+$pagination-hover-color: #fff;
+$pagination-hover-bg: #7b8a8b; // gray-700
+$pagination-active-bg: $pagination-hover-bg;
+$pagination-disabled-color: #fff;
+$pagination-disabled-bg: #dee2e6; // gray-300
+
+$enable-shadows: true;
+
+$btn-box-shadow: 0;
+$btn-focus-box-shadow: 0;
+$btn-active-box-shadow: 0;
+
+@import "~bootswatch/dist/flatly/variables";
+@import "~bootstrap/scss/functions";
+@import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/mixins";