diff options
| author | Andriy Dyadyura <adyadyura@Andriys-MBP.lan> | 2016-01-14 15:41:11 +0100 |
|---|---|---|
| committer | Andriy Dyadyura <adyadyura@Andriys-MBP.lan> | 2016-01-14 15:41:11 +0100 |
| commit | e29ce9ac267e6724945b9558d069dda2b2ec2755 (patch) | |
| tree | 59f03b018817d7aa9c007933472cd5d8e6a28cc5 | |
| parent | 915299a5ff837a1f6ce597d4b449237b51c3a115 (diff) | |
| download | gitlab-ce-pr-page-fix.tar.gz | |
buttons updatepr-page-fix
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 11 | ||||
| -rw-r--r-- | app/helpers/button_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/_clone_panel.html.haml | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index f0d16053928..9f719d981b4 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -81,7 +81,7 @@ .form-control { background: #FFF; font-size: 14px; - height: 42px; + height: 34px; margin-left: -1px; } } @@ -232,10 +232,14 @@ } } +.dropdown-nr { + padding: 7px 0px; +} + .input-group-btn { .btn { @include btn-gray; - @include btn-middle; + @include btn-default; &:hover { outline: none; @@ -253,6 +257,9 @@ padding-left: 15px; padding-right: 15px; } + &.btn-nr { + padding: 7px 10px; + } } .active { diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb index ec0e3f409c1..80c7090d91e 100644 --- a/app/helpers/button_helper.rb +++ b/app/helpers/button_helper.rb @@ -17,7 +17,7 @@ module ButtonHelper def clipboard_button(data = {}) content_tag :button, icon('clipboard'), - class: 'btn btn-xs btn-clipboard', + class: 'btn btn-xs btn-nr btn-clipboard', data: data, type: :button end diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index 4af24974571..fd8ab14241c 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -2,7 +2,7 @@ .git-clone-holder .btn-group.clone-options - %a#clone-dropdown.clone-dropdown-btn.btn-nr.btn{href: '#', 'data-toggle' => 'dropdown'} + %a#clone-dropdown.clone-dropdown-btn.dropdown-nr.btn{href: '#', 'data-toggle' => 'dropdown'} %span = default_clone_protocol.upcase = icon('angle-down') |