BigW Consortium Gitlab

merge_requests.scss 5.5 KB
Newer Older
1 2
/**
 * MR -> show: Automerge widget
randx committed
3 4
 *
 */
5
.mr-state-widget {
6
  background: $background-color;
7
  color: $gl-gray;
8
  border: 1px solid $border-color;
9
  @include border-radius(2px);
10

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

18 19 20
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
21
      float: left;
22 23 24 25 26 27 28 29 30 31 32 33 34 35

      .accept_merge_request {
        &.ci-pending,
        &.ci-running {
          @include btn-orange;
        }

        &.ci-skipped,
        &.ci-failed,
        &.ci-canceled,
        &.ci-error {
          @include btn-red;
        }
      }
36 37 38 39
    }

    .accept-control {
      display: inline-block;
40
      float: left;
41
      margin: 0;
42
      margin-left: 20px;
43
      padding: 5px;
44
      padding-top: 8px;
45 46
      line-height: 20px;

47 48 49 50 51 52 53
      &.right {
        float: right;
        a {
          color: $gl-gray;
        }
      }

54
      .remove_source_checkbox {
55 56
        margin: 0;
      }
57
    }
randx committed
58
  }
59 60

  .ci_widget {
61
    border-bottom: 1px solid #eef0f2;
62

63
    svg {
64
      margin-right: 4px;
65 66
      position: relative;
      top: 1px;
67
      overflow: visible;
68 69 70 71
    }

    &.ci-success {
      color: $gl-success;
72 73 74 75

      a.environment {
        color: inherit;
      }
76 77
    }

78 79 80 81 82 83 84 85
    &.ci-success_with_warnings {
      color: $gl-success;

      i {
        color: $gl-warning;
      }
    }

86 87 88 89 90
    &.ci-skipped {
      background-color: #eee;
      color: #888;
    }

91
    &.ci-pending {
92 93 94
      color: $gl-warning;
    }

95 96 97 98
    &.ci-running {
      color: $blue-normal;
    }

99 100 101 102
    &.ci-failed,
    &.ci-error {
      color: $gl-danger;
    }
103

104 105 106 107
    &.ci-canceled {
      color: $gl-gray;
    }

108 109 110
    a.monospace {
      color: inherit;
    }
111 112 113 114 115
  }

  .mr-widget-body,
  .ci_widget,
  .mr-widget-footer {
116
    padding: $gl-padding;
117
  }
118

119 120 121
  .normal {
    color: #5c5d5e;
  }
122 123 124

  .mr-widget-body {
    h4 {
125 126
      font-weight: 600;
      font-size: 17px;
127
      margin: 5px 0;
128
      color: $gl-gray-dark;
129 130 131 132

      &.has-conflicts .fa-exclamation-triangle {
        color: $gl-warning;
      }
133 134 135 136 137
    }

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

139 140 141 142 143 144
    .btn-grouped {
      margin-left: 0;
      margin-right: 7px;
    }

    @media (max-width: $screen-xs-max) {
145 146 147 148 149 150 151 152 153 154 155 156 157 158
      h4 {
        font-size: 15px;
      }

      p {
        font-size: 13px;
      }

      .btn,
      .btn-group,
      .accept-action {
        margin-bottom: 4px;
      }

159 160 161 162 163
      .accept-action {
        width: 100%;
        text-align: center;
      }

164 165 166 167 168 169
      .accept-control {
        width: 100%;
        text-align: center;
        margin: 0;
      }
    }
170 171 172
  }

  .mr-widget-footer {
173
    border-top: 1px solid #eee;
174 175 176 177 178
  }

  .ci-coverage {
    float: right;
  }
randx committed
179
}
180

181 182
.mr_source_commit,
.mr_target_commit {
183 184
  margin-bottom: 0;

185
  .commit {
186
    margin: 0;
187 188
    padding-top: 2px;
    padding-bottom: 2px;
189
    list-style: none;
190
    &:hover {
191
      background: none;
192 193 194 195
    }
  }
}

196
.label-branch {
197
  color: $gl-gray-dark;
198
  font-family: $monospace_font;
199
  font-weight: bold;
200
  overflow: hidden;
201
  font-size: 90%;
202
  margin: 0 3px;
Annabel Dunstone committed
203
  word-break: break-all;
204 205 206 207
}

.mr-list {
  .merge-request {
208
    padding: 10px 15px;
209 210 211
    position: relative;

    .merge-request-title {
212
      margin-bottom: 2px;
213 214 215 216 217 218 219 220 221

      .ci-status-link {

        svg {
          height: 16px;
          width: 16px;
          position: relative;
          top: 3px;
        }
222 223 224 225 226

        &:hover,
        &:focus {
          text-decoration: none;
        }
227
      }
228
    }
229 230 231 232 233 234
  }

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

235
  .merge-request-no-comments {
236
    opacity: 0.5;
237 238
  }
}
239 240 241

.merge-request-angle {
  text-align: center;
Dmitriy Zaporozhets committed
242
  margin: 0 auto;
243 244
  font-size: 2em;
  line-height: 1.1;
245 246
}

247
// hide mr close link for inline diff comment form
248 249 250
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
251
}
252

Douwe Maan committed
253 254
#modal_merge_info .modal-dialog {
  width: 600px;
255 256 257 258

  .btn-clipboard {
    @extend .pull-right;

259
    margin-right: 20px;
260 261 262 263
    margin-top: 5px;
    position: absolute;
    right: 0;
  }
Douwe Maan committed
264
}
265

266 267 268
.mr-source-target {
  line-height: 31px;
}
269

270 271
.builds {
  .table-holder {
Annabel Dunstone committed
272
    overflow-x: auto;
273 274
  }
}
275 276 277 278 279 280 281 282 283 284 285 286 287

.panel-new-merge-request {
  .panel-heading {
    padding: 5px 10px;
    font-weight: 600;
    line-height: 25px;
  }

  .panel-body {
    padding: 10px 5px;
  }

  .panel-footer {
288
    padding: 5px 10px;
289 290 291 292

    .btn {
      min-width: auto;
    }
293 294 295 296 297 298 299
  }

  .commit {
    .commit-row-title {
      margin-bottom: 4px;
    }

300 301
    .item-title {
      @media (min-width: $screen-sm-min) {
302
        width: 45%;
303 304 305
      }
    }

306
    .avatar {
307 308
      left: 0;
      top: 2px;
309 310 311 312 313 314 315 316 317 318 319 320
    }

    .commit-row-info {
      line-height: 20px;
    }
  }

  .btn-clipboard {
    margin-right: 5px;
    padding: 0;
    background: transparent;
  }
Phil Hughes committed
321 322 323 324

  .ci-status-link {
    margin-right: 5px;
  }
325 326 327 328 329
}

.merge-request-select {
  padding-left: 5px;
  padding-right: 5px;
330 331 332 333 334 335
  margin-bottom: 10px;

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

336
  @media (min-width: $screen-xs-min) {
337 338 339 340
    float: left;
    width: 50%;
    margin-bottom: 0;
  }
341 342 343 344 345 346 347 348 349 350

  .dropdown-menu-toggle {
    width: 100%;
  }

  .dropdown-menu {
    left: 5px;
    right: 5px;
    width: auto;
  }
351
}
Phil Hughes committed
352

Phil Hughes committed
353 354 355
.issuable-form-select-holder {
  display: inline-block;
  width: 250px;
Phil Hughes committed
356
}
357 358 359 360 361 362 363 364 365 366

.table-holder {
  .builds {

    th {
      background-color: $white-light;
      color: $gl-placeholder-color;
    }
  }
}
367 368 369 370 371 372 373 374 375 376

.merged-buttons {
  .btn {
    float: left;

    &:not(:last-child) {
      margin-right: 10px;
    }
  }
}
377 378 379 380

.mr-version-switch {
  background: $background-color;
  padding: $gl-btn-padding;
381 382 383 384 385
  color: $gl-placeholder-color;

  a.btn-link {
    color: $gl-dark-link-color;
  }
386
}
387

388 389 390 391 392 393
.merge-request-details {

  .title {
    margin-bottom: 20px;
  }
}