Merge

profile.html

@@ -84,8 +84,10 @@ $(function() {
       <!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
 
       <div id="change_password_pop">
-        <h2>Password reset</h2>
-        <p>We'll e-mail you a password reset link at ${email}. Follow the link in the email to reset your password.</p>
+        <h2>Password change</h2>
+        <p>We'll e-mail you a password reset link at ${email}. Follow
+        the link in the confirmation email to change your
+        password.</p>
 
         <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
         <input type="submit" id="pwd_reset_button" value="Reset Password" />

sass/_base.scss

@@ -2,6 +2,12 @@
   outline-color: #ccc;
 }
 
+h1, h2, h3, h4, h5, h6 {
+  a {
+    color: #000;
+  }
+}
+
 h1 {
   font-size:1.6em;
   margin:20px 0 10px 0;

sass/_discussion-questions.scss

@@ -74,10 +74,6 @@ ul.question-list {
           font-weight: normal;
           margin: 0px 0 15px 0;
           text-transform: none;
-
-          a {
-            color: #000;
-          }
         }
 
         div.user-info {
@@ -158,3 +154,41 @@ div.search-tips {
 .search-result-summary {
 }
 
+div.post-update-info {
+  @include box-sizing(border-box);
+  @include border-radius(5px);
+  background:lighten(#F6EFD4, 5%);
+  padding: 10px;
+
+  a {
+    color:$mit-red ;
+  }
+
+  div.change-date {
+    font-size: 12px;
+    margin-bottom: 10px;
+  }
+
+  div.avatar {
+    display: inline-block;
+    float: left;
+    margin-right: 3px;
+
+    img.gravatar {
+      background: white;
+      border: 1px solid darken(#F6EFD4, 10%);
+      margin-right: 5px;
+      padding: 3px ;
+      vertical-align: bottom;
+    }
+  }
+
+  div.user-meta {
+    display: inline-block;
+    width: 60%;
+
+    span.user-badges {
+      display: block;
+    }
+  }
+}

sass/_discussion-tags.scss

@@ -10,13 +10,13 @@ ul.tags {
     display: inline;
     font-size: 12px;
     margin-left: 15px;
-    padding: 5px 10px 5px 5px;
+    padding: 3px 10px 5px 5px;
 
     &:before {
      content:"";
      position:absolute;
      top:0;
-     left:-12px;
+     left:-11px;
      width:0;
      height:0;
      border-color:transparent #eee transparent transparent;

sass/_question-view.scss

+div.question-header {
+  div.vote-buttons {
+    display: inline-block;
+    float: left;
+    width: flex-grid(1,9);
+    margin-right: flex-gutter(9);
+  }
+
+  div.question-container {
+    display: inline-block;
+    float: left;
+    width: flex-grid(8,9);
+
+    h1 {
+      margin-top: 0;
+    }
+
+    div.meta-bar {
+      border-bottom: 1px solid #eee;
+      display: block;
+      margin: 20px 0 10px;
+      overflow: hidden;
+      padding-bottom: 15px;
+
+
+      div.tag-list {
+        display: inline-block;
+        float:left;
+        width: flex-grid(4,8);
+        margin-right: flex-gutter(8);
+      }
+
+      div.question-actions {
+        display: inline-block;
+        float:left;
+        text-align: right;
+        width: flex-grid(4,8);
+
+        a {
+          color: darken(#F6EFD4, 50%);
+
+          &.question-delete {
+            color: $mit-red;
+          }
+        }
+
+        span.sep {
+          color: darken(#F6EFD4, 10%);
+        }
+      }
+    }
+
+    div.question-content {
+      overflow: hidden;
+
+      div.question-body {
+        display: inline-block;
+        float: left;
+        margin-right: flex-gutter(8);
+        width: flex-grid(6.2,8);
+      }
+
+      div.post-update-info {
+        display: inline-block;
+        float: left;
+        width: flex-grid(1.8,8);
+      }
+    }
+  }
+}

sass/application.scss

@@ -14,7 +14,7 @@
 @import "wiki-basic-html", "wiki-create", "wiki";
 @import "activation";
 @import "help";
-@import "askbot-original", "discussion", "discussion-questions", "discussion-tags" ;
+@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" ;
 
 // left over
 @import "theme";