merge_requests.scss 2.9 KB
Newer Older
1 2
/**
 * MR -> show: Automerge widget
R
randx 已提交
3 4
 *
 */
5
.mr-state-widget {
6 7 8 9 10 11 12
  background: #FAFAFA;
  margin-bottom: 20px;
  color: #666;
  border: 1px solid #e5e5e5;
  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
  @include border-radius(3px);

13
  form {
14
    margin-bottom: 0;
15
    .clearfix {
16
      margin-bottom: 0;
R
randx 已提交
17 18 19
    }
  }

D
Dmitriy Zaporozhets 已提交
20 21 22 23 24 25 26
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
    }

    .accept-control {
      display: inline-block;
D
Dmitriy Zaporozhets 已提交
27
      margin: 0;
28
      margin-left: 20px;
29
      padding: 5px;
D
Dmitriy Zaporozhets 已提交
30 31
      line-height: 20px;

32
      .remove_source_checkbox {
D
Dmitriy Zaporozhets 已提交
33 34
        margin: 0;
      }
35
    }
R
randx 已提交
36
  }
37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89

  .ci_widget {
    border-bottom: 1px solid #EEE;

    i {
      margin-right: 4px;
    }

    &.ci-success {
      color: $gl-success;
    }

    &.ci-skipped {
      background-color: #eee;
      color: #888;
    }

    &.ci-pending,
    &.ci-running {
      color: $gl-warning;
    }

    &.ci-failed,
    &.ci-canceled,
    &.ci-error {
      color: $gl-danger;
    }
  }

  .mr-widget-body,
  .ci_widget,
  .mr-widget-footer {
    padding: 15px;
  }

  .mr-widget-body {
    h4 {
      font-weight: bold;
      margin: 5px 0;
    }

    p:last-child {
      margin-bottom: 0;
    }
  }

  .mr-widget-footer {
    border-top: 1px solid #EEE;
  }

  .ci-coverage {
    float: right;
  }
R
randx 已提交
90
}
91

92 93 94
@media(min-width: $screen-sm-max) {
  .merge-request .merge-request-tabs{
    margin: 20px 0;
95

96 97 98 99 100
    li {
      a {
        padding: 15px 40px;
        font-size: 14px;
      }
101 102 103
    }
  }
}
D
Dmitriy Zaporozhets 已提交
104

105 106 107
.mr_source_commit,
.mr_target_commit {
  .commit {
108
    margin: 0;
109
    padding: 2px 0;
110
    list-style: none;
111
    &:hover {
112
      background: none;
113 114 115 116
    }
  }
}

D
Dmitriy Zaporozhets 已提交
117 118
.label-branch {
  @include border-radius(4px);
D
Dmitriy Zaporozhets 已提交
119
  padding: 3px 4px;
D
Dmitriy Zaporozhets 已提交
120
  border: none;
D
Dmitriy Zaporozhets 已提交
121 122
  background: $hover;
  color: #333;
D
Dmitriy Zaporozhets 已提交
123 124
  font-family: $monospace_font;
  font-weight: normal;
125 126 127 128 129
  overflow: hidden;

  .label-project {
    @include border-radius-left(4px);
    padding: 3px 4px;
130
    background: #279;
131 132 133 134
    position: relative;
    left: -4px;
    letter-spacing: -1px;
  }
D
Dmitriy Zaporozhets 已提交
135 136 137 138
}

.mr-list {
  .merge-request {
139
    padding: 10px 15px;
D
Dmitriy Zaporozhets 已提交
140 141 142 143
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
144
      font-size: $list-font-size;
145
      font-weight: bold;
D
Dmitriy Zaporozhets 已提交
146 147 148 149
    }

    .merge-request-info {
      color: #999;
150
      font-size: 13px;
D
Dmitriy Zaporozhets 已提交
151
    }
S
Stefan Tatschner 已提交
152 153 154 155 156 157 158 159 160

  }

  .merge-request-labels {
    display: inline-block;
  }

  .merge-request-no-comments {
    opacity: 0.5;
D
Dmitriy Zaporozhets 已提交
161 162
  }
}
D
Dmitriy Zaporozhets 已提交
163 164 165

.merge-request-angle {
  text-align: center;
D
Dmitriy Zaporozhets 已提交
166
  margin: 0 auto;
167 168
  font-size: 2em;
  line-height: 1.1;
D
Dmitriy Zaporozhets 已提交
169 170
}

171
.merge-request-form-info {
D
Dmitriy Zaporozhets 已提交
172 173
  padding-top: 15px;
}
174 175

// hide mr close link for inline diff comment form
176 177 178
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
179
}
180

D
Dmitriy Zaporozhets 已提交
181 182 183 184 185 186 187 188 189
.merge-request-show-labels {
  a {
    margin-right: 5px;
    margin-bottom: 5px;
    display: inline-block;
    .color-label {
      padding: 6px 10px;
    }
  }
D
Drew Blessing 已提交
190
}
191 192 193 194

.merge-request-form .select2-container {
  width: 250px !important;
}