summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-20 09:24:18 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-21 12:27:24 -0200
commit4814148bcb913fc68bfd990caa082accbf70c448 (patch)
tree7a8373153d199bc7c0f38015c4afa8d6cf5bbfb0
parent680c3b24f109b846c408ea5d4d9ba791144e7b90 (diff)
downloadgitlab-ce-4814148bcb913fc68bfd990caa082accbf70c448.tar.gz
Merge branch 'status-badge-height' into 'master'
Remove inline-block styling from status Before: ![Screen_Shot_2016-12-19_at_2.13.42_PM](/uploads/2bb7bc84f97fb3489854518e35349203/Screen_Shot_2016-12-19_at_2.13.42_PM.png) After: ![Screen_Shot_2016-12-19_at_2.12.34_PM](/uploads/d228c105f90d546fce5b1653d7a74fd7/Screen_Shot_2016-12-19_at_2.12.34_PM.png) See merge request !8181
-rw-r--r--app/assets/stylesheets/framework/page-header.scss1
-rw-r--r--app/assets/stylesheets/pages/status.scss1
2 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/page-header.scss b/app/assets/stylesheets/framework/page-header.scss
index fff7d7f7524..625bea96aaa 100644
--- a/app/assets/stylesheets/framework/page-header.scss
+++ b/app/assets/stylesheets/framework/page-header.scss
@@ -57,7 +57,6 @@
}
.ci-status-link {
-
svg {
position: relative;
top: 2px;
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 055dacd81f4..a810ed32327 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,6 +1,5 @@
.container-fluid {
.ci-status {
- display: inline-block;
padding: 2px 7px;
margin-right: 10px;
border: 1px solid $gray-darker;