.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 #f1f2f4;
    border-right: 1px solid #f1f2f4;

    &: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;
}
