diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-07 10:43:00 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-07 10:43:00 +0000 |
| commit | 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b (patch) | |
| tree | 3e06d7992d537faeeea4f3291dd4085c789fc173 /app/helpers | |
| parent | f57d59226d5ba5de45b710876f2689da9cc2e0f4 (diff) | |
| parent | c5ec2a23a466f45127b6056693e1a473ae7e503e (diff) | |
| download | gitlab-ce-0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b.tar.gz | |
Merge branch 'small-ui-improvements' into 'master'
Small UI improvements to merge request page
Make gray block under tabs identical height. Also same height have blocks on pages like `Groups` etc. So this improvement is targeted for consistency in UI too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fixes internal issues
* https://dev.gitlab.org/gitlab/gitlabhq/issues/2591
* https://dev.gitlab.org/gitlab/gitlabhq/issues/2592
cc @DouweM
See merge request !1759
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/diff_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index e65e37211c4..b889fb28973 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -137,7 +137,7 @@ module DiffHelper # Always use HTML to handle case where JSON diff rendered this button params_copy.delete(:format) - link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do + link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn active' : 'btn') do 'Inline' end end @@ -148,7 +148,7 @@ module DiffHelper # Always use HTML to handle case where JSON diff rendered this button params_copy.delete(:format) - link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do + link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active' : 'btn') do 'Side-by-side' end end |