Commit 64d3ca51 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '37978-extra-border-radius-while-editing-a-file' into 'master'

Remove extra border radius when editing a file

Closes #37978

See merge request gitlab-org/gitlab-ce!14803
parents 7685314f bfda3acd
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
border: 0; border: 0;
} }
&.file-holder-bottom-radius {
border-radius: 0 0 $border-radius-small $border-radius-small;
}
&.readme-holder { &.readme-holder {
margin: $gl-padding 0; margin: $gl-padding 0;
......
...@@ -233,6 +233,7 @@ $container-text-max-width: 540px; ...@@ -233,6 +233,7 @@ $container-text-max-width: 540px;
$gl-avatar-size: 40px; $gl-avatar-size: 40px;
$error-exclamation-point: $red-500; $error-exclamation-point: $red-500;
$border-radius-default: 4px; $border-radius-default: 4px;
$border-radius-small: 2px;
$settings-icon-size: 18px; $settings-icon-size: 18px;
$provider-btn-not-active-color: $blue-500; $provider-btn-not-active-color: $blue-500;
$link-underline-blue: $blue-500; $link-underline-blue: $blue-500;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
border-right: 1px solid $border-color; border-right: 1px solid $border-color;
border-left: 1px solid $border-color; border-left: 1px solid $border-color;
border-bottom: none; border-bottom: none;
border-radius: 2px; border-radius: $border-radius-small $border-radius-small 0 0;
background: $gray-normal; background: $gray-normal;
} }
......
- action = current_action?(:edit) || current_action?(:update) ? 'edit' : 'create' - action = current_action?(:edit) || current_action?(:update) ? 'edit' : 'create'
.file-holder.file.append-bottom-default .file-holder-bottom-radius.file-holder.file.append-bottom-default
.js-file-title.file-title.clearfix{ data: { current_action: action } } .js-file-title.file-title.clearfix{ data: { current_action: action } }
.editor-ref .editor-ref
= icon('code-fork') = icon('code-fork')
......
---
title: Removed extra border radius from .file-editor and .file-holder when editing
a file
merge_request: 14803
author: Rachel Pipkin
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