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
ef2fb201
Commit
ef2fb201
authored
Sep 21, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More tweaks to make note edit/preview CSS consistent
Closes #2585
parent
abaa65ef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/generic/typography.scss
+4
-0
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+1
-1
app/views/projects/notes/_edit_form.html.haml
app/views/projects/notes/_edit_form.html.haml
+1
-1
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/typography.scss
View file @
ef2fb201
...
...
@@ -105,6 +105,10 @@ textarea.js-gfm-input {
font-family
:
$monospace_font
;
}
.md-preview
{
font-family
:
$monospace_font
;
}
.strikethrough
{
text-decoration
:
line-through
;
}
app/assets/stylesheets/pages/note_form.scss
View file @
ef2fb201
...
...
@@ -109,7 +109,7 @@
.note-edit-form
{
display
:
none
;
font-size
:
1
3
px
;
font-size
:
1
5
px
;
.form-actions
{
padding-left
:
20px
;
...
...
app/views/projects/notes/_edit_form.html.haml
View file @
ef2fb201
.note-edit-form
=
form_for
note
,
url:
namespace_project_note_path
(
@project
.
namespace
,
@project
,
note
),
method: :put
,
remote:
true
,
authenticity_token:
true
do
|
f
|
=
note_target_fields
(
note
)
=
render
layout:
'projects/md_preview'
,
locals:
{
preview_class:
'
note-text
'
}
do
=
render
layout:
'projects/md_preview'
,
locals:
{
preview_class:
'
md-preview
'
}
do
=
render
'projects/zen'
,
f:
f
,
attr: :note
,
classes:
'note_text js-note-text js-task-list-field'
=
render
'projects/notes/hints'
...
...
app/views/projects/notes/_form.html.haml
View file @
ef2fb201
...
...
@@ -7,7 +7,7 @@
=
f
.
hidden_field
:noteable_id
=
f
.
hidden_field
:noteable_type
=
render
layout:
'projects/md_preview'
,
locals:
{
preview_class:
"
note-text
"
,
referenced_users:
true
}
do
=
render
layout:
'projects/md_preview'
,
locals:
{
preview_class:
"
md-preview
"
,
referenced_users:
true
}
do
=
render
'projects/zen'
,
f:
f
,
attr: :note
,
classes:
'note_text js-note-text'
=
render
'projects/notes/hints'
.error-alert
...
...
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