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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
cab9445a
Commit
cab9445a
authored
Mar 23, 2019
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restructure and deduplicate table.code styling
parent
8b700922
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
109 additions
and
141 deletions
+109
-141
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+108
-140
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-1
No files found.
app/assets/stylesheets/pages/diff.scss
View file @
cab9445a
...
...
@@ -89,132 +89,6 @@
}
}
table
.code
{
width
:
100%
;
font-family
:
$monospace-font
;
border
:
0
;
border-collapse
:
separate
;
margin
:
0
;
padding
:
0
;
table-layout
:
fixed
;
border-radius
:
0
0
$border-radius-default
$border-radius-default
;
.diff-line-num
{
width
:
50px
;
position
:
relative
;
a
{
transition
:
none
;
}
}
.line_holder
td
{
line-height
:
$code-line-height
;
font-size
:
$code-font-size
;
vertical-align
:
top
;
&
.noteable_line
{
position
:
relative
;
}
span
{
white-space
:
pre-wrap
;
&
.context-cell
{
display
:
inline-block
;
width
:
100%
;
height
:
100%
;
}
}
.line
{
word-wrap
:
break-word
;
}
}
&
.left-side-selected
{
td
.line_content.parallel.right-side
{
user-select
:
none
;
}
}
&
.right-side-selected
{
td
.line_content.parallel.left-side
{
user-select
:
none
;
}
}
}
tr
.line_holder.parallel
{
td
.line_content.parallel
{
width
:
46%
;
}
.add-diff-note
{
margin-left
:
-55px
;
}
}
.old_line
,
.new_line
{
user-select
:
none
;
margin
:
0
;
border
:
0
;
padding
:
0
5px
;
border-right
:
1px
solid
;
text-align
:
right
;
min-width
:
35px
;
max-width
:
50px
;
width
:
35px
;
a
{
float
:
left
;
width
:
35px
;
font-weight
:
$gl-font-weight-normal
;
&
[
disabled
]
{
cursor
:
default
;
&
:hover
,
&
:active
{
text-decoration
:
none
;
}
}
}
}
.line_content
{
display
:
block
;
margin
:
0
;
padding
:
0
1
.5em
;
border
:
0
;
position
:
relative
;
&
.parallel
{
display
:
table-cell
;
span
{
word-break
:
break-all
;
}
}
&
.old
{
&
:
:
before
{
content
:
'-'
;
position
:
absolute
;
left
:
0
.5em
;
}
}
&
.new
{
&
:
:
before
{
content
:
'+'
;
position
:
absolute
;
left
:
0
.5em
;
}
}
}
.diff-loading-error-block
{
padding
:
$gl-padding
*
2
$gl-padding
;
text-align
:
center
;
...
...
@@ -437,10 +311,6 @@
}
}
.line_content
{
white-space
:
pre-wrap
;
}
.diff-file-container
{
.frame.deleted
{
border
:
1px
solid
$deleted
;
...
...
@@ -502,6 +372,114 @@
}
}
table
.code
{
width
:
100%
;
font-family
:
$monospace-font
;
border
:
0
;
border-collapse
:
separate
;
margin
:
0
;
padding
:
0
;
table-layout
:
fixed
;
border-radius
:
0
0
$border-radius-default
$border-radius-default
;
tr
.line_holder
td
{
line-height
:
$code-line-height
;
font-size
:
$code-font-size
;
vertical-align
:
top
;
span
{
white-space
:
pre-wrap
;
&
.context-cell
{
display
:
inline-block
;
width
:
100%
;
height
:
100%
;
}
&
.line
{
word-wrap
:
break-word
;
}
}
&
.diff-line-num
{
user-select
:
none
;
margin
:
0
;
border
:
0
;
padding
:
0
10px
0
5px
;
border-right
:
1px
solid
;
text-align
:
right
;
width
:
50px
;
position
:
relative
;
a
{
transition
:
none
;
float
:
left
;
width
:
100%
;
font-weight
:
$gl-font-weight-normal
;
&
[
disabled
]
{
cursor
:
default
;
&
:hover
,
&
:active
{
text-decoration
:
none
;
}
}
}
&
:not
(
.js-unfold-bottom
)
a
::before
{
content
:
attr
(
data-linenumber
);
}
}
&
.line_content
{
display
:
block
;
margin
:
0
;
padding
:
0
1
.5em
;
border
:
0
;
position
:
relative
;
white-space
:
pre-wrap
;
&
.parallel
{
display
:
table-cell
;
width
:
46%
;
span
{
word-break
:
break-all
;
}
}
&
.old
{
&
:
:
before
{
content
:
'-'
;
position
:
absolute
;
left
:
0
.5em
;
}
}
&
.new
{
&
:
:
before
{
content
:
'+'
;
position
:
absolute
;
left
:
0
.5em
;
}
}
}
}
&
.left-side-selected
{
td
.line_content.parallel.right-side
{
user-select
:
none
;
}
}
&
.right-side-selected
{
td
.line_content.parallel.left-side
{
user-select
:
none
;
}
}
}
.diff-stats
{
align-items
:
center
;
padding
:
0
0
.25rem
;
...
...
@@ -602,16 +580,6 @@
}
}
.file-holder
{
.diff-line-num
:not
(
.js-unfold-bottom
)
{
a
{
&
:
:
before
{
content
:
attr
(
data-linenumber
);
}
}
}
}
.diff-comment-avatar-holders
{
position
:
absolute
;
height
:
19px
;
...
...
app/assets/stylesheets/pages/notes.scss
View file @
cab9445a
...
...
@@ -736,7 +736,7 @@ $note-form-margin-left: 72px;
.add-diff-note
{
@include
btn-comment-icon
;
opacity
:
0
;
margin-left
:
-5
5
px
;
margin-left
:
-5
0
px
;
position
:
absolute
;
top
:
50%
;
transform
:
translateY
(
-50%
);
...
...
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