merge_requests.scss 1.9 KB
Newer Older
randx's avatar
randx committed
1 2 3 4 5

/**
 * MR -> show: Automerge widget
 *
 */
6 7
.automerge_widget {
  &.can_be_merged {
randx's avatar
randx committed
8 9 10
    background: #DFF0D8;
  }

11
  form {
12
    margin-bottom: 0;
13
    .clearfix {
14
      margin-bottom: 0;
randx's avatar
randx committed
15 16 17
    }
  }

18
  .accept_group {
19
    float: left;
randx's avatar
randx committed
20 21 22 23 24
    border: 1px solid #ADA;
    padding: 2px;
    @include border-radius(5px);
    background: #CEB;

25
    .accept_merge_request {
26 27
      font-size: 13px;
      float: left;
randx's avatar
randx committed
28
    }
29
    .remove_branch_holder {
30 31 32
      margin-left: 20px;
      margin-right: 10px;
      float: left;
randx's avatar
randx committed
33
    }
34
    label {
35
      color: #444;
36
      text-align: left
randx's avatar
randx committed
37 38 39 40
    }
  }


41
  .how_to_merge_link {
randx's avatar
randx committed
42 43 44
    @extend .primary;
  }
}
45

46
.merge-request .nav-tabs{
47 48
  li {
    a {
49
      font-weight: bold;
50
      padding: 8px 20px;
51
      text-align: center;
52 53 54
    }
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
55

56
.merge-in-progress {
randx's avatar
randx committed
57 58 59
  @extend .padded;
  @extend .append-bottom-10;
}
60

61 62 63
.mr_source_commit,
.mr_target_commit {
  .commit {
64 65
    margin: 0;
    padding: 0;
66 67 68
    padding: 5px;
    margin-bottom: 5px;
    .avatar { position:relative }
69
    .row_title {
70
      color: #444;
71 72 73 74 75
    }
    .commit-author-name,
    .dash,
    .committed_ago,
    .browse_code_link_holder {
76
      display: none;
77
    }
78
    list-style: none;
79
    &:hover {
80
      background: none;
81 82 83 84
    }
  }
}

85 86
.label-branch {
  @include border-radius(4px);
87
  padding: 3px 4px;
88 89 90 91 92 93
  border: none;
  font-size: 14px;
  background: #474D57;
  color: #fff;
  font-family: $monospace_font;
  font-weight: normal;
94 95 96 97 98 99 100 101 102 103
  overflow: hidden;

  .label-project {
    @include border-radius-left(4px);
    padding: 3px 4px;
    background: #29A;
    position: relative;
    left: -4px;
    letter-spacing: -1px;
  }
104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120
}

.mr-list {
  .merge-request {
    padding: 10px;
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
      font-size: 14px;
    }

    .merge-request-info {
      color: #999;
    }
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
121 122 123 124 125 126

.merge-request-angle {
  text-align: center;
  margin-top: 45px;
}

127
.merge-request-form-info {
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
128 129
  padding: 15px 0;
}