summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-10 18:42:41 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-10 18:42:41 +0000
commitf3231d0f634dc1e8bc9d7d69eaba1f660cd26e36 (patch)
tree4b2d3015dfd16b86bd43997f11a79e3f3dbe0374
parent3e089d7fa47c628b0e14c9ba0b07ac258ff8155b (diff)
parent77d5d83fe2193480efbb1589271bde78a8b00f86 (diff)
downloadgitlab-ce-f3231d0f634dc1e8bc9d7d69eaba1f660cd26e36.tar.gz
Merge branch '24353-skipped-icon' into 'master'
Resize skipped icon Resizes `skipped` icon to match all other status icons ![Screen_Shot_2016-11-10_at_7.35.07_AM](/uploads/5be0dc0638f12a3c984af747a03ce1e1/Screen_Shot_2016-11-10_at_7.35.07_AM.png) Closes #24353 See merge request !7401
-rw-r--r--app/assets/stylesheets/pages/commits.scss2
-rw-r--r--app/views/shared/icons/_icon_status_skipped.svg2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 98a84351a3d..61fbd7425b7 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -62,6 +62,8 @@
.ci-status-link {
display: inline-block;
+ position: relative;
+ top: 1px;
}
.btn-clipboard,
diff --git a/app/views/shared/icons/_icon_status_skipped.svg b/app/views/shared/icons/_icon_status_skipped.svg
index 014ca86b61b..3420af411f6 100644
--- a/app/views/shared/icons/_icon_status_skipped.svg
+++ b/app/views/shared/icons/_icon_status_skipped.svg
@@ -1 +1 @@
-<svg width="20" height="20" class="ci-status-icon-skipped" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>Group Copy 31</title><g fill="#5C5C5C" fill-rule="evenodd"><path d="M10 17.857c4.286 0 7.857-3.571 7.857-7.857S14.286 2.143 10 2.143 2.143 5.714 2.143 10 5.714 17.857 10 17.857M10 0c5.571 0 10 4.429 10 10s-4.429 10-10 10S0 15.571 0 10 4.429 0 10 0"/><path d="M10.986 11l-1.293 1.293a1 1 0 0 0 1.414 1.414l2.644-2.644a1.505 1.505 0 0 0 0-2.126l-2.644-2.644a1 1 0 0 0-1.414 1.414L10.986 9H6.4a1 1 0 0 0 0 2h4.586z"/></g></svg>
+<svg width="14" height="14" class="ci-status-icon-skipped" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>Group Copy 31</title><g fill="#5C5C5C" fill-rule="evenodd"><path d="M10 17.857c4.286 0 7.857-3.571 7.857-7.857S14.286 2.143 10 2.143 2.143 5.714 2.143 10 5.714 17.857 10 17.857M10 0c5.571 0 10 4.429 10 10s-4.429 10-10 10S0 15.571 0 10 4.429 0 10 0"/><path d="M10.986 11l-1.293 1.293a1 1 0 0 0 1.414 1.414l2.644-2.644a1.505 1.505 0 0 0 0-2.126l-2.644-2.644a1 1 0 0 0-1.414 1.414L10.986 9H6.4a1 1 0 0 0 0 2h4.586z"/></g></svg>