diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-14 14:19:32 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-14 14:19:32 +0000 |
commit | 33ccee239ebcac7785c1ad466c1624a43af99c90 (patch) | |
tree | 0e9d7fa444ff58bed94588d1dedd1c0a459b8fe1 /app/assets/stylesheets/framework/buttons.scss | |
parent | e47f0e563d127f593f16c0a521c836e21bceb77f (diff) | |
parent | f414928a54aebddbf73f0e92ccf96a09ad1b6cb4 (diff) | |
download | gitlab-ce-33ccee239ebcac7785c1ad466c1624a43af99c90.tar.gz |
Merge branch 'new-buttons-everywhere' into 'master'
Standartize buttons and fields size
Fixes #8069 and #8070
See merge request !2428
Diffstat (limited to 'app/assets/stylesheets/framework/buttons.scss')
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 57 |
1 files changed, 43 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index d1d692f8384..c99292c3f83 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -1,12 +1,8 @@ @mixin btn-default { @include border-radius(3px); - border-width: 1px; - border-style: solid; - font-size: 15px; + font-size: $gl-font-size; font-weight: 500; - line-height: 18px; - padding: 11px $gl-padding; - letter-spacing: .4px; + padding: $gl-vert-padding $gl-padding; &:focus, &:active { @@ -17,8 +13,6 @@ @mixin btn-middle { @include btn-default; - @include border-radius(3px); - padding: 11px 24px; } @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) { @@ -74,16 +68,15 @@ @include btn-default; @include btn-white; + &.btn-small, &.btn-sm { - padding: 5px 10px; - } - - &.btn-nr { - padding: 7px 10px; + padding: 4px 10px; + font-size: 13px; + line-height: 18px; } &.btn-xs { - padding: 1px 5px; + padding: 2px 5px; } &.btn-success, @@ -161,4 +154,40 @@ .btn-clipboard { border: none; + padding: 0 5px; +} + +.input-group-btn { + .btn { + @include btn-gray; + @include btn-middle; + + &:hover { + outline: none; + } + + &:focus { + outline: none; + } + + &:active { + outline: none; + } + + &.btn-clipboard { + padding-left: 15px; + padding-right: 15px; + } + } + + .active { + @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12)); + + border: 1px solid #c6cacf !important; + background-color: #e4e7ed !important; + } + + .btn-green { + @include btn-green + } } |