summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Dyadyura <adyadyura@Andriys-MBP.lan>2015-12-22 21:22:37 +0100
committerAndriy Dyadyura <adyadyura@Andriys-MBP.lan>2015-12-22 21:22:37 +0100
commita793590d43c98f9b9763c4742e773b51624b79c1 (patch)
tree8d49cb2de96eaf3fe2d16cca93e312ef963d95c8
parent3b61dc47ec377b857b66f9b2a81a183276163f4e (diff)
downloadgitlab-ce-a793590d43c98f9b9763c4742e773b51624b79c1.tar.gz
new buttons
-rw-r--r--app/assets/stylesheets/framework/buttons.scss15
1 files changed, 9 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index fe56266284b..008c44a227f 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -1,10 +1,9 @@
@mixin btn-default {
- @include border-radius(2px);
+ @include border-radius(3px);
border-width: 1px;
border-style: solid;
- text-transform: uppercase;
- font-size: 13px;
- font-weight: 600;
+ font-size: 15px;
+ font-weight: 500;
line-height: 18px;
padding: 11px $gl-padding;
letter-spacing: .4px;
@@ -18,7 +17,7 @@
@mixin btn-middle {
@include btn-default;
- @include border-radius(2px);
+ @include border-radius(3px);
padding: 11px 24px;
}
@@ -60,7 +59,7 @@
}
@mixin btn-gray {
- @include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-normal, $gray-dark, $border-gray-dark, #313236);
+ @include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, #313236);
}
@mixin btn-white {
@@ -74,6 +73,10 @@
&.btn-sm {
padding: 5px 10px;
}
+
+ &.btn-nr {
+ padding: 7px 10px;
+ }
&.btn-xs {
padding: 1px 5px;