Download as
Browse Code »

Commit 8e989d4863d6425f87e3a7230ff86823b6b2e551

Authored by Valeriy Sizov
1 parent 7a0a552b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

revert all wiki changes

Showing 4 changed files with 18 additions and 22 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/files.scss
  Diff comments   View file @8e989d4
... ... @@ -37,6 +37,20 @@
37 37 background:#fff;
38 38 font-size: 11px;
39 39  
  40 + &.wiki {
  41 + font-size: 13px;
  42 + code {
  43 + padding:0 4px;
  44 + }
  45 + padding:20px;
  46 + h1, h2 {
  47 + line-height: 46px;
  48 + }
  49 + h3, h4 {
  50 + line-height: 40px;
  51 + }
  52 + }
  53 +
40 54 &.image_file {
41 55 background:#eee;
42 56 text-align:center;
... ...
app/assets/stylesheets/main.scss
  Diff comments   View file @8e989d4
... ... @@ -189,9 +189,3 @@ $hover: #D9EDF7;
189 189 *
190 190 */
191 191 @import "sections/editor.scss";
192   -
193   -/**
194   - * Wiki styles
195   - *
196   - */
197   -@import "sections/wiki.scss";
... ...
app/assets/stylesheets/sections/wiki.scss
View file @7a0a552
... ... @@ -1,13 +0,0 @@
1   -.wiki {
2   - font-size: 13px;
3   - code {
4   - padding:0 4px;
5   - }
6   - padding:20px;
7   - h1, h2 {
8   - line-height: 46px;
9   - }
10   - h3, h4 {
11   - line-height: 40px;
12   - }
13   -}
app/views/wikis/show.html.haml
  Diff comments   View file @8e989d4
... ... @@ -10,9 +10,10 @@
10 10 %i.icon-edit
11 11 Edit
12 12 %br
13   -.file_content.wiki
14   - = preserve do
15   - = markdown @wiki.content
  13 +.file_holder
  14 + .file_content.wiki
  15 + = preserve do
  16 + = markdown @wiki.content
16 17  
17 18 %p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago
18 19 - if can? current_user, :admin_wiki, @project
... ...