Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
57a1ca924af1
Commit
5da1c23b
authored
May 18, 2016
by
Dmitriy Zaporozhets
Browse files
Merge branch 'fix-typo-zen-control' into 'master'
Fixed typo in zen.scss and corresponding views See merge request !4045
parents
0ca80ede1a47
c4aa6d89c18e
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/framework/zen.scss
View file @
57a1ca92
...
...
@@ -32,7 +32,7 @@
}
}
.zen-cotrol
{
.zen-co
n
trol
{
padding
:
0
;
color
:
#555
;
background
:
none
;
...
...
app/views/projects/_md_preview.html.haml
View file @
57a1ca92
...
...
@@ -8,7 +8,7 @@
%a
.js-md-preview-button
{
href:
"#md-preview-holder"
,
tabindex:
-
1
}
Preview
%li
.pull-right
%button
.zen-cotrol.zen-control-full.js-zen-enter
{
type:
'button'
,
tabindex:
-
1
}
%button
.zen-co
n
trol.zen-control-full.js-zen-enter
{
type:
'button'
,
tabindex:
-
1
}
Go full screen
.md-write-holder
...
...
app/views/projects/_zen.html.haml
View file @
57a1ca92
...
...
@@ -4,5 +4,5 @@
=
f
.
text_area
attr
,
class:
classes
,
placeholder:
placeholder
-
else
=
text_area_tag
attr
,
nil
,
class:
classes
,
placeholder:
placeholder
%a
.zen-cotrol.zen-control-leave.js-zen-leave
{
href:
"#"
}
%a
.zen-co
n
trol.zen-control-leave.js-zen-leave
{
href:
"#"
}
=
icon
(
'compress'
)
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