diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-22 18:12:24 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-22 18:12:24 +0000 |
commit | d5732094e5203932a8386a044cf7727ab4b215e5 (patch) | |
tree | 8c184380de779e23298846ec063bd1d2794b5d23 /app/views/projects/merge_requests | |
parent | c1710afbd437c557741ff4c7fa185c6ffb89bf1b (diff) | |
parent | 5c71a053bcb97064e6e7756ca78dccc2e9e852a4 (diff) | |
download | gitlab-ce-d5732094e5203932a8386a044cf7727ab4b215e5.tar.gz |
Merge branch 'ci-style-tweaks-8.14' into 'master'
Last minute CI Style tweaks for 8.14
## What does this MR do?
- Skipped builds now have use a lighter gray.
- Converted all status icons to be managed by scss colors only
- Consolidated all status icon styles into icons.scss
- Deleted any classes or styles within the svg's
- Gave status badges a hover style, but only if clickable
- Fixed alignment issue mini-pipeline graph
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
As per the discussion in the slack chat https://gitlab.slack.com/archives/ci/p1479743986004879
## Screenshots (if relevant)
- skipped builds:
![image](/uploads/f59c615045472b9b13940463a64c8038/image.png)
![image](/uploads/26503d1da9c93b3c22c5c0c1369feceb/image.png)
- hover style status badges:
![2016-11-22_00.21.27](/uploads/36afa7aa64d60e1755bf39d97f90c59f/2016-11-22_00.21.27.gif)![2016-11-22_00.58.38](/uploads/1d95fa5db124412d3f83b3e79b9b71ec/2016-11-22_00.58.38.gif)
- mini pipeline graph:
before:
![image](/uploads/38e5e57ada3907b17c6e24e1446b4514/image.png)
after:
![image](/uploads/de4476693a1397eebfc680661159daf7/image.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !7643
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index a82c846baa7..09c41f947b0 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -1,7 +1,7 @@ - if @pipeline .mr-widget-heading - %w[success success_with_warnings skipped canceled failed running pending].each do |status| - .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) } + .ci_widget{ class: "ci-status-icon-#{status}", style: ("display:none" unless @pipeline.status == status) } = ci_icon_for_status(status) %span Pipeline |