diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:27:50 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:27:50 +0300 |
| commit | 87e0fe6f76fa8829abb99dd90a8af65ed11bc3a3 (patch) | |
| tree | 6718c714af131e75385f1424f00812126eb87a46 | |
| parent | 7bb0551fd9f703674f2126ca316d8a097ef9d1ed (diff) | |
| download | gitlab-ce-87e0fe6f76fa8829abb99dd90a8af65ed11bc3a3.tar.gz | |
Use big colorful pills for switch between MR tabs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 14 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 7255b3ab23d..c1eaae82e5e 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -20,18 +20,14 @@ } .merge-request .merge-request-tabs{ - border-color: #AAA; + border-bottom: 2px solid $border_primary; + padding-bottom: 10px; + margin-bottom: 20px; + li { a { - border-color: #AAA; - padding: 14px 40px; + padding: 20px 40px; font-size: 14px; - background-color: #F9F9F9; - } - &.active a { - border-color: #AAA; - border-bottom-color: #FFF; - background-color: #FFF; } } } diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 38a0ed567fc..1072728af28 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -7,7 +7,7 @@ = render "projects/merge_requests/show/participants" - if @commits.present? - %ul.nav.nav-tabs.merge-request-tabs + %ul.nav.nav-pills.merge-request-tabs %li.notes-tab{data: {action: 'notes'}} = link_to project_merge_request_path(@project, @merge_request) do %i.icon-comment |