organize colors

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

@@ -6,11 +6,11 @@
 //
 
 $theme-colors: (
-  'primary': #337ab7,
-  'success': #00bb83,
-  'info': #0d8ea5,
-  'warning': #ee773b,
-  'danger': #ff0a54
+  'primary': $grw-primary,
+  'success': $grw-success,
+  'info': $grw-info,
+  'warning': $grw-warning,
+  'danger': $grw-danger
 );
 
 //== Typography

src/client/styles/scss/_variables.scss

@@ -1,3 +1,13 @@
+// GROWI Official Color
+$growi-green: #74bc46;
+$growi-blue: #175fa5;
+
+$grw-primary: #112744;
+$grw-info: #0d8ea5;
+$grw-success: #00bb83;
+$grw-warning: #ee773b;
+$grw-danger: #ff0a54;
+
 $font-family-monospace-not-strictly: Monaco, Menlo, Consolas, 'Courier New', MeiryoKe_Gothic, monospace;
 
 // Layout

src/client/styles/scss/theme/_apply-colors.scss

@@ -26,14 +26,10 @@ body {
   }
 }
 
-.navbar.bg-dark {
+.grw-navbar {
   background: $bgcolor-navbar;
 }
 
-.navbar.navbar-dark .nav-link {
-  color: white;
-}
-
 .grw-title-bar {
   background: darken($bgcolor-global, 2%);
 }

src/client/styles/scss/theme/_variables.scss

@@ -1,3 +0,0 @@
-// GROWI Official Color
-$growi-green: #74bc46;
-$growi-blue: #175fa5;

src/client/styles/scss/theme/default.scss

@@ -1,5 +1,4 @@
-@import 'variables';
-@import '../override-bootstrap';
+@import '../variables';
 
 $bgcolor-global: white;
 $bgcolor-theme: #112744;
@@ -10,12 +9,15 @@ $color-header: #2b2b2b;
 $color-link: lighten($bgcolor-theme, 20%);
 $color-link-hover: lighten($color-link, 20%);
 
-$primary: $bgcolor-theme;
-
 $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
 $color-link-wiki: lighten($bgcolor-theme, 20%);
 $color-link-wiki-hover: lighten($color-link-wiki, 20%);
 
+$theme-colors: (
+  'primary': $bgcolor-theme
+);
+
 @import 'variables-default';
+
 @import 'apply-colors';
 @import 'apply-colors-light';

src/server/views/layout/layout.html

@@ -75,7 +75,7 @@
 <div id="wrapper">
   <!-- Navigation -->
   {% block layout_head_nav %}
-  <nav class="navbar grw-navbar navbar-expand-lg navbar-dark bg-dark mb-0 p-0">
+  <nav class="navbar grw-navbar navbar-expand-lg navbar-dark mb-0 p-0">
     <!-- 1 GROWI logo -->
     <div class="navbar-brand">
       <a class="logo d-block" href="/">