From ff1f090737d1e6377bd5ced1ac4e6b71886022a8 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Wed, 15 Aug 2012 12:48:14 -0400
Subject: [PATCH] Added more fixes for askbot also fixed some of the extra
 padding

---
 lms/static/sass/course/_textbook.scss         |  4 +--
 lms/static/sass/course/base/_extends.scss     |  7 +++--
 .../sass/course/courseware/_courseware.scss   |  3 +-
 .../sass/course/discussion/_answers.scss      | 18 ++++++++---
 .../sass/course/discussion/_badges.scss       | 21 ++++++++-----
 .../sass/course/discussion/_discussion.scss   |  2 +-
 lms/static/sass/course/discussion/_forms.scss | 11 ++++++-
 .../course/discussion/_question-view.scss     | 30 ++++++++++---------
 .../sass/course/discussion/_questions.scss    | 19 +++++++-----
 .../sass/course/discussion/_sidebar.scss      | 22 +++++---------
 lms/static/sass/shared/_forms.scss            |  1 +
 11 files changed, 83 insertions(+), 55 deletions(-)

diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss
index 8e88f8befd..8bbfa67b1c 100644
--- a/lms/static/sass/course/_textbook.scss
+++ b/lms/static/sass/course/_textbook.scss
@@ -10,7 +10,6 @@ div.book-wrapper {
       font-size: em(14);
 
       .chapter-number {
-        
       }
 
       .chapter {
@@ -81,9 +80,8 @@ div.book-wrapper {
 
   section.book {
     @extend .content;
-    padding-bottom: 0;
     padding-right: 0;
-    padding-top: 0;
+    padding-left: lh();
 
     nav {
       @extend .clearfix;
diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 04eaf73094..a438b93150 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -12,10 +12,13 @@ h1.top-header {
   @include box-shadow(inset 0 1px 0 #fff);
   color: #666;
   cursor: pointer;
-  font: normal $body-font-size $body-font-family;
+  font: 400 $body-font-size $body-font-family;
   @include linear-gradient(#fff, lighten(#888, 40%));
   padding: 4px 8px;
   text-decoration: none;
+  text-shadow: none;
+  text-transform: none;
+  letter-spacing: 0;
   -webkit-font-smoothing: antialiased;
 
   &:hover, &:focus {
@@ -28,7 +31,7 @@ h1.top-header {
 .content {
   @include box-sizing(border-box);
   display: table-cell;
-  padding: lh();
+  padding-right: lh();
   vertical-align: top;
   width: flex-grid(9) + flex-gutter();
 
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index 198902c146..24bea4dd84 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -12,7 +12,8 @@ div.course-wrapper {
 
   section.course-content {
     @extend .content;
-    @include border-radius(0 4px 4px 0);
+    padding-right: 0;
+    padding-left: lh();
 
     h1 {
       margin: 0 0 lh();
diff --git a/lms/static/sass/course/discussion/_answers.scss b/lms/static/sass/course/discussion/_answers.scss
index 27043be68d..73660dd336 100644
--- a/lms/static/sass/course/discussion/_answers.scss
+++ b/lms/static/sass/course/discussion/_answers.scss
@@ -7,9 +7,16 @@ div.answer-controls {
   padding-left: flex-grid(1.1);
   width: 100%;
 
+
   div.answer-count {
     display: inline-block;
     float: left;
+
+    h1 {
+      margin-bottom: 0;
+      font-size: em(24);
+      font-weight: 100;
+    }
   }
 
   div.answer-sort {
@@ -18,7 +25,7 @@ div.answer-controls {
 
     nav {
       float: right;
-      margin-top: 34px;
+      margin-top: 10px;
 
       a {
         &.on span{
@@ -44,8 +51,9 @@ div.answer-block {
   width: 100%;
 
   img.answer-img-accept {
-    margin: 10px 0px 10px 16px;
+    margin: 10px 0px 10px 11px;
   }
+
   div.answer-container {
     @extend div.question-container;
 
@@ -130,17 +138,19 @@ div.answer-own {
 
 div.answer-actions {
   margin: 0;
-  padding:8px 8px 8px 0;
+  padding:8px 0 8px 8px;
   text-align: right;
   border-top: 1px solid #efefef;
 
   span.sep {
-    color: #EDDFAA;
+    color: $border-color;
   }
 
   a {
     cursor: pointer;
     text-decoration: none;
+    @extend a:link;
+    font-size: em(14);
   }
 }
 
diff --git a/lms/static/sass/course/discussion/_badges.scss b/lms/static/sass/course/discussion/_badges.scss
index d74dd93d13..65d8cbf513 100644
--- a/lms/static/sass/course/discussion/_badges.scss
+++ b/lms/static/sass/course/discussion/_badges.scss
@@ -22,6 +22,8 @@ div#award-list{
 }
 
 ul.badge-list {
+  padding-left: 0;
+
   li.badge {
     border-bottom: 1px solid #eee;
     @extend .clearfix;
@@ -70,12 +72,17 @@ ul.badge-list {
 .bronze, .badge3 {
   color: #cc9933;
 }
-div.badge-desc {
-  > div {
-    margin-bottom: 20px;
-     span {
-      font-size: 18px;
-      @include border-radius(10px);
-     }
+
+div.discussion-wrapper aside {
+  div.badge-desc {
+    border-top: 0;
+
+    > div {
+      margin-bottom: 20px;
+      span {
+        font-size: 18px;
+        @include border-radius(10px);
+      }
+    }
   }
 }
diff --git a/lms/static/sass/course/discussion/_discussion.scss b/lms/static/sass/course/discussion/_discussion.scss
index 7b0aa601d9..e12f308ae2 100644
--- a/lms/static/sass/course/discussion/_discussion.scss
+++ b/lms/static/sass/course/discussion/_discussion.scss
@@ -8,7 +8,7 @@ body.askbot {
         @include box-sizing(border-box);
         display: table-cell;
         min-width: 650px;
-        padding: lh();
+        padding-right: lh();
         vertical-align: top;
         width: flex-grid(9) + flex-gutter();
 
diff --git a/lms/static/sass/course/discussion/_forms.scss b/lms/static/sass/course/discussion/_forms.scss
index ae02ab3b20..43ba07df19 100644
--- a/lms/static/sass/course/discussion/_forms.scss
+++ b/lms/static/sass/course/discussion/_forms.scss
@@ -5,6 +5,11 @@ form.answer-form {
   border-top: 1px solid #ddd;
   overflow: hidden;
   padding-left: flex-grid(1.1);
+  padding-top: lh();
+
+  p {
+    margin-bottom: lh();
+  }
 
   textarea {
     @include box-sizing(border-box);
@@ -121,7 +126,6 @@ form.question-form {
   border: none;
   padding: 15px 0 0 0;
 
-
   input[type="text"] {
     @include box-sizing(border-box);
     width: flex-grid(6);
@@ -131,6 +135,11 @@ form.question-form {
     margin-top: 10px;
   }
 
+  input[value="Cancel"] {
+    @extend .light-button;
+    float: right;
+  }
+
   div#question-list {
   background-color: rgba(255,255,255,0.95);
   @include box-sizing(border-box);
diff --git a/lms/static/sass/course/discussion/_question-view.scss b/lms/static/sass/course/discussion/_question-view.scss
index b369ceabe0..f7657dbf97 100644
--- a/lms/static/sass/course/discussion/_question-view.scss
+++ b/lms/static/sass/course/discussion/_question-view.scss
@@ -68,16 +68,18 @@ div.question-header {
     h1 {
       margin-top: 0;
       font-weight: 100;
+      line-height: 1.1em;
 
       a {
         font-weight: 100;
+        line-height: 1.1em;
       }
     }
 
     div.meta-bar {
       border-bottom: 1px solid #eee;
       display: block;
-      margin: 10px 0;
+      margin: lh(.5) 0 lh();
       overflow: hidden;
       padding: 5px 0 10px;
 
@@ -158,7 +160,7 @@ div.question-header {
           }
 
           div.change-date {
-            font-size: 12px;
+            font-size: em(14);
             margin-bottom: 2px;
           }
 
@@ -182,13 +184,13 @@ div.question-header {
       display: inline-block;
       padding: 0 0 3% 0;
       width: 100%;
+      margin-top: lh(2);
 
       div.comments-content {
-        font-size: 13px;
-        background: #efefef;
+        border-top: 1px solid lighten($border-color, 10%);
 
         .block {
-          border-top: 1px solid #ddd;
+          border-top: 1px solid lighten($border-color, 10%);
           padding: 15px;
           display: block;
 
@@ -200,10 +202,10 @@ div.question-header {
             padding-top: 10px;
 
             span.official-comment {
-              background: $mit-red;
+              background: $pink;
               color: #fff;
               display: block;
-              font-size: 12px;
+              font-size: em(12);
               margin: 0 0 10px -5%;
               padding:2px 5px 2px 5%;
               text-align: left;
@@ -215,6 +217,10 @@ div.question-header {
         form.post-comments {
           padding: 15px;
 
+          button {
+            color: #fff;
+          }
+
            button:last-child {
             margin-left: 10px;
             @extend .light-button;
@@ -235,7 +241,6 @@ div.question-header {
             border: none;
             @include box-shadow(none);
             display: inline-block;
-            margin-top: -8px;
             padding:0 2% 0 0;
             text-align: center;
             width: 5%;
@@ -281,16 +286,14 @@ div.question-header {
             }
 
             div.comment-delete {
-              // display: inline;
-              color: $mit-red;
+              @extend a:link;
               cursor: pointer;
-              font-size: 15px;
             }
 
             div.comment-edit {
               @include transform(rotate(50deg));
               cursor: pointer;
-              font-size: 16px;
+
               a.edit-icon {
                 color: #555;
                 text-decoration: none;
@@ -308,13 +311,13 @@ div.question-header {
 
             div.comment-meta {
               text-align: right;
+              margin-top: lh(.5);
 
               a.author {
                 font-weight: bold;
               }
 
               a.edit {
-                font-size: 12px;
                 padding: 2px 10px;
               }
             }
@@ -341,7 +344,6 @@ div.question-header {
 
         a {
           display: inline-block;
-          font-size: 12px;
           margin: 10px 10px 10px 0;
         }
       }
diff --git a/lms/static/sass/course/discussion/_questions.scss b/lms/static/sass/course/discussion/_questions.scss
index 9b7335e62b..1b77231bba 100644
--- a/lms/static/sass/course/discussion/_questions.scss
+++ b/lms/static/sass/course/discussion/_questions.scss
@@ -1,19 +1,24 @@
 // Styles for the default question list view
 
 div.question-list-header {
+  @extend h1.top-header;
   display: block;
   margin-bottom: 0px;
+  padding-bottom: lh(.5);
   overflow: hidden;
   width: flex-grid(9,9);
-  @extend h1.top-header;
 
   h1 {
     margin: 0;
     font-size: 1em;
     font-weight: 100;
+    padding-bottom: lh(.5);
 
     > a.light-button {
       float: right;
+      font-size: em(14, 24);
+      letter-spacing: 0;
+      font-weight: 400;
     }
   }
 
@@ -87,6 +92,7 @@ div.question-list-header {
 
       a {
         color: #555;
+        font-size: em(14, 24);
       }
     }
 
@@ -95,12 +101,10 @@ div.question-list-header {
     }
 
     ul.tags {
-      li {
-        background: #fff;
-
-        &:before {
-          border-color: transparent #fff transparent transparent;
-        }
+      span, div {
+        line-height: 1em;
+        margin-left: 6px;
+        cursor: pointer;
       }
     }
   }
@@ -155,6 +159,7 @@ ul.question-list, div#question-list {
 
           span.relative-time {
             font-weight: normal;
+            line-height: lh();
           }
         }
 
diff --git a/lms/static/sass/course/discussion/_sidebar.scss b/lms/static/sass/course/discussion/_sidebar.scss
index cac219b8cf..2418792b4f 100644
--- a/lms/static/sass/course/discussion/_sidebar.scss
+++ b/lms/static/sass/course/discussion/_sidebar.scss
@@ -264,24 +264,16 @@ div.discussion-wrapper aside {
  }
 
   div.question-tips, div.markdown {
-    ul {
-      margin-left: 8%;
-    }
-
+    ul,
     ol {
-      margin-left: 8%;
-    }
-  }
-
-  div.markdown ul li {
-    margin: 20px 0;
-
-    &:first-child {
       margin: 0;
-    }
+      padding: 0;
 
-    ol li {
-      margin: 0;
+      li {
+        border-bottom: 0;
+        line-height: lh();
+        margin-bottom: em(8);
+      }
     }
   }
 
diff --git a/lms/static/sass/shared/_forms.scss b/lms/static/sass/shared/_forms.scss
index 842ffb0086..d6a5f482e3 100644
--- a/lms/static/sass/shared/_forms.scss
+++ b/lms/static/sass/shared/_forms.scss
@@ -42,6 +42,7 @@ textarea {
 
 input[type="submit"],
 input[type="button"],
+button,
 .button {
   @include border-radius(3px);
   @include button(shiny, $blue);