Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
d39948a8
Unverified
Commit
d39948a8
authored
Feb 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore old padding for wiki blocks
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
c61512d4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
19 deletions
+18
-19
app/assets/stylesheets/generic/files.scss
app/assets/stylesheets/generic/files.scss
+1
-0
app/assets/stylesheets/generic/issue_box.scss
app/assets/stylesheets/generic/issue_box.scss
+5
-6
app/assets/stylesheets/main/mixins.scss
app/assets/stylesheets/main/mixins.scss
+0
-4
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+4
-3
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+4
-3
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+4
-3
No files found.
app/assets/stylesheets/generic/files.scss
View file @
d39948a8
...
...
@@ -52,6 +52,7 @@
&
.wiki
{
font-size
:
14px
;
line-height
:
1
.6
;
padding
:
25px
;
.highlight
{
margin-bottom
:
9px
;
...
...
app/assets/stylesheets/generic/issue_box.scss
View file @
d39948a8
...
...
@@ -18,17 +18,16 @@
}
.title
{
font-size
:
2
0
px
;
font-size
:
2
2
px
;
font-weight
:
500
;
line-height
:
28px
;
line-height
:
1
.5
;
margin
:
0
;
color
:
#444
;
border-bottom
:
1px
solid
#eee
;
color
:
#333
;
}
.context
{
border
:
none
;
border-
bottom
:
1px
solid
#eee
;
border-
top
:
1px
solid
#eee
;
}
.description
{
...
...
@@ -36,7 +35,7 @@
}
.title
,
.context
,
.description
{
padding
:
15px
15px
15px
30
px
;
padding
:
15px
25
px
;
.clearfix
{
margin
:
0
;
...
...
app/assets/stylesheets/main/mixins.scss
View file @
d39948a8
...
...
@@ -114,10 +114,6 @@
font-size
:
1
.2em
;
}
// Larger 30px left margin is required for the header link icon.
// Use on all markdown including those without header links for uniformity.
margin
:
20px
20px
20px
30px
;
blockquote
p
{
color
:
#888
;
font-size
:
14px
;
...
...
app/views/projects/issues/show.html.haml
View file @
d39948a8
...
...
@@ -46,9 +46,10 @@
=
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
}
-
if
@issue
.
description
.
present?
.wiki
=
preserve
do
=
markdown
@issue
.
description
.description
.wiki
=
preserve
do
=
markdown
@issue
.
description
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:modify_issue
,
@issue
)
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
d39948a8
...
...
@@ -15,9 +15,10 @@
-
if
@merge_request
.
description
.
present?
.wiki
=
preserve
do
=
markdown
@merge_request
.
description
.description
.wiki
=
preserve
do
=
markdown
@merge_request
.
description
-
if
@merge_request
.
closed?
.description.alert-danger
...
...
app/views/projects/milestones/show.html.haml
View file @
d39948a8
...
...
@@ -43,9 +43,10 @@
.progress-bar
{
style:
"width: #{@milestone.percent_complete}%;"
}
-
if
@milestone
.
description
.
present?
.wiki
=
preserve
do
=
markdown
@milestone
.
description
.description
.wiki
=
preserve
do
=
markdown
@milestone
.
description
%ul
.nav.nav-tabs.append-bottom-10
%li
.active
...
...
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