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
d3ff7ca0
Commit
d3ff7ca0
authored
Apr 11, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Input updates
parent
447f3613
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
5 deletions
+49
-5
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-0
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+21
-1
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+27
-4
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
d3ff7ca0
...
@@ -142,6 +142,7 @@
...
@@ -142,6 +142,7 @@
overflow
:
hidden
;
overflow
:
hidden
;
font-size
:
90%
;
font-size
:
90%
;
margin
:
0
3px
;
margin
:
0
3px
;
word-break
:
break-all
;
}
}
.mr-list
{
.mr-list
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
d3ff7ca0
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
.new-note
{
.new-note
{
margin
:
0
;
margin
:
0
;
border
:
none
;
border
:
none
;
border-right
:
1px
solid
$table-border-gray
;
}
}
}
}
...
@@ -71,12 +72,25 @@
...
@@ -71,12 +72,25 @@
border-color
:
$focus-border-color
;
border-color
:
$focus-border-color
;
}
}
}
}
p
{
code
{
white-space
:
normal
;
}
pre
{
code
{
white-space
:
pre
;
}
}
}
}
}
}
}
.discussion-form
{
.discussion-form
{
padding
:
$gl-padding-top
$gl-padding
;
padding
:
$gl-padding-top
$gl-padding
;
background-color
:
#fff
;
background-color
:
$white-light
;
border-right
:
1px
solid
$table-border-gray
;
}
}
.note-edit-form
{
.note-edit-form
{
...
@@ -118,7 +132,13 @@
...
@@ -118,7 +132,13 @@
.discussion-reply-holder
{
.discussion-reply-holder
{
background-color
:
$white-light
;
background-color
:
$white-light
;
border-right
:
1px
solid
$table-border-gray
;
padding
:
10px
16px
;
padding
:
10px
16px
;
max-width
:
800px
;
.new-note
{
border-right
:
none
;
}
}
}
}
}
...
...
app/assets/stylesheets/pages/notes.scss
View file @
d3ff7ca0
...
@@ -81,11 +81,17 @@ ul.notes {
...
@@ -81,11 +81,17 @@ ul.notes {
@include
md-typography
;
@include
md-typography
;
// On diffs code should wrap nicely and not overflow
// On diffs code should wrap nicely and not overflow
p
{
code
{
white-space
:
normal
;
}
pre
{
pre
{
code
{
code
{
white-space
:
pre
;
white-space
:
pre
;
}
}
}
}
}
// Reset ul style types since we're nested inside a ul already
// Reset ul style types since we're nested inside a ul already
&
>
ul
{
&
>
ul
{
...
@@ -112,6 +118,10 @@ ul.notes {
...
@@ -112,6 +118,10 @@ ul.notes {
margin
:
10px
0
;
margin
:
10px
0
;
}
}
}
}
a
{
word-break
:
break-all
;
}
}
}
.note-header
{
.note-header
{
...
@@ -127,7 +137,7 @@ ul.notes {
...
@@ -127,7 +137,7 @@ ul.notes {
margin-right
:
10px
;
margin-right
:
10px
;
}
}
.line_content
{
.line_content
{
white-space
:
pre
-wrap
;
white-space
:
pre
;
}
}
}
}
...
@@ -145,20 +155,33 @@ ul.notes {
...
@@ -145,20 +155,33 @@ ul.notes {
background
:
$background-color
;
background
:
$background-color
;
color
:
$text-color
;
color
:
$text-color
;
}
}
&
.notes_line2
{
&
.notes_line2
{
text-align
:
center
;
text-align
:
center
;
padding
:
10px
0
;
padding
:
10px
0
;
border-left
:
1px
solid
#ddd
!
important
;
border-left
:
1px
solid
#ddd
!
important
;
}
}
&
.notes_content
{
&
.notes_content
{
background-color
:
#fff
;
background-color
:
$background-color
;
border-width
:
1px
0
;
border-width
:
1px
0
;
padding
:
0
;
padding
:
0
;
vertical-align
:
top
;
vertical-align
:
top
;
white-space
:
normal
;
white-space
:
normal
;
&
.parallel
{
&
.parallel
{
border-width
:
1px
;
border-width
:
1px
;
}
}
.new-note
{
max-width
:
800px
;
}
.notes
{
max-width
:
800px
;
background-color
:
$white-light
;
border-right
:
1px
solid
$table-border-gray
;
}
}
}
}
}
}
}
...
...
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