summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/buttons.scss
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-23 12:29:50 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-23 12:29:50 +0100
commita84ecf0e2eac113bfb30290f6869b12f65e0b0d3 (patch)
tree19d86ee8bc8f4667169ae6709c32a815d20fb3ab /app/assets/stylesheets/framework/buttons.scss
parent7a519bc1e2e904d46b5d6de824f1421ab8c3b0f3 (diff)
downloadgitlab-ce-a84ecf0e2eac113bfb30290f6869b12f65e0b0d3.tar.gz
Fix close/reopen buttonsnew-buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/framework/buttons.scss')
-rw-r--r--app/assets/stylesheets/framework/buttons.scss19
1 files changed, 4 insertions, 15 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 9b7463c9476..97a94638847 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -77,7 +77,7 @@
&.btn-sm {
padding: 5px 10px;
}
-
+
&.btn-nr {
padding: 7px 10px;
}
@@ -101,11 +101,12 @@
&.btn-primary {
@include btn-blue-medium;
}
-
+
&.btn-info {
@include btn-blue;
}
+ &.btn-close,
&.btn-warning {
@include btn-orange;
}
@@ -120,20 +121,8 @@
float: right;
}
- &.btn-close {
- color: $gl-danger;
- border-color: $gl-danger;
- &:hover {
- color: #B94A48;
- }
- }
-
&.btn-reopen {
- color: $gl-success;
- border-color: $gl-success;
- &:hover {
- color: #468847;
- }
+ /* should be same as parent class for now */
}
&.btn-grouped {