@import "variables";

.git-FilePatchListView {
  &:empty:before {
    content:'No changes';
    display: block;
    padding: @component-padding;
    text-align: center;
    color: @text-color-subtle;
    font-style: italic;
  }

  &-item {
    -webkit-user-select: none;
    display: flex;
    align-items: flex-start;
    padding: @component-padding/2 @component-padding;
    box-shadow:inset @separator-border-color 0 -1px 0;
    cursor:default;
    position:relative;
    box-sizing:border-box;
    overflow:hidden;
  }

  &-path {
    flex: 1;
  }
}


//
// States
// -----------------------------------------

.git-StagedChanges, .git-UnstagedChanges, .git-MergeConflictPaths {
  &.is-focused {
    .git-FilePatchListView-item.is-selected {
      background: @background-color-highlight;
      color: @text-color-highlight;
      box-shadow: @pane-item-background-color 0 -1px 0;
      :focus & {
        background: @background-color-selected;
        color: @text-color-selected;
      }
    }
  }
}

@import "variables";

.git-FilePatchListView {
  &:empty:before {
    content:'No changes';
    display: block;
    padding: @component-padding;
    text-align: center;
    color: @text-color-subtle;
    font-style: italic;
  }

  &-item {
    -webkit-user-select: none;
    display: flex;
    align-items: flex-start;
    padding: @component-padding/2 @component-padding;
    box-shadow:inset @separator-border-color 0 -1px 0;
    cursor:default;
    position:relative;
    box-sizing:border-box;
    overflow:hidden;
  }

  &-path {
    flex: 1;
  }
}

.git-MergeConflictPaths .git-FilePatchListView-icon:last-child {
  margin-left: @component-padding / 2;
}

//
// States
// -----------------------------------------

.git-StagedChanges, .git-UnstagedChanges, .git-MergeConflictPaths {
  &.is-focused {
    .git-FilePatchListView-item.is-selected {
      background: @background-color-highlight;
      color: @text-color-highlight;
      box-shadow: @pane-item-background-color 0 -1px 0;
      :focus & {
        background: @background-color-selected;
        color: @text-color-selected;
      }
    }
  }
}

Add margin to 2nd MergeConflictPaths icon
Add margin to 2nd MergeConflictPaths icon
