Commit 012396c0 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'fix-alignment-build-status-icon' into 'master'

Fix spacing and vertical alignment on build status icon on commits page

## What does this MR do?
Fixes the hover state of the build status text and adds extra margin and vertically aligns the build status icon

## Are there points in the code the reviewer needs to double check?
Shouldn't be

## Why was this MR needed?
Improves existing UI

## What are the relevant issue numbers?
Closes #20642 

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-09_at_12.07.50_PM](/uploads/5265c00077eeef8fc42e08e89555bfb7/Screen_Shot_2016-08-09_at_12.07.50_PM.png)
![Screen_Shot_2016-08-09_at_12.07.59_PM](/uploads/dc5cf7e09785ac394b264a47c594cf98/Screen_Shot_2016-08-09_at_12.07.59_PM.png)

After:
![Screen_Shot_2016-08-09_at_12.05.45_PM](/uploads/c0ce182c6342a7db767d1932372991d0/Screen_Shot_2016-08-09_at_12.05.45_PM.png)
![Screen_Shot_2016-08-09_at_12.05.37_PM](/uploads/e337ff23462552f75760f80087a2b1ef/Screen_Shot_2016-08-09_at_12.05.37_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5739
parents e303df2e 9cb3fcda
......@@ -107,6 +107,7 @@ v 8.11.0 (unreleased)
- Fix search for notes which belongs to deleted objects
- Allow Akismet to be trained by submitting issues as spam or ham !5538
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
- Fix spacing and vertical alignment on build status icon on commits page (ClemMakesApps)
- Allow branch names ending with .json for graph and network page !5579 (winniehell)
- Add the `sprockets-es6` gem
- Improve OAuth2 client documentation (muteor)
......
......@@ -66,6 +66,26 @@
margin-left: 8px;
}
}
.ci-status-link {
margin-left: 2px;
svg {
vertical-align: middle;
}
.ci-status-label {
display: inline-block;
}
&:hover {
text-decoration: none;
.ci-status-label {
text-decoration: underline;
}
}
}
}
.ci-status-link {
......
......@@ -56,7 +56,8 @@
= pluralize(@commit.pipelines.count, 'pipeline')
= link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status-link ci-status-icon-#{@commit.status}" do
= ci_icon_for_status(@commit.status)
= ci_label_for_status(@commit.status)
%span.ci-status-label
= ci_label_for_status(@commit.status)
- if @commit.pipelines.duration
in
= time_interval_in_words @commit.pipelines.duration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment