diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-24 09:19:36 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-24 09:19:36 +0000 |
| commit | f0ef8700a1c8521e84ed7e964cd5830d7bb329a5 (patch) | |
| tree | 98cd6427cfe5f418cbee9f5f67b55d2db1b474da /app/assets/stylesheets/framework | |
| parent | 543873c8396746a40a59d735f55d290f25ee316b (diff) | |
| parent | efb37414086d4ab07c9020e9520b5821c01427cb (diff) | |
| download | gitlab-ce-f0ef8700a1c8521e84ed7e964cd5830d7bb329a5.tar.gz | |
Merge branch '38561-border-radii' into 'master'
Fix border radii on diff files and repo files
Closes #38483 and #38561
See merge request gitlab-org/gitlab-ce!28675
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/highlight.scss | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 53d3645cd63..17c117188b3 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -241,6 +241,7 @@ */ &.code { padding: 0; + border-radius: 0 0 $border-radius-default $border-radius-default; } .list-inline.previews { diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss index 946f575ac13..741f92110c3 100644 --- a/app/assets/stylesheets/framework/highlight.scss +++ b/app/assets/stylesheets/framework/highlight.scss @@ -8,7 +8,7 @@ pre { padding: 10px 0; border: 0; - border-radius: 0; + border-radius: 0 0 $border-radius-default $border-radius-default; font-family: $monospace-font; font-size: $code-font-size; line-height: 19px; @@ -42,6 +42,7 @@ padding: 10px; text-align: right; float: left; + border-bottom-left-radius: $border-radius-default; a { font-family: $monospace-font; |