diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-04 23:33:41 +0300 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-17 19:18:53 +0300 |
| commit | 3693495e6136a9dc1266fc25a1b6ff9a764de005 (patch) | |
| tree | 5bfe14384bb2c610fbfb8e4a6db49b2fca0a6b61 | |
| parent | 0b9cd0a1f635d1e3751aa1279d52292d23a0a9dc (diff) | |
Style build dropdowns
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 27 | ||||
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 8 |
2 files changed, 11 insertions, 24 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 5a6a35f42d1..5ecbe038612 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -54,32 +54,19 @@ } } - .nav-links { + .build-dropdown { + display: inline-block; + margin-top: 16px; + svg { position: relative; top: 2px; margin-right: 3px; + height: 13px; } - .build-job { - a { - color: $gl-text-color; - } - - &.active { - a { - font-weight: bold; - } - } - } - } - - .jobs-dropdown { - - svg { - position: relative; - top: 2px; - margin-right: 3px; + .stage-item { + cursor: pointer; } } } diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index 5f7c66e4dd2..b4834ae42a2 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -8,20 +8,20 @@ - builds = @build.pipeline.builds.latest.to_a - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"] - if builds.size > 1 - .dropdown.stage + .dropdown.build-dropdown %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'} %span.stage-selection More = icon('caret-down') - %ul.dropdown-menu.overflow-jobs + %ul.dropdown-menu - builds.map(&:stage).uniq.each do |stage| %li %a.stage-item= stage - .dropdown.jobs-dropdown + .dropdown.build-dropdown %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'} %span.build-selection More = icon('caret-down') - %ul.dropdown-menu.overflow-jobs + %ul.dropdown-menu - statuses.each do |build_status| - builds.select{|build| build.status == build_status}.each do |build| %li.build-job{class: ('active' if build == @build), data: {id: build.id, name: build.name, stage: build.stage}} |