kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'status-badge-spacing' into 'master'

Browse source 
Fix spacing between icon and word in status badge

Before:      
![Screen_Shot_2016-11-22_at_11.44.16_AM](/uploads/65c5abc6dc08985cb3079b7c2af03715/Screen_Shot_2016-11-22_at_11.44.16_AM.png)
After:   
![Screen_Shot_2016-11-22_at_11.44.01_AM](/uploads/1b6261b64c65de5a718b68873e069ac9/Screen_Shot_2016-11-22_at_11.44.01_AM.png)

cc @dimitrieh

See merge request !7678
This commit is contained in:
Fatih Acet 2016-11-23 08:40:40 +00:00
commit 9f7fc6a043
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/pages/pipelines.scss
View file

@ -91,14 +91,6 @@
}
}
.ci-status {
svg {
top: 1px;
margin-right: 0;
}
}
a:hover {
text-decoration: none;
}

18
app/assets/stylesheets/pages/status.scss
View file

@ -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;
}
}
}

2
app/helpers/ci_status_helper.rb
View file

@ -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