diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-25 08:52:51 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-25 08:52:51 +0000 |
| commit | 47837db9a20f6b5b2253982dab680e211d6cd398 (patch) | |
| tree | bb947540506a2ce3401c9cbbf0b01be23606c5a1 | |
| parent | 66418658d08ef3fd5acdbebb149695d13fb0256c (diff) | |
| parent | 31e849c24891f115661489c876877d4a13ae6db9 (diff) | |
| download | gitlab-ce-47837db9a20f6b5b2253982dab680e211d6cd398.tar.gz | |
Merge branch '10603-markdown-css' into 'master'
Removes EE differences for markdown_area.scss
Closes gitlab-ee#10603
See merge request gitlab-org/gitlab-ce!26489
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 6afe0d61232..de2cd600623 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -61,6 +61,10 @@ padding-top: 0; line-height: 19px; + &.btn.btn-sm { + padding: 2px 5px; + } + &:focus { margin-top: -10px; padding-top: 10px; |