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
Léo-Paul Géneau
gitlab-ce
Commits
1725dc08
Commit
1725dc08
authored
May 22, 2017
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
32715 Make all notes use equal padding
parent
374aad38
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
app/assets/stylesheets/framework/timeline.scss
app/assets/stylesheets/framework/timeline.scss
+0
-1
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+0
-4
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+9
-4
changelogs/unreleased/32715-fix-note-padding.yml
changelogs/unreleased/32715-fix-note-padding.yml
+4
-0
No files found.
app/assets/stylesheets/framework/timeline.scss
View file @
1725dc08
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
}
}
.timeline-entry
{
.timeline-entry
{
padding
:
$gl-padding
$gl-btn-padding
0
;
border-color
:
$white-normal
;
border-color
:
$white-normal
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
border-bottom
:
1px
solid
$border-white-light
;
border-bottom
:
1px
solid
$border-white-light
;
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
1725dc08
...
@@ -164,10 +164,6 @@
...
@@ -164,10 +164,6 @@
.discussion-body
,
.discussion-body
,
.diff-file
{
.diff-file
{
.notes
.note
{
padding
:
10px
15px
;
}
.discussion-reply-holder
{
.discussion-reply-holder
{
background-color
:
$white-light
;
background-color
:
$white-light
;
padding
:
10px
16px
;
padding
:
10px
16px
;
...
...
app/assets/stylesheets/pages/notes.scss
View file @
1725dc08
...
@@ -43,7 +43,11 @@ ul.notes {
...
@@ -43,7 +43,11 @@ ul.notes {
}
}
.discussion-body
{
.discussion-body
{
padding-top
:
15px
;
padding-top
:
8px
;
.panel
{
margin-bottom
:
0
;
}
}
}
.discussion
{
.discussion
{
...
@@ -53,6 +57,7 @@ ul.notes {
...
@@ -53,6 +57,7 @@ ul.notes {
}
}
.note
{
.note
{
padding
:
$gl-padding
$gl-btn-padding
0
;
display
:
block
;
display
:
block
;
position
:
relative
;
position
:
relative
;
border-bottom
:
1px
solid
$white-normal
;
border-bottom
:
1px
solid
$white-normal
;
...
@@ -78,7 +83,7 @@ ul.notes {
...
@@ -78,7 +83,7 @@ ul.notes {
&
.note-discussion
{
&
.note-discussion
{
&
.timeline-entry
{
&
.timeline-entry
{
padding
:
14px
10px
;
padding
:
$gl-padding
10px
;
}
}
.system-note
{
.system-note
{
...
@@ -167,7 +172,7 @@ ul.notes {
...
@@ -167,7 +172,7 @@ ul.notes {
margin-left
:
65px
;
margin-left
:
65px
;
}
}
.note-header
{
.note-header
-info
{
padding-bottom
:
0
;
padding-bottom
:
0
;
}
}
...
@@ -377,7 +382,7 @@ ul.notes {
...
@@ -377,7 +382,7 @@ ul.notes {
.note-header-info
{
.note-header-info
{
min-width
:
0
;
min-width
:
0
;
padding-bottom
:
5
px
;
padding-bottom
:
8
px
;
}
}
.note-headline-light
{
.note-headline-light
{
...
...
changelogs/unreleased/32715-fix-note-padding.yml
0 → 100644
View file @
1725dc08
---
title
:
Make all notes use equal padding
merge_request
:
author
:
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