diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-19 18:16:34 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-19 18:16:34 +0300 |
commit | d0e77fb50d0c64d0c8f9c06f915aa883e8dfd9cb (patch) | |
tree | a157bcf1f2db10e4659111bc742731244669bc3c /app/assets | |
parent | 8d3ef366222423a295fed676bdddd1060071320e (diff) | |
parent | 1ac37d97e6870b59db7983d6e84714777500017c (diff) |
Merge branch 'pipelines-ui-updates' into 'master'
Pipelines ui updates
#### What does this MR do?
* Fixes hover color width on build list
* Fixes alignment of status icon on commits page
* Add play icon SVG
#### Why was this MR needed?
Small UI bugs with recent MRs
![Screen_Shot_2016-08-17_at_5.54.32_PM](/uploads/a5f1a38eac332865b17d8d74eeaa5142/Screen_Shot_2016-08-17_at_5.54.32_PM.png)
![Screen_Shot_2016-08-17_at_5.56.43_PM](/uploads/90608eee3e83dbe14244ff2be5a8867e/Screen_Shot_2016-08-17_at_5.56.43_PM.png)
![Screen_Shot_2016-08-18_at_9.18.37_AM](/uploads/9c1265fc3efa7b6084e2368d3fe458cd/Screen_Shot_2016-08-18_at_9.18.37_AM.png)
See merge request !5856
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 17 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 15 |
3 files changed, 18 insertions, 19 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 81fce55853c..c1bb250b42d 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -168,7 +168,6 @@ text-overflow: ellipsis; &:hover { - background-color: $row-hover; color: $gl-text-color; } } @@ -190,6 +189,10 @@ display: block; } } + + &:hover { + background-color: $row-hover; + } } } } diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index fe8a8025038..53ec0002afe 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -68,22 +68,11 @@ } .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; - } + position: relative; + top: 2px; + margin: 0 2px 0 3px; } } } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index ce1c424624f..6fa097e3bf1 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -300,6 +300,17 @@ &.playable { background-color: $gray-light; + + svg { + height: 12px; + width: 12px; + position: relative; + top: 1px; + + path { + fill: $layout-link-gray; + } + } } .build-content { @@ -319,10 +330,6 @@ margin-right: 5px; } - .fa { - font-size: 13px; - } - // Connect first build in each stage with right horizontal line &:first-child { &::after { |