Merged and resolved conflicts

sass/application.scss

@@ -13,4 +13,5 @@
 @import "profile";
 @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki";
 @import "help";
-@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals";
+
+@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile";

sass/discussion/_askbot-original.scss

@@ -1877,19 +1877,19 @@ a {
   margin-bottom: 15px;
   float: left; }
 
-.user-profile-page {
-  font-size: 13px;
-  color: #525252;
-  p {
-    font-size: 13px;
-    line-height: 1.3;
-    color: #525252; }
-  .avatar img {
-    border: #eee 1px solid;
-    padding: 5px; }
-  h2 {
-    padding: 10px 0px 10px 0px;
-    font-family: 'yanone kaffeesatz',sans-serif; } }
+// .user-profile-page {
+//   font-size: 13px;
+//   color: #525252;
+//   p {
+//     font-size: 13px;
+//     line-height: 1.3;
+//     color: #525252; }
+//   .avatar img {
+//     border: #eee 1px solid;
+//     padding: 5px; }
+//   h2 {
+//     padding: 10px 0px 10px 0px;
+//     font-family: 'yanone kaffeesatz',sans-serif; } }
 
 .user-details {
   font-size: 13px;
@@ -1970,10 +1970,10 @@ a {
   font-weight: 700;
   color: #777; }
 
-.answer-summary {
-  display: block;
-  clear: both;
-  padding: 3px; }
+// .answer-summary {
+//   display: block;
+//   clear: both;
+//   padding: 3px; }
 
 .answer-votes {
   background-color: #eeeeee;
@@ -2621,16 +2621,16 @@ p.signup_p {
   li {
     display: inline; } }
 
-.user-profile-page {
-  .avatar p {
-    margin-bottom: 0px; }
-  .tabbar a#stats {
-    margin-left: 0; }
-  img.gravatar {
-    margin: 2px 0 3px 0; }
-  h3 {
-    padding: 0;
-    margin-top: -3px; } }
+// .user-profile-page {
+//   .avatar p {
+//     margin-bottom: 0px; }
+//   .tabbar a#stats {
+//     margin-left: 0; }
+//   img.gravatar {
+//     margin: 2px 0 3px 0; }
+//   h3 {
+//     padding: 0;
+//     margin-top: -3px; } }
 
 .userlist {
   font-size: 13px; }

sass/discussion/_profile.scss

+body.user-profile-page {
+  section.user-info {
+    // @extend .sidebar;
+    h1 {
+      @extend h2;
+      margin-top: 0;
+    }
+  }
+
+  section.questions {
+    h1 {
+      @extend .top-header;
+    }
+  }
+
+  ul.sub-info {
+    border-top: 1px solid #ddd;
+    margin-top: lh();
+    list-style: none;
+
+    > li {
+      width: flex-grid(2.25, 9);
+      display: table-cell;
+      padding: (flex-gutter(9)/2);
+      border-right: 1px solid #ddd;
+      @include box-sizing(border-box);
+
+      &:first-child {
+        padding-left: 0;
+      }
+
+      &:last-child {
+        border-right: 0;
+        padding-right: 0;
+      }
+
+      h2 {
+        margin-top: 0;
+      }
+    }
+
+    ul.user-stats-table {
+      list-style: none;
+    }
+  }
+}