summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/gl_bootstrap.scss54
-rw-r--r--app/assets/stylesheets/gl_variables.scss4
-rw-r--r--app/assets/stylesheets/main/mixins.scss11
-rw-r--r--app/assets/stylesheets/sections/dashboard.scss7
4 files changed, 4 insertions, 72 deletions
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 18a6be409d3..e8e58511f3b 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.scss
@@ -131,10 +131,6 @@
}
}
}
-
- &.nav-small-tabs > li > a {
- padding: 6px 9px;
- }
}
.nav-tabs > li > a,
@@ -142,15 +138,6 @@
color: #666;
}
-.nav-compact > li > a {
- padding: 6px 12px;
-}
-
-.nav-small > li > a {
- padding: 3px 5px;
- font-size: 12px;
-}
-
/**
* fix to keep tooltips position in top navigation bar
*
@@ -165,10 +152,7 @@
*
*/
.panel {
- @include border-radius(0px);
-
.panel-heading {
- @include border-radius(0px);
font-size: 14px;
line-height: 18px;
@@ -206,41 +190,3 @@
}
}
}
-
-.panel-default {
- .panel-heading {
- background-color: #EEE;
- }
-}
-
-.panel-danger {
- @include panel-colored;
- .panel-heading {
- color: $gl-danger;
- border-color: $gl-danger;
- }
-}
-
-.panel-success {
- @include panel-colored;
- .panel-heading {
- color: $gl-success;
- border-color: $gl-success;
- }
-}
-
-.panel-primary {
- @include panel-colored;
- .panel-heading {
- color: $gl-primary;
- border-color: $gl-primary;
- }
-}
-
-.panel-warning {
- @include panel-colored;
- .panel-heading {
- color: $gl-warning;
- border-color: $gl-warning;
- }
-}
diff --git a/app/assets/stylesheets/gl_variables.scss b/app/assets/stylesheets/gl_variables.scss
index d40ab1b9162..4f54551a22c 100644
--- a/app/assets/stylesheets/gl_variables.scss
+++ b/app/assets/stylesheets/gl_variables.scss
@@ -617,7 +617,7 @@ $font-size-base: $gl-font-size;
//## Define alert colors, border radius, and padding.
// $alert-padding: 15px
-// $alert-border-radius: $border-radius-base
+$alert-border-radius: 0;
// $alert-link-font-weight: bold
// $alert-success-bg: $state-success-bg
@@ -702,7 +702,7 @@ $font-size-base: $gl-font-size;
// $panel-body-padding: 15px
// $panel-heading-padding: 10px 15px
// $panel-footer-padding: $panel-heading-padding
-// $panel-border-radius: $border-radius-base
+$panel-border-radius: 0;
//** Border color for elements within panels
// $panel-inner-border: #ddd
diff --git a/app/assets/stylesheets/main/mixins.scss b/app/assets/stylesheets/main/mixins.scss
index 80cb0c15650..ccba65e3fd5 100644
--- a/app/assets/stylesheets/main/mixins.scss
+++ b/app/assets/stylesheets/main/mixins.scss
@@ -129,14 +129,3 @@
white-space: nowrap;
max-width: $max_width;
}
-
-@mixin panel-colored {
- border: 1px solid #EEE;
- background: $box_bg;
- @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));
-
- .panel-heading {
- font-weight: bold;
- background-color: $box_bg;
- }
-}
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index c8e3c7d4a2a..96f84b7122b 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -31,11 +31,8 @@
li {
&.active {
a {
- background-color: #EEE;
- border-bottom: 1px solid #EEE !important;
- &:hover {
- background: #eee;
- }
+ background-color: whitesmoke !important;
+ border-bottom: 1px solid whitesmoke !important;
}
}