diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
| commit | f7bdfe5098c9a5a3a426344ba1d7dd668212cf7e (patch) | |
| tree | 5a1cb2a90b0a2b5114f6f23712b68724b3e8a7e0 /app/assets/stylesheets/pages/editor.scss | |
| parent | 9cd528aa7ac5066570cb50b909951a6c6b723935 (diff) | |
| parent | e16add2267648d3d3ef1d98f9b53f67a29428791 (diff) | |
| download | gitlab-ce-f7bdfe5098c9a5a3a426344ba1d7dd668212cf7e.tar.gz | |
Merge branch 'master' into 'es-module-autosave'es-module-autosave
# Conflicts:
# app/assets/javascripts/issuable_form.js
# app/assets/javascripts/notes.js
Diffstat (limited to 'app/assets/stylesheets/pages/editor.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/editor.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index d3cd4d507de..edfafa79c44 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -4,7 +4,7 @@ border-right: 1px solid $border-color; border-left: 1px solid $border-color; border-bottom: none; - border-radius: 2px; + border-radius: $border-radius-small $border-radius-small 0 0; background: $gray-normal; } |