diff --git a/app/assets/sass/_variables.scss b/app/assets/sass/_variables.scss index 3392ceb..cbb5b21 100644 --- a/app/assets/sass/_variables.scss +++ b/app/assets/sass/_variables.scss @@ -8,12 +8,12 @@ $image-path: #{$base-path}/img; // ---------------------------------- // Colors // ---------------------------------- -$gray-lightest: #f9f9f9; -$gray-light: #dcdcdc; -$gray-dark: #444; -$gray-darker: #202020; -$black: #000; -$white: #fff; + +// TODO: Remove +$gray-lightest: $gray-100; +$gray-light: $gray-300; +$gray-dark: $gray-700; +$gray-darker: $gray-900; // Text $text-color: #333; @@ -25,37 +25,26 @@ $foreground-color: $white; $hover-color: $gray-lightest; $border-color: $gray-light; -// Brand -$brand-color: #03a9f4; -$brand-info: hsl(210, 70%, 50%); $google-color: #db4437; $github-color: #4183c4; $gitlab-color: #548; $linkedin-color: #0077B5; // ---------------------------------- -// Font +// Typography // ---------------------------------- - -$font-size-navigation: 20px; +$font-size-navigation: $navbar-brand-font-size; $font-size-large: 20px; $font-size-small: 14px; -$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; -$font-family-serif: Georgia, "Times New Roman", Times, serif; -//** Default monospace fonts for ``, ``, and `
`.
-$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
-$font-family-base:        $font-family-sans-serif;
-
 // ----------------------------------
 //   Layout
 // ----------------------------------
+
 $header-text-shadow:					1px 3px 4px rgba(0, 0, 0, 0.45);
 
 // navigation
-$navbar-breakpoint-min:                 $screen-md-min;
-
 $navbar-height:                         60px;
 $navbar-link-vertical-spacing:          8px;
 $navbar-link-underline-height:          2px;
@@ -70,8 +59,10 @@ $navbar-link-hover-underline:   		$navbar-link-color;
 $navbar-link-active-color:      		$navbar-link-color;
 $navbar-link-active-underline:  		$navbar-link-color;
 
-$navbar-brand-color:            		$brand-color;
-$navbar-brand-hover-color:      		darken($brand-color, 15%);
+$navbar-brand-color:            		$primary;
+$navbar-brand-hover-color:      		darken($primary, 15%);
+
+$nav-link-hover-bg:         none;
 
 // User menu
 $usermenu-button-bg:                    $navbar-background;
@@ -100,17 +91,17 @@ $button-primary-color:         white;
 $button-primary-bg:            #5fbc49;
 
 $button-brand-color:           white;
-$button-brand-bg:              $brand-color;
+$button-brand-bg:              $primary;
 
 // State
 $button-info-color:            white;
-$button-info-bg:               $brand-info;
+$button-info-bg:               $info;
 $button-success-color:         white;
-$button-success-bg:            $brand-success;
+$button-success-bg:            $success;
 $button-warning-color:         white;
-$button-warning-bg:            $brand-warning;
+$button-warning-bg:            $warning;
 $button-danger-color:          white;
-$button-danger-bg:             $brand-danger;
+$button-danger-bg:             $danger;
 
 // Company.
 
@@ -137,7 +128,7 @@ $list-group-item-background:        transparent;
 $list-group-item-border-color:      $gray-light;
 
 $list-group-hover-background:       $gray-lightest;
-$list-group-item-active-background: $brand-color;
+$list-group-item-active-background: $primary;
 
 // ----------------------------------
 //   List group
@@ -186,8 +177,8 @@ $pagination-border:         $border-color;
 $pagination-hover:          $hover-color;
 
 $pagination-active-color:   $white;
-$pagination-active-bg:      $brand-color;
-$pagination-active-border:  darken($brand-color, 5%);
+$pagination-active-bg:      $primary;
+$pagination-active-border:  darken($primary, 5%);
 
 // ----------------------------------
 //   Section
@@ -219,4 +210,4 @@ $callback-list-arrow-color:         $callback-list-border-color;
 // ----------------------------------
 
 $request-item-secondary-color:      $text-secondary-color;
-$request-detail-background:         lighten($brand-color, 45%);
+$request-detail-background:         lighten($primary, 45%);