Fixed merge from master and updated files

app/partials/us-detail.jade

@@ -4,6 +4,7 @@ block head
     title Taiga  Project management web application with scrum in mind!
 
 block content
+    div.wrapper
         div.main.us-detail
             div.us-detail-header
                 h1
@@ -39,6 +40,6 @@ block content
                         a(href="#")
                             span.icon.icon-issues
                             span.tab-title Activity
-            include views/modules/comments
+                //-include views/modules/comments
-            //-include views/modules/activity
+                include views/modules/activity
         sidebar.menu-secondary.sidebar

app/styles/layout/us-detail.scss

@@ -74,3 +74,31 @@
 .comment-list {
     padding: 1rem 2rem;
 }
+
+.activity-single {
+    @include table-flex;
+    border-bottom: 2px solid $gray-light;
+    padding: 1rem 0;
+    position: relative;
+    .username {
+        color: $green-taiga;
+        margin-bottom: 1rem;
+    }
+    .date {
+        @extend %small;
+        color: $gray-light;
+        margin-left: 1rem;
+    }
+}
+
+.activity-user {
+    @include table-flex-child(1, 50px, 0);
+    img {
+        max-width: 70px;
+        width: 100%;
+    }
+}
+
+.activity-content {
+    @include table-flex-child(20, 150px, 0);
+}

app/styles/main.scss

@@ -42,6 +42,9 @@ $prefix-for-spec:      true;
 @import 'modules/admin-functionalities';
 @import 'modules/category-config';
 @import 'modules/project-details';
+@import 'modules/comments';
+@import 'modules/attachments';
+@import 'modules/comment-activity';
 
 // Responsive
 @import 'responsive/mobile';
@@ -51,3 +54,4 @@ $prefix-for-spec:      true;
 @import 'layout/base';
 @import 'layout/backlog';
 @import 'layout/taskboard';
+@import 'layout/us-detail';