From e7790a59352eae24f8fee48d60356b1a6dcd443b Mon Sep 17 00:00:00 2001 From: fla Date: Mon, 24 Aug 2015 22:12:32 +0200 Subject: [PATCH] Override bootstrap list group default --- app/assets/stylesheets/_application.scss | 4 ++-- .../stylesheets/bootstrap-variables.scss | 21 +++++++++---------- app/assets/stylesheets/home.scss | 1 + app/assets/stylesheets/mobile/mobile.scss | 2 +- app/assets/stylesheets/navbar_left.scss | 2 -- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index b47584a22..aafacb92d 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1,10 +1,10 @@ -@import "bootstrap-complete.scss"; - @import 'perfect-scrollbar'; @import "colors"; +@import "bootstrap-complete.scss"; @import 'mixins'; + /* core */ @import 'media-box'; @import 'entypo'; diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss index c6c58d3a2..c9a41ba94 100644 --- a/app/assets/stylesheets/bootstrap-variables.scss +++ b/app/assets/stylesheets/bootstrap-variables.scss @@ -9,10 +9,10 @@ // //## Gray and brand colors for use across Bootstrap. -// $gray-base: #000 +$gray-base: #000; // $gray-darker: lighten($gray-base, 13.5%) // #222 // $gray-dark: lighten($gray-base, 20%) // #333 -// $gray: lighten($gray-base, 33.5%) // #555 +$gray: lighten($gray-base, 33.5%); // #555 // $gray-light: lighten($gray-base, 46.7%) // #777 // $gray-lighter: lighten($gray-base, 93.5%) // #eee @@ -667,24 +667,23 @@ $navbar-collapse-max-height: 480px; //== List group // //## - //** Background color on `.list-group-item` -// $list-group-bg: #fff +$list-group-bg: $sidebars-background; //** `.list-group-item` border color -// $list-group-border: #ddd +$list-group-border: $border-grey; //** List group border radius -// $list-group-border-radius: $border-radius-base +$list-group-border-radius: 0; //** Background color of single list items on hover -// $list-group-hover-bg: #f5f5f5 +$list-group-hover-bg: $blue; //** Text color of active list items -// $list-group-active-color: $component-active-color +$list-group-active-color: $white; //** Background color of active list items -// $list-group-active-bg: $component-active-bg +$list-group-active-bg: $gray; //** Border color of active list elements // $list-group-active-border: $list-group-active-bg //** Text color for content within active list items -// $list-group-active-text-color: lighten($list-group-active-bg, 40%) +$list-group-active-text-color: $white; //** Text color of disabled list items // $list-group-disabled-color: $gray-light @@ -694,7 +693,7 @@ $navbar-collapse-max-height: 480px; // $list-group-disabled-text-color: $list-group-disabled-color // $list-group-link-color: #555 -// $list-group-link-hover-color: $list-group-link-color +$list-group-link-hover-color: $white; // $list-group-link-heading-color: #333 diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index eafe0bde4..505447a0e 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -1,3 +1,4 @@ +@import "colors"; @import "bootstrap-variables"; body { diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss index d9418b505..7bfe55276 100644 --- a/app/assets/stylesheets/mobile/mobile.scss +++ b/app/assets/stylesheets/mobile/mobile.scss @@ -1,5 +1,5 @@ -@import "bootstrap-complete"; @import "colors"; +@import "bootstrap-complete"; @import "_mixins"; @import "vendor/autoSuggest"; @import "_flash_messages"; diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss index 5a94e358e..4a9f83175 100644 --- a/app/assets/stylesheets/navbar_left.scss +++ b/app/assets/stylesheets/navbar_left.scss @@ -31,8 +31,6 @@ } } - .selected, .selected a { color: $black; } - .hoverable { border-bottom: 1px solid $border-grey; color: $link-grey;