Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
bfda3acd
Commit
bfda3acd
authored
Oct 16, 2017
by
Rachel Pipkin
Committed by
Annabel Dunstone Gray
Oct 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove extra border radius when editing a file
parent
7685314f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
2 deletions
+13
-2
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+4
-0
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+1
-1
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+1
-1
changelogs/unreleased/37978-extra-border-radius-while-editing-a-file.yml
...leased/37978-extra-border-radius-while-editing-a-file.yml
+6
-0
No files found.
app/assets/stylesheets/framework/files.scss
View file @
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
;
...
...
app/assets/stylesheets/framework/variables.scss
View file @
bfda3acd
...
@@ -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
;
...
...
app/assets/stylesheets/pages/editor.scss
View file @
bfda3acd
...
@@ -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
;
}
}
...
...
app/views/projects/blob/_editor.html.haml
View file @
bfda3acd
-
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'
)
...
...
changelogs/unreleased/37978-extra-border-radius-while-editing-a-file.yml
0 → 100644
View file @
bfda3acd
---
title
:
Removed extra border radius from .file-editor and .file-holder when editing
a file
merge_request
:
14803
author
:
Rachel Pipkin
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment