merged heads

sass/discussion/_askbot-original.scss

@@ -1165,13 +1165,13 @@ body.anon #searchbar {
   font-weight: normal;
   cursor: help; }
 
-.question-options {
-  margin-top: 1px;
-  color: #666;
-  line-height: 13px;
-  margin-bottom: 5px;
-  label {
-    vertical-align: text-bottom; } }
+// .question-options {
+//   margin-top: 1px;
+//   color: #666;
+//   line-height: 13px;
+//   margin-bottom: 5px;
+//   label {
+//     vertical-align: text-bottom; } }
 
 // .edit-content-html {
 //   border-top: 1px dotted #d8d2a9;

sass/discussion/_discussion.scss

 // Base extends (Merge with main stylesheet later)
-.light-button {
+.light-button, a.light-button {
   @include box-shadow(inset 0 1px 0 #fff);
   @include linear-gradient(#fff, lighten(#888, 40%));
   @include border-radius(3px);
@@ -12,7 +12,7 @@
   -webkit-font-smoothing: antialiased;
 
   &:hover, &:focus {
-    @include linear-gradient(#fff, lighten(#888, 30%));
+    @include linear-gradient(#fff, lighten(#888, 37%));
     border: 1px solid #ccc;
     text-decoration: none;
   }
@@ -43,7 +43,7 @@ body.askbot {
         vertical-align: top;
         width: flex-grid(9) + flex-gutter();
 
-        .tabula-rasa {
+        a.tabula-rasa, .tabula-rasa{
           @extend .light-button;
           @include border-radius(5px);
           display: block;
@@ -58,6 +58,7 @@ body.askbot {
           &:first-child {
             margin-top: 70px;
           }
+
           &:last-child {
             margin-bottom: 70px;
           }

sass/discussion/_form-wmd-toolbar.scss

@@ -3,7 +3,6 @@
 }
 
 #wmd-button-bar {
-  background: url(/static/images/askbot/editor-toolbar-background.png) repeat-x bottom;
   border: 1px solid #ddd;
   height:36px;
   float:left;

sass/discussion/_forms.scss

@@ -3,7 +3,6 @@ form.answer-form {
   border-top: 1px solid #ddd;
   overflow: hidden;
   padding-left: flex-grid(1.1);
-  // padding-top: 20px;
 
   textarea {
     @include box-sizing(border-box);
@@ -105,12 +104,8 @@ input.after-editor {
 form.question-form {
   @extend .answer-form;
   border: none;
-  padding: 0;
-  margin-top: -15px;
+  padding: 15px 0 0 0;
 
-  h1 a {
-    float: right;
-  }
 
   input[type="text"] {
     @include box-sizing(border-box);
@@ -121,4 +116,3 @@ form.question-form {
     margin-top: 10px;
   }
 }
-

sass/discussion/_profile.scss

@@ -2,7 +2,7 @@ body.user-profile-page {
 
   section.questions {
     h1 {
-      @extend .top-header;
+     margin: 0;
     }
   }
 

sass/discussion/_question-view.scss

@@ -285,9 +285,7 @@ div.question-header {
       }
 
       div.controls {
-        // padding: 15px 0;
-        // background: #efefef ;
-        border-top: 1px dashed #ddd;
+        border-top: 1px solid #efefef;
         text-align: right;
         a {
           display: inline-block;

sass/discussion/_questions.scss

@@ -5,6 +5,14 @@ div.question-list-header {
   width: flex-grid(9,9);
   @extend h1.top-header;
 
+  h1 {
+    margin: 0;
+
+    > a.light-button {
+      float: right;
+    }
+  }
+
   section.question-list-meta  {
     display: block;
     overflow: hidden;
@@ -121,7 +129,6 @@ ul.question-list, div#question-list {
       &.question-body {
         @include box-sizing(border-box);
         margin-right: flex-gutter();
-        padding-left: 10px;
         width: flex-grid(5.5,9);
 
         h2 {

sass/discussion/_sidebar.scss

@@ -271,4 +271,22 @@ div.discussion-wrapper aside {
       margin: 0;
     }
   }
+
+  div.view-profile {
+    h2 {
+      border-top: 0;
+      @include box-shadow(none);
+    }
+    a {
+      width: 100%;
+      @include box-sizing(border-box);
+      text-align: center;
+      padding: 10px;
+      display: block;
+
+      span {
+        font-weight: bold;
+      }
+    }
+  }
 }