Commit f0ef8700 authored by Phil Hughes's avatar Phil Hughes

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
parents 543873c8 efb37414
...@@ -241,6 +241,7 @@ ...@@ -241,6 +241,7 @@
*/ */
&.code { &.code {
padding: 0; padding: 0;
border-radius: 0 0 $border-radius-default $border-radius-default;
} }
.list-inline.previews { .list-inline.previews {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
pre { pre {
padding: 10px 0; padding: 10px 0;
border: 0; border: 0;
border-radius: 0; border-radius: 0 0 $border-radius-default $border-radius-default;
font-family: $monospace-font; font-family: $monospace-font;
font-size: $code-font-size; font-size: $code-font-size;
line-height: 19px; line-height: 19px;
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
padding: 10px; padding: 10px;
text-align: right; text-align: right;
float: left; float: left;
border-bottom-left-radius: $border-radius-default;
a { a {
font-family: $monospace-font; font-family: $monospace-font;
......
...@@ -494,6 +494,12 @@ table.code { ...@@ -494,6 +494,12 @@ table.code {
} }
} }
.line_holder:last-of-type {
td:first-child {
border-bottom-left-radius: $border-radius-default;
}
}
&.left-side-selected { &.left-side-selected {
td.line_content.parallel.right-side { td.line_content.parallel.right-side {
user-select: none; user-select: none;
......
---
title: Fix border radii on diff files and repo files
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment