diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-20 19:17:52 +0300 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-21 16:57:06 +0300 |
commit | 6130376ad6673facb729b78878f9156a29948a5b (patch) | |
tree | ab6874e0a9b267bb28c072e940846e66e22e6f59 | |
parent | 4e40ba93dcfc339ab4baa47ef39e1a570e4fc902 (diff) |
Bug fixes
-rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 6 | ||||
-rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 10 |
3 files changed, 19 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 35ab28b3fea..29d3bf8ae6f 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -66,6 +66,14 @@ margin-left: 8px; } } + + .ci-status-link { + svg { + position: relative; + top: 2px; + margin: 0 3px; + } + } } .commit-box { diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index a404f108dc4..a45c675e307 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -93,7 +93,7 @@ .commit-title { margin-top: 4px; - max-width: 320px; + max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -139,6 +139,10 @@ width: 18px; vertical-align: middle; } + + .light { + width: 3px; + } } .duration, diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 9264289987d..a9fb3c58431 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -14,16 +14,19 @@ %span ##{build.id} - if build.stuck? - = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.') + .icon-container + = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.') - if defined?(retried) && retried - = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.') + .icon-container + = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.') - if defined?(ref) && ref - if build.ref = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name" - else .light none - = custom_icon("icon_commit") + .icon-container + = custom_icon("icon_commit") - if defined?(commit_sha) && commit_sha = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace" @@ -88,4 +91,3 @@ - elsif build.playable? = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play', class: 'btn btn-build' do = icon('play') - |