Use default bootstrap pills

Dmitriy Zaporozhets
1 parent 3f71f2fa
Showing 2 changed files with 5 additions and 45 deletions Show diff stats
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/main/variables.scss
@@ -6,6 +6,9 @@
  *
  */
  
+$font-size-base: 13px !default;
+$nav-pills-active-link-hover-bg: $bg_style_color;
+$pagination-active-bg: $bg_style_color;
  
 // Core variables and mixins
 @import "bootstrap/variables";
@@ -137,49 +140,8 @@
   }
 }
  
-.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
+.nav-tabs > li > a, .nav-pills > li > a { color: #666; }
  
-// Nav pills
-.nav-pills {
-  .active a {
-    background: $primary_color;
-  }
-
-  &.nav-stacked {
-    > li > a {
-      @include border-radius(0);
-      border-left: 4px solid #EEE;
-      padding: 12px;
-      color: #777;
-    }
-    > .active > a {
-      border-color: $primary_color;
-      background: none;
-      color: #333;
-      font-weight: bolder;
-
-      &:hover {
-        background: none;
-        color: #333;
-      }
-    }
-
-    &.nav-stacked-menu {
-      li > a {
-        padding: 16px;
-      }
-    }
-  }
-
-  &.nav-pills-small {
-    > li > a {
-      padding: 8px 12px;
-      font-size: 12px;
-    }
-  }
-}
-
-.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
  
 /*
  * Callouts from Bootstrap3 docs
-/** Override bootstrap variables **/
-$font-size-base: 13px !default;
-
 /**
  * General Colors
  */
 $primary_color: #2FA0BB;
 $link_color: #3A89A3;
 $style_color: #474D57;
+$bg_style_color: #2299BB;
 $hover: #D9EDF7;
  
 /**
...	...	@@ -6,6 +6,9 @@
6	6	*
7	7	*/
8	8
	9	+$font-size-base: 13px !default;
	10	+$nav-pills-active-link-hover-bg: $bg_style_color;
	11	+$pagination-active-bg: $bg_style_color;
9	12
10	13	// Core variables and mixins
11	14	@import "bootstrap/variables";
...	...	@@ -137,49 +140,8 @@
137	140	}
138	141	}
139	142
140		-.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
	143	+.nav-tabs > li > a, .nav-pills > li > a { color: #666; }
141	144
142		-// Nav pills
143		-.nav-pills {
144		- .active a {
145		- background: $primary_color;
146		- }
147		-
148		- &.nav-stacked {
149		- > li > a {
150		- @include border-radius(0);
151		- border-left: 4px solid #EEE;
152		- padding: 12px;
153		- color: #777;
154		- }
155		- > .active > a {
156		- border-color: $primary_color;
157		- background: none;
158		- color: #333;
159		- font-weight: bolder;
160		-
161		- &:hover {
162		- background: none;
163		- color: #333;
164		- }
165		- }
166		-
167		- &.nav-stacked-menu {
168		- li > a {
169		- padding: 16px;
170		- }
171		- }
172		- }
173		-
174		- &.nav-pills-small {
175		- > li > a {
176		- padding: 8px 12px;
177		- font-size: 12px;
178		- }
179		- }
180		-}
181		-
182		-.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
183	145
184	146	/*
185	147	* Callouts from Bootstrap3 docs
...	...
1		-/ Override bootstrap variables /
2		-$font-size-base: 13px !default;
3		-
4	1	/**
5	2	* General Colors
6	3	*/
7	4	$primary_color: #2FA0BB;
8	5	$link_color: #3A89A3;
9	6	$style_color: #474D57;
	7	+$bg_style_color: #2299BB;
10	8	$hover: #D9EDF7;
11	9
12	10	/**
...	...