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
af3284d9
Commit
af3284d9
authored
Mar 30, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Focus style for comment form
parent
38e32780
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
14 deletions
+33
-14
app/assets/javascripts/notes.js.coffee
app/assets/javascripts/notes.js.coffee
+6
-0
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+2
-5
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+24
-8
app/views/projects/notes/_hints.html.haml
app/views/projects/notes/_hints.html.haml
+1
-1
No files found.
app/assets/javascripts/notes.js.coffee
View file @
af3284d9
...
@@ -288,6 +288,12 @@ class @Notes
...
@@ -288,6 +288,12 @@ class @Notes
else
else
previewButton
.
removeClass
(
"turn-on"
).
addClass
"turn-off"
previewButton
.
removeClass
(
"turn-on"
).
addClass
"turn-off"
textarea
.
on
'focus'
,
->
$
(
this
).
closest
(
'.md-area'
).
addClass
'is-focused'
textarea
.
on
'blur'
,
->
$
(
this
).
closest
(
'.md-area'
).
removeClass
'is-focused'
autosize
(
textarea
)
autosize
(
textarea
)
new
Autosave
textarea
,
[
new
Autosave
textarea
,
[
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
af3284d9
...
@@ -82,11 +82,8 @@
...
@@ -82,11 +82,8 @@
}
}
.md-preview-holder
{
.md-preview-holder
{
background
:
#fff
;
min-height
:
167px
;
border
:
1px
solid
#ddd
;
padding
:
10px
0
;
min-height
:
169px
;
padding
:
5px
;
box-shadow
:
none
;
}
}
.markdown-area
{
.markdown-area
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
af3284d9
...
@@ -44,8 +44,7 @@
...
@@ -44,8 +44,7 @@
}
}
.note-textarea
{
.note-textarea
{
padding-left
:
0
;
padding
:
10px
0
;
padding-right
:
0
;
font-family
:
$regular_font
;
font-family
:
$regular_font
;
border
:
0
;
border
:
0
;
...
@@ -63,8 +62,18 @@
...
@@ -63,8 +62,18 @@
.common-note-form
{
.common-note-form
{
.md-area
{
.md-area
{
padding
:
$gl-padding-top
$gl-padding
;
padding
:
$gl-padding-top
$gl-padding
;
border
:
1px
solid
#
E5E5E
5
;
border
:
1px
solid
#
e5e5e
5
;
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
&
.is-focused
{
border-color
:
#3b99fc
;
box-shadow
:
0
0
4px
rgba
(
#3b99fc
,
.7
);
.comment-toolbar
,
.nav-links
{
border-color
:
#3b99fc
;
}
}
}
}
}
}
...
@@ -156,8 +165,6 @@
...
@@ -156,8 +165,6 @@
}
}
.toolbar-button
{
.toolbar-button
{
float
:
left
;
margin-right
:
$gl-padding
;
padding
:
0
;
padding
:
0
;
background
:
none
;
background
:
none
;
border
:
0
;
border
:
0
;
...
@@ -171,8 +178,14 @@
...
@@ -171,8 +178,14 @@
outline
:
0
;
outline
:
0
;
}
}
&
:last-child
{
@media
(
min-width
:
$screen-md-min
)
{
margin-right
:
0
;
float
:
left
;
margin-right
:
$gl-padding
;
&
:last-child
{
float
:
right
;
margin-right
:
0
;
}
}
}
}
}
...
@@ -185,8 +198,11 @@
...
@@ -185,8 +198,11 @@
}
}
.toolbar-text
{
.toolbar-text
{
float
:
left
;
color
:
#959494
;
color
:
#959494
;
font-size
:
14px
;
font-size
:
14px
;
line-height
:
16px
;
line-height
:
16px
;
@media
(
min-width
:
$screen-md-min
)
{
float
:
left
;
}
}
}
app/views/projects/notes/_hints.html.haml
View file @
af3284d9
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
Styling with
Styling with
=
link_to
'Markdown'
,
help_page_path
(
'markdown'
,
'markdown'
),
target:
'_blank'
,
tabindex:
-
1
=
link_to
'Markdown'
,
help_page_path
(
'markdown'
,
'markdown'
),
target:
'_blank'
,
tabindex:
-
1
is supported
is supported
%button
.toolbar-button.markdown-selector
.pull-right
{
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
...
...
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