diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-23 08:40:40 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-23 08:40:40 +0000 |
| commit | 9f7fc6a0434399170ce1b089a6b00e11d0880f16 (patch) | |
| tree | 51291bb0cb45560a6bdc9ddd0544e315ad5f5c34 /app | |
| parent | 0676c5c7140ccf5b809eddab79b6fb78b7db0a66 (diff) | |
| parent | 6f11ffe8657dfbc0d48f936534436360d23cec9a (diff) | |
| download | gitlab-ce-9f7fc6a0434399170ce1b089a6b00e11d0880f16.tar.gz | |
Merge branch 'status-badge-spacing' into 'master'
Fix spacing between icon and word in status badge
Before:
After:
cc @dimitrieh
See merge request !7678
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/status.scss | 18 | ||||
| -rw-r--r-- | app/helpers/ci_status_helper.rb | 2 |
3 files changed, 10 insertions, 18 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 1b1b056f213..0027d2caf22 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -91,14 +91,6 @@ } } - .ci-status { - - svg { - top: 1px; - margin-right: 0; - } - } - a:hover { text-decoration: none; } diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 1de4674f3e7..4c258bae1f4 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -11,6 +11,15 @@ text-decoration: none; } + svg { + height: 13px; + width: 13px; + position: relative; + top: 1px; + margin-right: 3px; + overflow: visible; + } + &.ci-failed { color: $gl-danger; border-color: $gl-danger; @@ -104,15 +113,6 @@ fill: $table-text-gray; } } - - svg { - height: 13px; - width: 13px; - position: relative; - top: 1px; - margin: 0 3px; - overflow: visible; - } } } diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index 895c3d728ad..abcf84b4d15 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -5,7 +5,7 @@ module CiStatusHelper end def ci_status_with_icon(status, target = nil) - content = ci_icon_for_status(status) + ' '.html_safe + ci_label_for_status(status) + content = ci_icon_for_status(status) + ci_label_for_status(status) klass = "ci-status ci-#{status}" if target link_to content, target, class: klass |