diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-07 17:32:00 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-07 17:32:00 +0200 |
| commit | b8e4d6bdbec8631663a017c1b651dc223f0cba16 (patch) | |
| tree | 46c417b0dfe627393f3f63927a2639b4da307a31 | |
| parent | 2acb030beaf4a04969340d7d0ede12992f8dd6fe (diff) | |
| download | gitlab-ce-b8e4d6bdbec8631663a017c1b651dc223f0cba16.tar.gz | |
Refactor buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/generic/buttons.scss | 33 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 4 |
2 files changed, 9 insertions, 28 deletions
diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss index 086a056bbf5..62922e6a330 100644 --- a/app/assets/stylesheets/generic/buttons.scss +++ b/app/assets/stylesheets/generic/buttons.scss @@ -156,12 +156,15 @@ } } - .btn { @include btn-default; @include btn-white; - &.btn-success { + &.btn-success, + &.btn-new, + &.btn-create, + &.btn-save, + &.btn-green { @include btn-green; } @@ -169,20 +172,10 @@ @include btn-gray; } - &.btn-new { - @extend .btn-success; - } - - &.btn-create { - @extend .btn-success; - } - - &.btn-save { - @extend .btn-success; - } - - &.btn-remove { - @extend .btn-danger; + &.btn-danger, + &.btn-remove, + &.btn-red { + @include btn-red; } &.btn-cancel { @@ -212,14 +205,6 @@ margin-right: 0px; } } - - &.btn-save { - @extend .btn-primary; - } - - &.btn-new, &.btn-create { - @extend .btn-success; - } } .btn-block { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index c36f5a394d8..0031ab5151b 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -142,11 +142,7 @@ } } } -.btn-green { - @include btn-green; - cursor: pointer; -} .projects-search-form { .input-group .form-control { |