mirror of
https://github.com/prymitive/karma
synced 2026-05-07 03:26:52 +00:00
fix(ui): cleanup scss variable imports
All scss imports needs to use App.scss, otherwise some overrides won't be present, like font swap Lato -> Open Sans
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// bundled font assets, so we don't need to talk to Google Fonts API
|
||||
@import "./Fonts.scss";
|
||||
@import "src/Fonts.scss";
|
||||
|
||||
// custom "dark" color, little less dark than flatly
|
||||
$blue: #455a64;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@import "~bootswatch/dist/flatly/variables";
|
||||
@import "src/App.scss";
|
||||
|
||||
.components-label-with-hover:hover {
|
||||
filter: brightness(0.85);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@import "~bootswatch/dist/flatly/variables";
|
||||
@import "src/App.scss";
|
||||
|
||||
.components-filteredinputlabel-text {
|
||||
font-size: 1rem;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@import "~bootswatch/dist/flatly/variables";
|
||||
@import "src/App.scss";
|
||||
|
||||
.components-labelWithPercent-percent {
|
||||
padding-top: 0.25rem;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// customize colors and fonts using bootstrap variables
|
||||
@import "~bootswatch/dist/flatly/variables";
|
||||
@import "src/App.scss";
|
||||
|
||||
$input-range-font-family: $font-family-sans-serif;
|
||||
$input-range-primary-color: $primary;
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
@import "~bootswatch/dist/flatly/variables";
|
||||
@import "~bootstrap/scss/bootstrap";
|
||||
@import "~bootswatch/dist/flatly/bootswatch";
|
||||
@import "src/App.scss";
|
||||
|
||||
.navbar-brand {
|
||||
min-width: 2.5rem;
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
@import "~bootswatch/dist/flatly/variables";
|
||||
@import "~bootstrap/scss/bootstrap";
|
||||
@import "~bootswatch/dist/flatly/bootswatch";
|
||||
@import "src/App.scss";
|
||||
|
||||
.navbar-brand {
|
||||
&:hover,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@import "~bootswatch/dist/flatly/variables";
|
||||
@import "src/App.scss";
|
||||
|
||||
$datepicker__background-color: $white;
|
||||
$datepicker__border-color: $gray-300;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// this is used by bootswatch to import the font, we bundle all fonts so there
|
||||
// is nothing to import, so let's point it at an empty file
|
||||
// is nothing to import
|
||||
// https://github.com/thomaspark/bootswatch/issues/55
|
||||
$web-font-path: "./empty.css";
|
||||
$web-font-path: "data:text/css;base64,";
|
||||
|
||||
// Default for Bootstrap is 700 and it's a bit too thick for Open Sans
|
||||
$font-weight-bold: 600;
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
/* Empty css file to be included by bootswatch, see Fonts.scss */
|
||||
Reference in New Issue
Block a user