Merged master

--HG--
branch : kf-highlight-speed

sass/discussion/_badges.scss

@@ -4,9 +4,19 @@ div.badges-intro {
 
 div.badge-intro {
   @extend .badges-intro;
+
   .badge1, .badge2, .badge3 {
     font-size: 20px;
   }
+
+
+}
+
+div#award-list{
+  li.username {
+    font-size: 20px;
+    margin-bottom: 8px;
+  }
 }
 
 ul.badge-list {

sass/discussion/_question-view.scss

@@ -185,6 +185,11 @@ div.question-header {
 
         form.post-comments {
           padding: 15px;
+
+           button:last-child {
+            margin-left: 10px;
+            @extend .light-button;
+          }
         }
 
         div.comment {

sass/wiki/_basic-html.scss

 section.wiki-body {
+   h1 {
+    font-weight: bold;
+    font-size: 2em;
+    margin-bottom: 25px;
+   }
+
   div#wiki_article {
-    html, address,
-    blockquote,
-    body, dd, div,
-    dl, dt, fieldset, form,
-    frame, frameset,
-    h1, h2, h3, h4,
-    h5, h6, noframes,
-    ol, p, ul, center,
-    dir, hr, menu, pre   { 
+    html, address, blockquote, body, dd, div, dl, dt, fieldset, form, frame, frameset, h1, h2, h3, h4, h5, h6, noframes, ol, p, ul, center, dir, hr, menu, pre   {
       display: block;
       unicode-bidi: embed
     }
@@ -61,40 +59,34 @@ section.wiki-body {
     }
 
     h1 {
-      font-size: 2.4em;
+      font-size: 1.6em;
       margin: .67em 0;
       letter-spacing: 0px;
     }
 
     h2 {
       text-transform: none;
-      font-size: 2em;
+      font-size: 1.4em;
       margin: .75em 0;
       letter-spacing: 0px;
     }
 
     h3 {
-      font-size: 1.75em;
+      font-size: 1.2em;
       margin: .83em 0;
     }
 
     h4 {
-      font-size: 1.25em;
+      font-size: 1.1em;
     }
 
-    h4, p,
-    blockquote, ul,
-    fieldset, form,
-    ol, dl, dir,
-    menu            { margin: 1.12em 0 }
+    h4, p, blockquote, ul, fieldset, form, ol, dl, dir, menu  { margin: 1.12em 0 }
 
-    h5              { font-size: 1.25em; margin: 1.5em 0 }
+    h5 { font-size: 1em; margin: 1.5em 0 }
 
-    h6              { font-size: 1em; margin: 1.67em 0 }
+    h6 { font-size: 0.5em; margin: 1.67em 0 }
 
-    h1, h2, h3, h4,
-    h5, h6, b,
-    strong          { font-weight: bolder }
+    b, strong { font-weight: bolder }
 
     blockquote      {
       padding: 10px 20px;
@@ -102,18 +94,15 @@ section.wiki-body {
       border-left: 4px solid;
     }
 
-    i, cite, em,
-    var, address    { font-style: italic }
+    i, cite, em, var, address  { font-style: italic }
 
-    pre, tt, code,
-    kbd, samp       { 
+    pre, tt, code, kbd, samp  {
       font-family: monospace;
     }
 
     pre { white-space: pre }
 
-    button, textarea,
-    input, select   { display: inline-block }
+    button, textarea, input, select   { display: inline-block }
 
     big { font-size: 1.17em }
 
@@ -125,8 +114,7 @@ section.wiki-body {
 
     table { border-spacing: 2px; }
 
-    thead, tbody,
-    tfoot           { vertical-align: middle }
+    thead, tbody, tfoot { vertical-align: middle }
 
     td, th, tr { vertical-align: inherit }
 
@@ -134,13 +122,11 @@ section.wiki-body {
 
     hr { height: 1px; background: #999; border: none;}
 
-    ol, ul, dir,
-    menu, dd        { margin-left: 40px }
+    ol, ul, dir, menu, dd { margin-left: 40px }
 
     ol { list-style-type: decimal }
 
-    ol ul, ul ol,
-    ul ul, ol ol    { margin-top: 0; margin-bottom: 0 }
+    ol ul, ul ol, ul ul, ol ol    { margin-top: 0; margin-bottom: 0 }
 
     u, ins { text-decoration: underline }