summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-13 14:30:57 +0000
committerRegis <boudinot.regis@yahoo.com>2017-02-14 15:35:50 -0700
commit26f9b82311e428d36cacd9edb3119e5d4c1bd184 (patch)
treee254f921fcbd6778e8d00c560a19a638c90972ce
parent29d606207fce5a062d29701d892a10c7f3e00e11 (diff)
downloadgitlab-ce-26f9b82311e428d36cacd9edb3119e5d4c1bd184.tar.gz
Merge branch '27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget' into 'master'
Resolve "Missing margin between loading icon and text in Merge Request Widget" Closes #27947 See merge request !9119
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss8
-rw-r--r--changelogs/unreleased/27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget.yml4
2 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4ccac3d85c3..230af1a21f4 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -85,14 +85,18 @@
-webkit-align-items: center;
align-items: center;
+ i,
+ svg {
+ margin-right: 8px;
+ }
+
svg {
- margin-right: 4px;
position: relative;
top: 1px;
overflow: visible;
}
- &> span {
+ & > span {
padding-right: 4px;
}
diff --git a/changelogs/unreleased/27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget.yml b/changelogs/unreleased/27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget.yml
new file mode 100644
index 00000000000..1dfabd3813b
--- /dev/null
+++ b/changelogs/unreleased/27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget.yml
@@ -0,0 +1,4 @@
+---
+title: Add space between text and loading icon in Megre Request Widget
+merge_request: 9119
+author: