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
Boxiang Sun
gitlab-ce
Commits
7717cb72
Commit
7717cb72
authored
May 27, 2016
by
Jacob Schatz
Committed by
Phil Hughes
Jun 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move buttons to upper right.
parent
07d6edc1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
13 deletions
+30
-13
app/assets/javascripts/lib/text_utility.js.coffee
app/assets/javascripts/lib/text_utility.js.coffee
+1
-1
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+5
-0
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+23
-2
app/views/projects/notes/_hints.html.haml
app/views/projects/notes/_hints.html.haml
+1
-10
No files found.
app/assets/javascripts/lib/text_utility.js.coffee
View file @
7717cb72
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
text
,
text
,
textArea
.
selectionStart
,
textArea
.
selectionStart
,
textArea
.
selectionEnd
,
textArea
.
selectionEnd
,
(
"
#{
lineBreak
}#{
tag
}
#{
selObj
.
toString
()
}
\n
"
)
(
"
#{
lineBreak
}#{
tag
}#{
selObj
.
toString
()
}
\n
"
)
)
)
$textArea
.
data
(
'old-val'
,
text
).
val
(
replaceWith
);
$textArea
.
data
(
'old-val'
,
text
).
val
(
replaceWith
);
gl
.
text
.
undoManager
.
addUndo
(
oldVal
,
$textArea
.
val
())
gl
.
text
.
undoManager
.
addUndo
(
oldVal
,
$textArea
.
val
())
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
7717cb72
...
@@ -65,6 +65,11 @@
...
@@ -65,6 +65,11 @@
a
{
a
{
padding-top
:
0
;
padding-top
:
0
;
line-height
:
1
;
line-height
:
1
;
border-bottom
:
1px
solid
$border-color
;
&
.btn.btn-xs
{
padding
:
2px
5px
;
}
}
}
}
}
}
}
...
...
app/views/projects/_md_preview.html.haml
View file @
7717cb72
...
@@ -14,8 +14,29 @@
...
@@ -14,8 +14,29 @@
%span
This is a confidential issue. Your comment will not be visible to the public.
%span
This is a confidential issue. Your comment will not be visible to the public.
%li
.pull-right
%li
.pull-right
%button
.zen-control.zen-control-full.js-zen-enter
{
type:
'button'
,
tabindex:
-
1
}
Go full screen
%a
.btn.btn-xs.js-md
{
'data-md-tag'
=>
'**'
}
=
icon
(
'bold fw'
)
%a
.btn.btn-xs.js-md
{
'data-md-tag'
=>
'*'
}
=
icon
(
'italic fw'
)
%a
.btn.btn-xs.js-md
{
'data-md-tag'
=>
'`'
}
=
icon
(
'code fw'
)
%a
.btn.btn-xs.js-md.js-list
{
'data-md-tag'
=>
'* '
,
'data-md-prepend'
=>
true
}
=
icon
(
'list-ul fw'
)
%a
.btn.btn-xs.js-md.js-list.hidden-xs
{
'data-md-tag'
=>
'1. '
,
'data-md-prepend'
=>
true
}
=
icon
(
'list-ol fw'
)
%a
.btn.btn-xs.js-md.js-list.hidden-xs
{
'data-md-tag'
=>
'* [ ] '
,
'data-md-prepend'
=>
true
}
=
icon
(
'check-square-o fw'
)
%a
.btn.btn-xs.js-md.js-list.hidden-xs
{
'data-md-tag'
=>
'> '
,
'data-md-prepend'
=>
true
}
=
icon
(
'quote-right fw'
)
%a
.btn.btn-xs.js-md.js-list.hidden-xs
{
'data-md-tag'
=>
'!'
,
'data-md-prepend'
=>
true
}
=
icon
(
'tasks fw'
)
%a
.btn.btn-xs.js-md.js-list.hidden-xs
{
'data-md-tag'
=>
'#'
,
'data-md-prepend'
=>
true
}
=
icon
(
'exclamation-circle fw'
)
%a
.btn.btn-xs.js-zen-enter.hidden-xs
=
icon
(
'arrows-alt fw'
)
.md-write-holder
.md-write-holder
=
yield
=
yield
...
...
app/views/projects/notes/_hints.html.haml
View file @
7717cb72
...
@@ -5,13 +5,4 @@
...
@@ -5,13 +5,4 @@
is supported
is supported
%button
.toolbar-button.markdown-selector
{
type:
'button'
,
tabindex:
'-1'
}
%button
.toolbar-button.markdown-selector
{
type:
'button'
,
tabindex:
'-1'
}
=
icon
(
'file-image-o'
,
class:
'toolbar-button-icon'
)
=
icon
(
'file-image-o'
,
class:
'toolbar-button-icon'
)
Attach a file
Attach a file
.md-helper
\ No newline at end of file
%a
.btn.btn-xs.js-md
{
'data-md-tag'
=>
'**'
}
=
icon
(
'bold fw'
)
%a
.btn.btn-xs.js-md
{
'data-md-tag'
=>
'*'
}
=
icon
(
'italic fw'
)
%a
.btn.btn-xs.js-md.js-list
{
'data-md-tag'
=>
'*'
,
'data-md-prepend'
=>
true
}
=
icon
(
'list-ul fw'
)
%a
.btn.btn-xs.js-md.js-list
{
'data-md-tag'
=>
'1.'
,
'data-md-prepend'
=>
true
}
=
icon
(
'list-ol fw'
)
\ No newline at end of file
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