Use default bootstrap pills

2 files changed, 5 insertions, 45 deletions

diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 1fdc82d36cf..a67a37bc21a 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.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
diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss
index 86b207f02cc..decc5f50469 100644
--- a/app/assets/stylesheets/main/variables.scss
+++ b/app/assets/stylesheets/main/variables.scss
@@ -1,12 +1,10 @@
-/** 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;
 
 /**