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
22ea25ae
Commit
22ea25ae
authored
Jun 17, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make lists looks the same when preview mode and published
parent
39a3ab7f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
13 deletions
+19
-13
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+2
-0
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+14
-0
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+3
-13
No files found.
app/assets/stylesheets/framework/markdown_area.scss
View file @
22ea25ae
...
@@ -97,5 +97,7 @@
...
@@ -97,5 +97,7 @@
white-space
:
pre-wrap
;
white-space
:
pre-wrap
;
word-break
:
keep-all
;
word-break
:
keep-all
;
}
}
@include
bulleted-list
;
}
}
}
}
app/assets/stylesheets/framework/mixins.scss
View file @
22ea25ae
...
@@ -110,3 +110,17 @@
...
@@ -110,3 +110,17 @@
font-size
:
16px
;
font-size
:
16px
;
line-height
:
24px
;
line-height
:
24px
;
}
}
@mixin
bulleted-list
{
>
ul
{
list-style-type
:
disc
;
ul
{
list-style-type
:
circle
;
ul
{
list-style-type
:
square
;
}
}
}
}
\ No newline at end of file
app/assets/stylesheets/pages/notes.scss
View file @
22ea25ae
...
@@ -84,24 +84,14 @@ ul.notes {
...
@@ -84,24 +84,14 @@ ul.notes {
word-wrap
:
break-word
;
word-wrap
:
break-word
;
@include
md-typography
;
@include
md-typography
;
// Reset ul style types since we're nested inside a ul already
@include
bulleted-list
;
// On diffs code should wrap nicely and not overflow
// On diffs code should wrap nicely and not overflow
code
{
code
{
white-space
:
pre-wrap
;
white-space
:
pre-wrap
;
}
}
// Reset ul style types since we're nested inside a ul already
&
>
ul
{
list-style-type
:
disc
;
ul
{
list-style-type
:
circle
;
ul
{
list-style-type
:
square
;
}
}
}
ul
.task-list
{
ul
.task-list
{
ul
:not
(
.task-list
)
{
ul
:not
(
.task-list
)
{
padding-left
:
1
.3em
;
padding-left
:
1
.3em
;
...
...
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