Merge pull request #1039 from lvuch/lacssoify

nav tabs
This commit is contained in:
Vincent Fiduccia 2017-02-21 12:12:23 -07:00 committed by GitHub
commit f87d83691f
20 changed files with 173 additions and 289 deletions

View File

@ -1,18 +1,15 @@
<section class="header clearfix">
<section class="header has-tabs clearfix">
<h1>{{t 'processesPage.header'}}</h1>
<ul class="lacsso tab-nav">
<li class="lacsso">{{#link-to 'admin-tab.processes.index' replace=true class="lacsso"}}{{t 'processesPage.tab.summary'}}{{/link-to}}</li>
<li class="lacsso hide">{{#link-to 'admin-tab.processes.pools' replace=true class="lacsso"}}{{t 'processesPage.tab.pools'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="running") replace=true class="lacsso"}}{{t 'processesPage.tab.running'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="ready") replace=true class="lacsso"}}{{t 'processesPage.tab.ready'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="delayed") replace=true class="lacsso"}}{{t 'processesPage.tab.delayed'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="completed") replace=true class="lacsso"}}{{t 'processesPage.tab.completed'}}{{/link-to}}</li>
</ul>
</section>
<section class="processes">
<div class="lacsso tabs">
<ul class="lacsso tab-header">
<li class="lacsso">{{#link-to 'admin-tab.processes.index' replace=true class="lacsso"}}{{t 'processesPage.tab.summary'}}{{/link-to}}</li>
<li class="lacsso hide">{{#link-to 'admin-tab.processes.pools' replace=true class="lacsso"}}{{t 'processesPage.tab.pools'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="running") replace=true class="lacsso"}}{{t 'processesPage.tab.running'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="ready") replace=true class="lacsso"}}{{t 'processesPage.tab.ready'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="delayed") replace=true class="lacsso"}}{{t 'processesPage.tab.delayed'}}{{/link-to}}</li>
<li class="lacsso">{{#link-to 'admin-tab.processes.list' (query-params which="completed") replace=true class="lacsso"}}{{t 'processesPage.tab.completed'}}{{/link-to}}</li>
</ul>
<div class="lacsso tab-content">
{{outlet}}
</div>
</div>
</section>
<div class="lacsso tab-content">
{{outlet}}
</div>

View File

@ -5,7 +5,7 @@ export default Ember.Component.extend({
prefs : Ember.inject.service(),
userTheme : Ember.inject.service('user-theme'),
classNames : ['btn-group', 'btn-group-sm'],
classNames : ['btn-group-sm', 'text-center'],
theme: Ember.computed(`prefs.${C.PREFS.THEME}`, function() {
return this.get(`prefs.${C.PREFS.THEME}`);

View File

@ -1,5 +1,5 @@
<button class="btn bg-default {{if (eq theme 'ui-light') 'active' ''}}" {{action 'changeTheme' 'ui-light'}} role="button">{{t 'nav.user.themeLight'}}</button>
<button class="btn bg-secondary p-5 {{if (eq theme 'ui-light') 'active' ''}}" {{action 'changeTheme' 'ui-light'}} role="button">{{t 'nav.user.themeLight'}}</button>
<button class="btn bg-default {{if (eq theme 'ui-auto') 'active' ''}}" {{action 'changeTheme' 'ui-auto'}} role="button"><i class="icon icon-history"></i> {{t 'nav.user.themeAuto'}}</button>
<button class="btn bg-secondary p-5 {{if (eq theme 'ui-auto') 'active' ''}}" {{action 'changeTheme' 'ui-auto'}} role="button"><i class="icon icon-history"></i> {{t 'nav.user.themeAuto'}}</button>
<button class="btn bg-default {{if (eq theme 'ui-dark') 'active' ''}}" {{action 'changeTheme' 'ui-dark'}} role="button">{{t 'nav.user.themeDark'}}</button>
<button class="btn bg-secondary p-5 {{if (eq theme 'ui-dark') 'active' ''}}" {{action 'changeTheme' 'ui-dark'}} role="button">{{t 'nav.user.themeDark'}}</button>

View File

@ -4,7 +4,7 @@ import C from 'ui/utils/constants';
export default Ember.Component.extend(Tooltip, {
prefs: Ember.inject.service(),
// classNames: ['tooltip-warning-container'],
classNames: ['tooltip-warning-container'],
actions: {
hideAccessWarning: function() {
this.set(`prefs.${C.PREFS.ACCESS_WARNING}`, false);

View File

@ -17,7 +17,7 @@
<section class="instances r-pt5 r-pb5">
{{#sortable-table
classNames="lacsso grid sortable-table"
classNames="grid sortable-table"
sorts=sorts
body=model
sortBy=sortBy

View File

@ -31,44 +31,9 @@
color: $error;
}
*[class*=" bg-"] a {
color: white;
position: relative;
overflow: hidden;
display: inline-block;
border-bottom: solid 2px white;
vertical-align: middle;
padding: 4px 4px 2px 4px;
&:before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(255, 255, 255, .2);
-webkit-transition: -webkit-transform 400ms;
-moz-transition: -moz-transform 400ms;
transition: transform 400ms;
-webkit-transform: translateX(-100%);
}
&:hover {
text-decoration: none;
background-color: transparent;
&:before {
-webkit-transform: translateX(0%);
-moz-transform: translateX(0%);
transform: translateX(0%);
}
}
}
.bg-default {
@include bg-color($light-grey);
@include contrasted($light-grey);
@include bg-color($bg-default);
@include contrasted($bg-default);
a {
color: $primary;
@ -81,32 +46,32 @@
}
.bg-disabled {
background-color: rgba($mid-grey, .65);
background-color: $bg-disabled;
color: $mid-grey;
}
.bg-primary {
@include bg-color($primary);
@include bg-color($bg-primary);
@include contrasted($primary);
}
.bg-secondary {
@include bg-color($secondary);
@include bg-color($bg-secondary);
@include contrasted($secondary);
}
.bg-success {
@include bg-color($success);
@include bg-color($bg-success);
@include contrasted($success);
}
.bg-info {
@include bg-color($info);
@include bg-color($bg-info);
@include contrasted($info);
}
.bg-warning {
@include bg-color($warning);
@include bg-color($bg-warning);
@include contrasted($warning);
}
.bg-error {
@include bg-color($error);
@include bg-color($bg-error);
@include contrasted($error);
}
.bg-transparent {

View File

@ -15,7 +15,7 @@ h3,
h4,
h5,
h6 {
color: $header;
color: $header-text;
font-weight: normal;
}

View File

@ -29,48 +29,54 @@
}
&.bg-primary {
background: rgba($primary, .1);
background: $banner-primary;
border: solid 1px $primary;
color: $banner-color;
.banner-icon {
background-color: $primary;
}
}
&.bg-secondary {
background: rgba($secondary, .1);
background: $banner-secondary;
border: solid 1px $secondary;
color: $banner-color;
.banner-icon {
background-color: $secondary;
}
}
&.bg-success {
background: rgba($success, .1);
background: $banner-success;
border: solid 1px $success;
color: $banner-color;
.banner-icon {
background-color: $success;
}
}
&.bg-info {
background: rgba($info, .1);
background: $banner-info;
border: solid 1px $info;
color: $banner-color;
.banner-icon {
background-color: $info;
}
}
&.bg-warning {
background: rgba($warning, .1);
background: $banner-warning;
border: solid 1px $warning;
color: $banner-color;
.banner-icon {
background-color: $warning;
}
}
&.bg-error {
background: rgba($error, .1);
background: $banner-error;
border: solid 1px $error;
color: $banner-color;
.banner-icon {
background-color: $error;

View File

@ -110,7 +110,7 @@
font-size: .65em;
}
.btn-sm, .btn-group-sm > .btn {
.btn-sm, .btn-group-sm .btn {
padding: 5px 10px;
font-size: 0.87em;
}

View File

@ -27,7 +27,7 @@ form {
}
label {
color: $text-color;
color: $label-color;
}
input[type='checkbox'] {

View File

@ -1,5 +1,5 @@
.modal-overlay {
background-color: rgba($light-grey, 0.75);
background-color: $modal-overlay;
min-height: 100%;
min-width: 100%;
position: absolute;
@ -40,8 +40,8 @@
}
.modal-container {
background-color: white;
box-shadow: 0 0 15px rgba($mid-grey, 0.35);
background-color: $modal-content-bg;
box-shadow: 0 0 15px $shadow;
z-index: 15;
max-height: 0;
position: relative;

View File

@ -8,7 +8,7 @@
display: table;
.dropdown-menu {
background: $accent-one;
background: $dropdown-bg;
border: 0;
border-bottom: 3px solid rgba($accent-two, .5);
z-index: 4;

View File

@ -19,7 +19,7 @@ $subpod-detail : $table-bg-accent;
}
.pod {
background : $body-bg;
background : $pod-bg;
border : solid transparent;
position : relative;
padding : 5px;
@ -64,7 +64,7 @@ $subpod-detail : $table-bg-accent;
margin-top : 5px;
font-size : 12px;
color : #8a919c;
border-right : 1px solid $table-border-color;
border-right : 1px solid $pod-border-dark;
&:last-of-type {
border-right: 0;
@ -125,7 +125,7 @@ $subpod-detail : $table-bg-accent;
.subpod-header {
margin : -5px -5px 0 -5px;
background-color : $table-border-color;
background-color : $pod-border-dark;
background-color: mix($primary-dark, $table-bg-accent, 15%);
padding : 5px;
@ -162,8 +162,7 @@ $subpod-detail : $table-bg-accent;
display: block;
padding : 7px;
font-size : 12px;
background: $btn-default-bg;
color: $btn-default-color;
background: $bg-default;
border: none;
}
@ -203,7 +202,7 @@ $subpod-detail : $table-bg-accent;
.subpod {
position : relative;
min-height : 30px;
background-color : $table-bg;
background-color : $pod-bg;
border : 1px dotted $pod-border-dark;
margin-top : 5px;
@ -236,9 +235,9 @@ $subpod-detail : $table-bg-accent;
.subpod-children {
border : 1px solid $table-bg-accent;
border : 1px solid $subpod-detail;
border-bottom-left-radius : 5px;
background-color : $table-bg-accent;
background-color : $subpod-detail;
padding : 5px 5px 0 5px;
H6 {

View File

@ -1,6 +1,6 @@
.slider {
position: relative;
background: $mid-grey;
background: $accent-two;
border-radius: 5px;
cursor: pointer;
height: 7px;
@ -13,8 +13,8 @@
top: -4px;
margin-left: -10px;
border-radius: 50%;
background-color: $light-grey;
border: 1px solid $mid-grey;
background-color: $accent-one;
border: 1px solid $accent-two;
}
.slider-bar {
@ -29,19 +29,19 @@
cursor: not-allowed;
.slider-handle {
border-color: $mid-grey;
background-color: $light-grey;
border-color: $accent-two;
background-color: $accent-one;
}
.slider-bar {
background-color: $mid-grey;
background-color: $accent-two;
opacity: 0.6;
}
}
&.active {
.slider-handle {
background-color: $light-grey;
background-color: $accent-one;
}
}
}

View File

@ -46,7 +46,7 @@ table {
outline: none;
transition: all ease-in-out .3s;
&.fixed-header {
background: $link-color;
background: $table-header;
th .btn {
color: white;
}

View File

@ -39,4 +39,4 @@
border: 2px solid $tab-accent;
background-color: $tab-bg;
}
}
}

View File

@ -7,14 +7,11 @@ header {
.searchable {
position: relative;
.icon-search {
position: absolute;
top: 10px;
left: 10px;
}
.input-sm {
padding: 3px 0 3px 35px;
}
@ -23,20 +20,55 @@ header {
.header {
border-bottom: solid 2px $border;
padding: 15px 0;
margin-bottom: 20px;
h1 {
margin: 0;
display: inline-block;
vertical-align: middle;
}
& > * {
display : inline-block;
vertical-align : middle;
display: inline-block;
vertical-align: middle;
}
& h1 {
font-size : 21px;
margin-right : 10px;
font-size: 21px;
margin-right: 10px;
}
}
&.has-tabs {
padding: 0;
ul {
&.tab-nav {
padding: 0;
margin: 0;
position: relative;
top: 2px;
li {
list-style-type: none;
display: inline-block;
&:last-of-type {
margin-right: 0;
}
a {
display: block;
padding: 15px 10px;
text-decoration: none;
border-bottom: 0;
color: $text-muted;
&:hover {
color: mix($text-muted, $link-color, 70%);
border-bottom: solid 2px;
}
&.active {
border-bottom: solid 2px $link-color;
color: $link-color;
}
}
}
}
}
}
}

View File

@ -10,7 +10,7 @@ $singleCountWidth : 120px;
position: relative;
background-color: $table-bg;
border: solid 2px $table-border-color;
margin: 20px 0;
margin-bottom: 20px;
&.clear-section {
margin: 0px;

View File

@ -8,86 +8,73 @@ $primary : $primary; //button non state
$primary-dark : darken($primary, 20%);
//states
$success : rgba($success, .75); //good
$info : rgba($info, .75); //transitioning
$warning : rgba($warning, .75); // orange degraded
$error : rgba($error, .75); // stopped inactive bad
$success : desaturate($success, .75); //good
$info : desaturate($info, .75); //transitioning
$warning : desaturate($warning, .75); // orange degraded
$error : desaturate($error, .75); // stopped inactive bad
$bg-default : mix($mid-grey, $dark-grey);
$bg-disabled : desaturate($mid-grey, .65);
$bg-primary : desaturate($primary, 20%);
$bg-secondary : desaturate($secondary, 20%);
$bg-success : desaturate($success, 20%);
$bg-info : desaturate($info, 20%);
$bg-warning : desaturate($warning, 20%);
$bg-error : desaturate($error, 20%);
//** Global textual link color.
$link-color : lighten($primary, 12%);
$link-color : desaturate($primary, 1%);
//** Link hover color set via `darken()` function.
$link-hover-color : lighten($primary, 15%);
//** Link hover decoration.
$link-hover-decoration : none;
//accent colors
$accent-one : rgba($light-grey,.05);
$accent-one : $mid-grey;
$accent-two : $dark-grey;
$accent-three : darken($black, 20%);
/*header*/
$header : rgba($primary, .75);
$header : $bg-secondary;
$header-link : $light-grey;
$header-link-active : $primary;
$user-btn : darken($header, 5%);
$header-text : $mid-grey;
/*footer*/
$footer : darken($black, 20%);
// Horizontal line color.
$border : $mid-grey;
$border : $dark-grey;
/*shadow colors*/
$shadow : #000;
$shadow : rgba($black, .75);
//** Default background color used for all tables.
$table-bg : rgba($dark-grey, .7);
$table-header : $link-color;
//** Background color used for `.table-striped`.
$table-bg-accent : rgba($mid-grey, .1);
//** Background color used for `.table-hover`.
$table-bg-hover : rgba($warning, .85);
$table-bg-hover : rgba($info, .25);
$table-bg-active : $table-bg-hover;
//** Border color for table and cell borders.
$table-border-color : rgba(255,255,255,.15);
/*ButtonsFor each of Bootstrap's buttons, define text, background and border color.*/
$btn-default-color : $mid-grey;
$btn-default-bg : transparent;
$btn-default-border : $mid-grey;
$btn-default-hover : rgba($mid-grey,.3);
$btn-primary-color : $link-color ;
$btn-primary-bg : transparent;
$btn-primary-border : $primary;
$btn-primary-hover : rgba($link-color,.15);
$btn-success-color : $success;
$btn-success-bg : transparent;
$btn-success-border : $success;
$btn-success-hover : rgba($success,.15);
$btn-info-color : $info;
$btn-info-bg : transparent;
$btn-info-border : $info;
$btn-info-hover : rgba($info,.15);
$btn-warning-color : $warning;
$btn-warning-bg : transparent;
$btn-warning-border : $warning;
$btn-warning-hover : rgba($warning,.15);
$bg-danger-color : $error;
$bg-danger-bg : transparent;
$bg-danger-border : $error;
$bg-danger-hover : rgba($error,.15);
$btn-disabled-color : $text-color;
$btn-disabled-bg : $dark-grey;
$btn-link-disabled-color : $mid-grey;
$btn-disabled-hover : rgba($text-color,.3);
// banners
$banner-default : $light-grey;
$banner-disabled : rgba($mid-grey, .65);
$banner-primary : rgba($primary, .3);
$banner-secondary : rgba($secondary, .3);
$banner-success : rgba($success, .3);
$banner-info : rgba($info, .3);
$banner-warning : rgba($warning, .3);
$banner-error : rgba($error, .3);
$banner-color : white;
//** Global color for active items (e.g., navs or dropdowns).
@ -129,7 +116,7 @@ $input-group-addon-bg : $mid-grey;
//** Background for the dropdown menu.
$dropdown-bg : mix(rgba($mid-grey, .9), rgba($dark-grey, .95));
$dropdown-bg : $bg-default;
//** Dropdown menu `border-color`.
$dropdown-border : transparent;
@ -224,63 +211,27 @@ $tooltip-arrow-color : $tooltip-bg;
//** Background color of modal content area
$modal-content-bg : white;
$modal-content-bg : $dark-grey;
//** Modal content border color
$modal-content-border-color : transparent;
//** Modal content border color **for IE8**
$modal-content-fallback-border-color : #999;
//** Modal backdrop background color
$modal-backdrop-bg : #000;
//** Modal backdrop opacity
$modal-backdrop-opacity : .5;
$modal-overlay : rgba($black, 0.85);
//** Modal header border color
$modal-header-border-color : #e5e5e5;
//** Modal footer border color
$modal-footer-border-color : $modal-header-border-color;
/*Labels*/
//** Default label background color
$label-default-bg : #777;
//** Primary label background color
$label-primary-bg : $primary;
//** Success label background color
$label-success-bg : $success;
//** Info label background color
$label-info-bg : $info;
//** Warning label background color
$label-warning-bg : $warning;
//** Danger label background color
$label-danger-bg : $error;
//** Default label text color
$label-color : white;
//** Default text color of a linked label
$label-link-hover-color : white;
$label-color : lighten($mid-grey, 20%);
$header-link-text : #afb9c8;
$nav-link-hover-bg : $mid-grey;
/*alerts*/
$alert-success-bg : $state-success-bg;
$alert-success-text : $state-success-text;
$alert-success-border : $state-success-border;
$alert-info-bg : $state-info-bg;
$alert-info-text : $state-info-text;
$alert-info-border : $state-info-border;
$alert-warning-bg : $state-warning-bg;
$alert-warning-text : $state-warning-text;
$alert-warning-border : $state-warning-border;
$alert-danger-bg : $state-danger-bg;
$alert-danger-text : $state-danger-text;
$alert-danger-border : $state-danger-border;
/*Progress bars*/
//** Background color of the whole progress component
$progress-bg : $light-grey;
@ -308,17 +259,6 @@ $tab-hover : darken($primary, 5%);
$tab-color : $primary;
$tab-accent : $dark-grey;
/*badges*/
$badge-color : white;
//** Linked badge text color on hover
$badge-link-hover-color : white;
$badge-bg : $primary;
//** Badge text color in active nav link
$badge-active-color : $link-color;
//** Badge background color in active nav link
$badge-active-bg : white;
$close-color : white;
$close-text-shadow : 0 1px 0 white;

View File

@ -14,6 +14,15 @@ $info : $info; //transitioning
$warning : $warning; //orange degraded
$error : $error; //red stopped inactive bad
$bg-default : $light-grey;
$bg-disabled : rgba($mid-grey, .65);
$bg-primary : $primary;
$bg-secondary : $secondary;
$bg-success : $success;
$bg-info : $info;
$bg-warning : $warning;
$bg-error : $error;
// // Global textual link color.
$link-color : $link-color;
@ -34,15 +43,19 @@ $header-link : $light-grey;
$header-link-active : $primary;
$user-btn : darken($header, 10%);
$header-text : $secondary;
$footer : $light-grey;
// Horizontal line color.
$border : $light-grey;
$shadow : rgba($mid-grey,.25);
$shadow : rgba($mid-grey, 0.35);
// Default background color used for all tables.
$table-bg : rgba($light-grey, .5);
$table-header : $link-color;
// Background color used for `.table-striped`
$table-bg-accent : $light-grey;
// Background color used for `.table-hover`
@ -51,40 +64,16 @@ $table-bg-active : $table-bg-hover;
// Border color for table and cell borders
$table-border-color : rgba($mid-grey, .2);
$btn-default-color : $mid-grey;
$btn-default-bg : white;
$btn-default-border : $light-grey;
$btn-default-hover : $mid-grey;
$btn-primary-color : white;
$btn-primary-bg : $primary;
$btn-primary-border : $btn-primary-bg;
$btn-primary-hover : $primary-dark;
$btn-success-color : white;
$btn-success-bg : $success;
$btn-success-border : $btn-success-bg;
$btn-success-hover : rgba($success,.15);
$btn-info-color : white;
$btn-info-bg : $info;
$btn-info-border : $btn-info-bg;
$btn-info-hover : rgba($info,.15);
$btn-warning-color : white;
$btn-warning-bg : $warning;
$btn-warning-border : $btn-warning-bg;
$btn-warning-hover : rgba($warning,.15);
$bg-danger-color : white;
$bg-danger-bg : $error;
$bg-danger-border : $bg-danger-bg;
$bg-danger-hover : rgba($error,.15);
$btn-disabled-color : $mid-grey;
$btn-disabled-bg : $light-grey;
$btn-link-disabled-color : $mid-grey;
$btn-disabled-hover : $light-grey;
// banners
$banner-default : $light-grey;
$banner-disabled : rgba($mid-grey, .65);
$banner-primary : rgba($primary, .1);
$banner-secondary : rgba($secondary, .1);
$banner-success : rgba($success, .1);
$banner-info : rgba($info, .1);
$banner-warning : rgba($warning, .1);
$banner-error : rgba($error, .1);
$banner-color : dark;
// Global color for active items (e.g., navs or dropdowns).
@ -122,7 +111,7 @@ $legend-border-color : $light-grey;
$input-group-addon-bg : $light-grey;
// Background for the dropdown menu.
$dropdown-bg : white;
$dropdown-bg : $light-grey;
// Dropdown menu `border-color`.
$dropdown-border : $light-grey;
@ -213,55 +202,22 @@ $modal-content-border-color : transparent;
$modal-content-fallback-border-color : #999;
// Modal backdrop background color
$modal-backdrop-bg : #000;
// Modal backdrop opacity
$modal-backdrop-opacity : .5;
$modal-overlay : rgba($light-grey, 0.75);
// Modal header border color
$modal-header-border-color : #e5e5e5;
// Modal footer border color
$modal-footer-border-color : $modal-header-border-color;
// Labels
// Default label background color
$label-default-bg : #777;
// Primary label background color
$label-primary-bg : $primary;
// Success label background color
$label-success-bg : $success;
// Info label background color
$label-info-bg : $info;
// Warning label background color
$label-warning-bg : $warning;
// Danger label background color
$label-danger-bg : $error;
// // Default label text color
$label-color : $mid-grey;
// Default label text color
$label-color : white;
// Default text color of a linked label
$label-link-hover-color : white;
$header-link-text : #afb9c8;
$nav-link-hover-bg : $light-grey;
// Alerts
$alert-success-bg : $state-success-bg;
$alert-success-text : $state-success-text;
$alert-success-border : $state-success-border;
$alert-info-bg : $state-info-bg;
$alert-info-text : $state-info-text;
$alert-info-border : $state-info-border;
$alert-warning-bg : $state-warning-bg;
$alert-warning-text : $state-warning-text;
$alert-warning-border : $state-warning-border;
$alert-danger-bg : $state-danger-bg;
$alert-danger-text : $state-danger-text;
$alert-danger-border : $state-danger-border;
/*Progress bars*/
// Background color of the whole progress component
$progress-bg : $light-grey;
@ -289,17 +245,6 @@ $tab-hover : $dark-grey;
$tab-color : $mid-grey;
$tab-accent : $light-grey;
// Badges
$badge-color : white;
// Linked badge text color on hover
$badge-link-hover-color : white;
$badge-bg : $primary;
// Badge text color in active nav link
$badge-active-color : $link-color;
// Badge background color in active nav link
$badge-active-bg : white;
$close-color : white;
$close-text-shadow : 0 1px 0 white;