<commit_before>@import '../../mixins';

dialog#merge-conflicts-list {
  width: 500px;

  .summary {
    margin-bottom: 20px;
  }

  .dialog-header h1 {
    font-weight: var(--font-weight-light);
  }

  .dialog-content {
    padding-bottom: var(--spacing);
  }

  .green-circle {
    background-color: var(--color-new);
    color: var(--background-color);
    border-radius: 50%;
    height: 22px;
    width: 22px;
    display: flex;
    justify-content: center;
    align-items: center;
  }

  ul {
    list-style: none;
    padding: 0;
    max-height: 200px;
    overflow-y: auto;

    li {
      margin-bottom: var(--spacing-double);
      padding-left: 0;
    }

    li:last-of-type {
      margin-bottom: calc(var(--spacing) * 2);
    }

    li.unmerged-file-status-resolved,
    li.unmerged-file-status-conflicts {
      display: flex;<commit_msg>Increase max height on conflicts dialog to show more files<commit_after>@import '../../mixins';

dialog#merge-conflicts-list {
  width: 500px;

  .summary {
    margin-bottom: 20px;
  }

  .dialog-header h1 {
    font-weight: var(--font-weight-light);
  }

  .dialog-content {
    padding-bottom: var(--spacing);
  }

  .green-circle {
    background-color: var(--color-new);
    color: var(--background-color);
    border-radius: 50%;
    height: 22px;
    width: 22px;
    display: flex;
    justify-content: center;
    align-items: center;
  }

  ul {
    list-style: none;
    padding: 0;
    max-height: 285px;
    overflow-y: auto;

    li {
      margin-bottom: var(--spacing-double);
      padding-left: 0;
    }

    li:last-of-type {
      margin-bottom: calc(var(--spacing) * 2);
    }

    li.unmerged-file-status-resolved,
    li.unmerged-file-status-conflicts {
      display: flex;
{'fraction_non_alphanumeric': 0.15551743853630645, 'fraction_numerical': 0.02058319039451115, 'mean_word_length': 2.289473684210526, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6191150', 'n_tokens_mistral': 674, 'n_tokens_neox': 613, 'n_words': 116}