summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/editor.scss
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-12 12:07:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-12 12:07:33 +0000
commit784fae4b9d7e92350075df2a43d06893080ed1e6 (patch)
treec7a6fd444acd6897622b233b250a34fd176f01da /app/assets/stylesheets/pages/editor.scss
parentfc53ce8e6ca67bf217470179a1ea6cf139bcffad (diff)
downloadgitlab-ce-784fae4b9d7e92350075df2a43d06893080ed1e6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/pages/editor.scss')
-rw-r--r--app/assets/stylesheets/pages/editor.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 65d0ce8c52e..b716c6e14fe 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -172,7 +172,7 @@
}
.template-selector-dropdowns-wrap {
- display: inline-block;
+ display: flex;
vertical-align: top;
@media(max-width: map-get($grid-breakpoints, lg)-1) {
@@ -189,6 +189,7 @@
display: inline-block;
vertical-align: top;
font-family: $regular_font;
+ margin: 0 8px 0 0;
@media(max-width: map-get($grid-breakpoints, lg)-1) {
display: block;