1 files changed, 70 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
new file mode 100644
index 00000000000..bf21d7fce76
--- /dev/null
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -0,0 +1,70 @@
+.timeline {
+  @include basic-list;
+
+  margin: 0;
+  padding: 0;
+
+  .timeline-entry {
+    padding: $gl-padding;
+    border-color: #f1f2f4;
+    margin-left: -$gl-padding;
+    margin-right: -$gl-padding;
+    color: $gl-gray;
+    border-bottom: 1px solid #ECEEF1;
+    border-right: 1px solid #ECEEF1;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .avatar {
+      margin-right: 15px;
+    }
+
+    .controls {
+      padding-top: 10px;
+      float: right;
+    }
+  }
+
+  .note-text {
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .system-note {
+    .note-text {
+      color: $gl-gray !important;
+    }
+  }
+
+  .diff-file {
+    border: 1px solid $border-color;
+    border-bottom: none;
+    margin-left: 0;
+    margin-right: 0;
+  }
+}
+
+@media (max-width: $screen-xs-max) {
+  .timeline {
+    &:before {
+      background: none;
+    }
+    .timeline-entry .timeline-entry-inner {
+      .timeline-icon {
+        display: none;
+      }
+
+      .timeline-content {
+        margin-left: 0;
+      }
+    }
+  }
+}
+
+.discussion .timeline-entry {
+  margin: 0;
+  border-right: none;
+}