Merge

sass/_askbot-original.scss

@@ -972,30 +972,30 @@ ul {
 .main-page h1 {
   margin-right: 5px; }
 
-.delete-icon {
-  margin-top: -1px;
-  float: left;
-  height: 21px;
-  width: 18px;
-  display: block;
-  line-height: 20px;
-  text-align: center;
-  background: #bbcdcd;
-  cursor: default;
-  color: #fff;
-  border-top: #cfdbdb 1px solid;
-  font-family: Arial;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-  -webkit-border-top-right-radius: 4px;
-  text-shadow: 0px 1px 0px #7ea0a0;
-  -moz-text-shadow: 0px 1px 0px #7ea0a0;
-  -webkit-text-shadow: 0px 1px 0px #7ea0a0;
-  &:hover {
-    background: #b32f2f; } }
+// .delete-icon {
+//   margin-top: -1px;
+//   float: left;
+//   height: 21px;
+//   width: 18px;
+//   display: block;
+//   line-height: 20px;
+//   text-align: center;
+//   background: #bbcdcd;
+//   cursor: default;
+//   color: #fff;
+//   border-top: #cfdbdb 1px solid;
+//   font-family: Arial;
+//   border-top-right-radius: 4px;
+//   border-bottom-right-radius: 4px;
+//   -moz-border-radius-topright: 4px;
+//   -moz-border-radius-bottomright: 4px;
+//   -webkit-border-bottom-right-radius: 4px;
+//   -webkit-border-top-right-radius: 4px;
+//   text-shadow: 0px 1px 0px #7ea0a0;
+//   -moz-text-shadow: 0px 1px 0px #7ea0a0;
+//   -webkit-text-shadow: 0px 1px 0px #7ea0a0;
+//   &:hover {
+//     background: #b32f2f; } }
 
 .tag-number {
   font-weight: normal;

sass/_question-view.scss

@@ -167,12 +167,24 @@ div.question-header {
       div.comments-content {
         font-size: 13px;
 
-        div.comment {
+        .block {
           border-bottom: 1px solid #ddd;
           border-top: 1px solid #fff;
           padding: 15px 0;
           display: block;
 
+           &:first-child {
+            border-top: 0;
+          }
+          &:only-of-type {
+            border: 0;
+          }
+        }
+
+        form.post-comments {
+        }
+
+        div.comment {
           &:first-child {
             border-top: 0;
           }
@@ -181,26 +193,66 @@ div.question-header {
             margin-bottom: 20px;
           }
 
-          div.comment-votes {
-            display: inline;
-
-            .upvote {
-              background: #ccc;
-              display:inline-block;
-              margin: 0px;
-              padding-right: 17px;
-              padding-top: 2px;
-              height: 20px;
-              color: #777;
-              width: 20px;
+          aside.comment-controls {
+            background: none;
+            border: none;
+            display: inline-block;
+            margin-top: -8px;
+            padding:0 2% 0 0;
+            text-align: center;
+            width: 5%;
+
+            div {
+              background: none;
+              opacity: 0.6;
+
+              &:hover {
+                opacity: 1;
+              }
             }
-          }
 
-          div.comment-delete {
-            display: inline;
+            div.comment-votes {
+                @include transform(rotate(-90deg));
+                width: 16px;
+
+              a.upvote {
+                cursor: pointer;
+                font-size: 25px;
+                text-decoration: none;
+              }
+            }
+
+            div.comment-delete {
+              // display: inline;
+              color: $mit-red;
+              cursor: pointer;
+              font-size: 15px;
+            }
           }
 
           div.comment-body {
+            display: inline-block;
+            width: 95%;
+
+            div.comment-meta {
+              text-align: right;
+
+              a.author {
+                font-weight: bold;
+              }
+
+              a.edit {
+                @extend .button;
+                font-size: 12px;
+                padding: 2px 10px;
+                // @include border-radius(2px);
+                // background: #eee;
+                // color: #555;
+                // cursor: pointer;
+                // padding: 1px 10px;
+                // text-decoration: none;
+              }
+            }
           }
         }
       }