<commit_before>body {
<<<<<<< HEAD:app/assets/stylesheets/basics.scss
  font-family: 'Roboto', 'ヒラギノ角ゴ Pro W3', 'Hiragino Kaku Gothic Pro', 'メイリオ', Meiryo sans-serif;
  background: $color1 image-url('background-photo.jpg');
=======
  font-family: 'mastodon-font-sans-serif', sans-serif;
  background: $ui-base-color url('../images/background-photo.jpg');
>>>>>>> 8963f8c3c2630bfcc377a5ca0513eef5a6b2a4bc:app/javascript/styles/basics.scss
  background-size: cover;
  background-attachment: fixed;
  font-size: 13px;
  line-height: 18px;
  font-weight: 400;
<<<<<<< HEAD:app/assets/stylesheets/basics.scss
  color: $color5;
=======
  color: $primary-text-color;
  padding-bottom: 140px;
>>>>>>> 8963f8c3c2630bfcc377a5ca0513eef5a6b2a4bc:app/javascript/styles/basics.scss
  text-rendering: optimizelegibility;
  font-feature-settings: "kern";
  text-size-adjust: none;

  &.app-body {
    position: fixed;
    width: 100%;
    height: 100%;
    padding: 0;
    background: $ui-base-color;
  }

  &.embed {
    background: transparent;
    margin: 0;

    .container {
      position: absolute;
      width: 100%;
      height: 100%;
      overflow: hidden;
    }
  }

  &.admin {
    background: darken($ui-base-color, 4%);
    position: fixed;
    width: 100%;
    height: 100%;
    padding: 0;
  }

  @media screen and (max-width: 360px) {
    padding-bottom: 0;
  }
}

button {
  font-family: inherit;
  cursor: pointer;

  &:focus {
    outline: none;
  }
}

.app-holder {
  display: flex;
  width: 100%;
  height: 100%;
  align-items: center;
  justify-content: center;
}

.separate {
  display: flex;
  align-items: center;
  position: relative;
  margin: 40px auto;
  text-align: center;

  span {
    flex: 0 0 auto;
    padding: 0 10px;
  }

  &:before {
    display: block;
    content: '';
    width: 50%;
    border-bottom: 1px solid $color3;
  }

  &:after {
    display: block;
    content: '';
    width: 50%;
    border-bottom: 1px solid $color3;
  }
}<commit_msg>Resolve a merged conflict - app/javascript/styles/basics.scss<commit_after>body {
  font-family: 'mastodon-font-sans-serif', 'ヒラギノ角ゴ Pro W3', 'Hiragino Kaku Gothic Pro', 'メイリオ', Meiryo sans-serif, sans-serif;
  background: $ui-base-color url('../images/background-photo.jpg');
  background-size: cover;
  background-attachment: fixed;
  font-size: 13px;
  line-height: 18px;
  font-weight: 400;
  color: $primary-text-color;
  padding-bottom: 140px;
  text-rendering: optimizelegibility;
  font-feature-settings: "kern";
  text-size-adjust: none;

  &.app-body {
    position: fixed;
    width: 100%;
    height: 100%;
    padding: 0;
    background: $ui-base-color;
  }

  &.embed {
    background: transparent;
    margin: 0;

    .container {
      position: absolute;
      width: 100%;
      height: 100%;
      overflow: hidden;
    }
  }

  &.admin {
    background: darken($ui-base-color, 4%);
    position: fixed;
    width: 100%;
    height: 100%;
    padding: 0;
  }

  @media screen and (max-width: 360px) {
    padding-bottom: 0;
  }
}

button {
  font-family: inherit;
  cursor: pointer;

  &:focus {
    outline: none;
  }
}

.app-holder {
  display: flex;
  width: 100%;
  height: 100%;
  align-items: center;
  justify-content: center;
}

.separate {
  display: flex;
  align-items: center;
  position: relative;
  margin: 40px auto;
  text-align: center;

  span {
    flex: 0 0 auto;
    padding: 0 10px;
  }

  &:before {
    display: block;
    content: '';
    width: 50%;
    border-bottom: 1px solid $ui-primary-color;
  }

  &:after {
    display: block;
    content: '';
    width: 50%;
    border-bottom: 1px solid $ui-primary-color;
  }
}
{'fraction_non_alphanumeric': 0.15458539264140583, 'fraction_numerical': 0.043931905546403076, 'mean_word_length': 2.925646551724138, 'pattern_counts': {'":': 0, '<': 17, '<?xml version=': 0, '>': 17, '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': '2469897', 'n_tokens_mistral': 1509, 'n_tokens_neox': 1354, 'n_words': 295}