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
Kazuhiko Shiozaki
gitlab-ce
Commits
8e989d48
Commit
8e989d48
authored
Oct 17, 2012
by
Valeriy Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert all wiki changes
parent
7a0a552b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
22 deletions
+18
-22
app/assets/stylesheets/gitlab_bootstrap/files.scss
app/assets/stylesheets/gitlab_bootstrap/files.scss
+14
-0
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+0
-6
app/assets/stylesheets/sections/wiki.scss
app/assets/stylesheets/sections/wiki.scss
+0
-13
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+4
-3
No files found.
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @
8e989d48
...
@@ -37,6 +37,20 @@
...
@@ -37,6 +37,20 @@
background
:
#fff
;
background
:
#fff
;
font-size
:
11px
;
font-size
:
11px
;
&
.wiki
{
font-size
:
13px
;
code
{
padding
:
0
4px
;
}
padding
:
20px
;
h1
,
h2
{
line-height
:
46px
;
}
h3
,
h4
{
line-height
:
40px
;
}
}
&
.image_file
{
&
.image_file
{
background
:
#eee
;
background
:
#eee
;
text-align
:center
;
text-align
:center
;
...
...
app/assets/stylesheets/main.scss
View file @
8e989d48
...
@@ -189,9 +189,3 @@ $hover: #D9EDF7;
...
@@ -189,9 +189,3 @@ $hover: #D9EDF7;
*
*
*/
*/
@import
"sections/editor.scss"
;
@import
"sections/editor.scss"
;
/**
* Wiki styles
*
*/
@import
"sections/wiki.scss"
;
app/assets/stylesheets/sections/wiki.scss
deleted
100644 → 0
View file @
7a0a552b
.wiki
{
font-size
:
13px
;
code
{
padding
:
0
4px
;
}
padding
:
20px
;
h1
,
h2
{
line-height
:
46px
;
}
h3
,
h4
{
line-height
:
40px
;
}
}
app/views/wikis/show.html.haml
View file @
8e989d48
...
@@ -10,9 +10,10 @@
...
@@ -10,9 +10,10 @@
%i
.icon-edit
%i
.icon-edit
Edit
Edit
%br
%br
.file_content.wiki
.file_holder
=
preserve
do
.file_content.wiki
=
markdown
@wiki
.
content
=
preserve
do
=
markdown
@wiki
.
content
%p
.time
Last edited by
#{
@wiki
.
user
.
name
}
,
#{
time_ago_in_words
@wiki
.
created_at
}
ago
%p
.time
Last edited by
#{
@wiki
.
user
.
name
}
,
#{
time_ago_in_words
@wiki
.
created_at
}
ago
-
if
can?
current_user
,
:admin_wiki
,
@project
-
if
can?
current_user
,
:admin_wiki
,
@project
...
...
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