transfer variables to _override-bootstrap-varivables.scss from _variables-bootstrap.scss

src/client/styles/scss/_override-bootstrap-variables.scss

@@ -4,6 +4,14 @@
 
 //== Colors
 //
+$primary: #112744;
+$secondary: #6c757d;
+$info: #0d8ea5;
+$success: #00bb83;
+$warning: #ee773b;
+$danger: #ff0a54;
+$light: #dee2e6;
+$dark: #343a40;
 //## Gray and brand colors for use across Bootstrap.
 $gray-base:              #000 !default;
 $gray-darker:            lighten($gray-base, 13.5%); // #222
@@ -26,10 +34,11 @@ $brand-danger:          $danger;
 //## Font, line-height, and color for body text, headings, and more.
 $font-family-sans-serif:  Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
-$font-family-monospace:   SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace;
+$font-family-monospace: Osaka-Mono, 'MS Gothic', Monaco, Menlo, Consolas, 'Courier New', monospace;
 $font-family-base:        $font-family-sans-serif;
 
-
+$font-size-root: 14px;
+$line-height-base: 1.42857;
 
 //== Components
 //
@@ -44,13 +53,43 @@ $border-radius-small: 0;
 //## For each of Bootstrap's buttons, define text, background and border color.
 
 $btn-default-bg: $btn-default-bgcolor;
+$btn-border-radius: 0;
+$btn-border-radius-lg: 0;
+$btn-border-radius-sm: 0;
 
 
 
 //== Forms
 //
-//##
+$input-border-radius: 0;
+$input-border-radius-lg: 0;
+$input-border-radius-sm: 0;
+
+//== Navs
+
+$nav-link-padding-y: 0.75rem;
+$nav-link-padding-x: 1rem;
+$nav-tabs-border-radius: 0;
+
+//== Navbar
+$navbar-padding-y: 0;
+$navbar-brand-padding-y: 0;
+$navbar-nav-link-padding-x: 1rem;
+
+//== Dropdowns
+$dropdown-border-radius: 0;
+
+//== card
+$card-border-radius: 0;
+
+//== Modals
+$modal-content-border-width: 0;
+$modal-content-border-radius: 0;
+$modal-header-padding-y: 0.75rem;
+$modal-header-padding-x: 1rem;
 
+//== Alerts
+$alert-border-radius: 0;
 //** `<input>` background color
 $input-bg:                       $bodycolor;
 //** `<input disabled>` background color
@@ -58,6 +97,3 @@ $input-bg-disabled:              $btn-default-bgcolor;
 
 //** `<input>` border color
 $input-border:                   $border;
-
-//== card
-$card-border-radius: 0;

src/client/styles/scss/_variables-bootstrap.scss

@@ -1,74 +0,0 @@
-//
-// Variables
-// --------------------------------------------------
-
-//== Colors
-//
-$primary: #112744;
-$secondary: #6c757d;
-$info: #0d8ea5;
-$success: #00bb83;
-$warning: #ee773b;
-$danger: #ff0a54;
-$light: #dee2e6;
-$dark: #343a40;
-
-//== Typography
-//
-//## Font, line-height, and color for body text, headings, and more.
-$font-family-sans-serif: Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
-$font-family-serif: Georgia, 'Times New Roman', Times, serif;
-$font-family-monospace: Osaka-Mono, 'MS Gothic', Monaco, Menlo, Consolas, 'Courier New', monospace;
-$font-family-base: $font-family-sans-serif;
-
-$font-size-root: 14px;
-$line-height-base: 1.42857;
-
-//== Components
-//
-//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-$border-radius-base: 0;
-$border-radius-large: 0;
-$border-radius-small: 0;
-
-//== Buttons
-//
-//## For each of Bootstrap's buttons, define text, background and border color.
-
-$btn-border-radius: 0;
-$btn-border-radius-lg: 0;
-$btn-border-radius-sm: 0;
-
-//== Forms
-
-$input-border-radius: 0;
-$input-border-radius-lg: 0;
-$input-border-radius-sm: 0;
-
-//== Navs
-
-$nav-link-padding-y: 0.75rem;
-$nav-link-padding-x: 1rem;
-$nav-tabs-border-radius: 0;
-
-//== Navbar
-$navbar-padding-y: 0;
-$navbar-brand-padding-y: 0;
-$navbar-nav-link-padding-x: 1rem;
-
-//== Dropdowns
-$dropdown-border-radius: 0;
-
-//== Modals
-$modal-content-border-width: 0;
-$modal-content-border-radius: 0;
-$modal-header-padding-y: 0.75rem;
-$modal-header-padding-x: 1rem;
-
-//== Alerts
-$alert-border-radius: 0;
-
-//== Navbar(inherit variables of bootstrap3)
-$navbar-default-color: #777;
-$navbar-default-bg: #f8f8f8;
-$navbar-default-border: darken($navbar-default-bg, 6.5%);