Improve wiki typography

diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
index 83954da..865a10e 100644 (file)
--- a/app/assets/stylesheets/gitlab_bootstrap/files.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -37,24 +37,6 @@
     background: #fff;
     font-size: 11px;
 
-    &.wiki {
-      font-size: 13px;
-      code {
-        padding: 0 4px;
-      }
-      padding: 20px;
-
-      h1 { font-size: 26px; line-height: 46px; }
-      h2 { font-size: 22px; line-height: 42px; }
-      h3 { font-size: 20px; line-height: 40px; }
-      h4 { font-size: 18px; line-height: 32px; }
-      h5 { font-size: 16px; line-height: 26px; }
-
-      .white .highlight pre {
-        background: #f5f5f5;
-      }
-    }
-
     &.image_file {
       background: #eee;
       text-align: center;
@@ -64,6 +46,11 @@
       }
     }
 
+    &.wiki {
+      padding: 20px;
+      font-size: 13px;
+    }
+
     &.blob_file {
 
     }

diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
index 81fb79a..e74a0de 100644 (file)
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -81,3 +81,22 @@ a:focus {
 .monospace {
   font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
 }
+
+/**
+ * Wiki typography
+ *
+ */
+.wiki {
+  font-size: 13px;
+
+  code { padding: 0 4px; }
+  p { font-size: 13px; }
+  h1 { font-size: 32px; line-height: 40px; margin: 10px 0;}
+  h2 { font-size: 26px; line-height: 40px; margin: 10px 0;}
+  h3 { font-size: 22px; line-height: 40px; margin: 10px 0;}
+  h4 { font-size: 18px; line-height: 20px; margin: 10px 0;}
+  h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
+  h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
+  .white .highlight pre { background: #f5f5f5; }
+  ul { margin: 0 0 9px 25px !important; }
+}

diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index b96af36..10f647d 100644 (file)
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -51,8 +51,9 @@
 
   - if @issue.description.present?
     .ui-box-bottom
-      = preserve do
-        = markdown @issue.description
+      .wiki
+        = preserve do
+          = markdown @issue.description
 
 
 .issue_notes.voting_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"