merge_requests.scss 6.16 KB
Newer Older
1 2
/**
 * MR -> show: Automerge widget
randx's avatar
randx committed
3 4
 *
 */
5
.mr-state-widget {
6
  background: $background-color;
7
  color: $gl-gray;
8
  border: 1px solid $border-color;
Clement Ho's avatar
Clement Ho committed
9
  border-radius: 2px;
10

11
  form {
12
    margin-bottom: 0;
13

14
    .clearfix {
15
      margin-bottom: 0;
randx's avatar
randx committed
16 17 18
    }
  }

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

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

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

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

48 49
      &.right {
        float: right;
50

51 52 53 54 55
        a {
          color: $gl-gray;
        }
      }

56
      .remove_source_checkbox {
57 58
        margin: 0;
      }
59
    }
randx's avatar
randx committed
60
  }
61 62

  .ci_widget {
63
    border-bottom: 1px solid #eef0f2;
64

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

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

75 76
      a.environment,
      a.pipeline {
77 78
        color: inherit;
      }
79 80
    }

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

      i {
        color: $gl-warning;
      }
87 88 89 90 91 92 93
    }

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

94
    &.ci-pending {
95 96 97
      color: $gl-warning;
    }

98 99 100 101
    &.ci-running {
      color: $blue-normal;
    }

102 103 104 105
    &.ci-failed,
    &.ci-error {
      color: $gl-danger;
    }
106

107 108 109 110
    &.ci-canceled {
      color: $gl-gray;
    }

111 112 113
    a.monospace {
      color: inherit;
    }
114 115 116 117 118
  }

  .mr-widget-body,
  .ci_widget,
  .mr-widget-footer {
119
    padding: $gl-padding;
120
  }
121

122 123 124
  .normal {
    color: #5c5d5e;
  }
125

126
  .js-deployment-link {
127 128
    display: inline-block;
  }
129

130 131
  .mr-widget-body {
    h4 {
132 133
      font-weight: 600;
      font-size: 17px;
134
      margin: 5px 0;
Annabel Dunstone's avatar
Annabel Dunstone committed
135
      color: $gl-gray-dark;
136 137 138 139

      &.has-conflicts .fa-exclamation-triangle {
        color: $gl-warning;
      }
140 141 142 143 144
    }

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

146 147 148 149 150 151
    .btn-grouped {
      margin-left: 0;
      margin-right: 7px;
    }

    @media (max-width: $screen-xs-max) {
152 153 154 155 156 157 158 159 160 161 162 163 164 165
      h4 {
        font-size: 15px;
      }

      p {
        font-size: 13px;
      }

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

166 167 168 169 170
      .accept-action {
        width: 100%;
        text-align: center;
      }

171 172 173 174 175 176
      .accept-control {
        width: 100%;
        text-align: center;
        margin: 0;
      }
    }
177 178 179
  }

  .mr-widget-footer {
180
    border-top: 1px solid #eee;
181 182 183 184 185
  }

  .ci-coverage {
    float: right;
  }
randx's avatar
randx committed
186
}
187

188 189
.mr_source_commit,
.mr_target_commit {
190 191
  margin-bottom: 0;

192
  .commit {
193
    margin: 0;
194 195
    padding-top: 2px;
    padding-bottom: 2px;
196
    list-style: none;
197

198
    &:hover {
199
      background: none;
200 201 202 203
    }
  }
}

204
.label-branch {
Annabel Dunstone's avatar
Annabel Dunstone committed
205
  color: $gl-gray-dark;
206
  font-family: $monospace_font;
207
  font-weight: bold;
208
  overflow: hidden;
209
  font-size: 90%;
210
  margin: 0 3px;
Annabel Dunstone's avatar
Annabel Dunstone committed
211
  word-break: break-all;
212 213
}

214 215 216 217 218 219 220
.commits-empty {
  text-align: center;

  h4 {
    padding-top: 20px;
    padding-bottom: 10px;
  }
221

222 223 224 225 226
  svg {
    width: 230px;
  }
}

227 228
.mr-list {
  .merge-request {
229
    padding: 10px 15px;
230 231 232
    position: relative;

    .merge-request-title {
233
      margin-bottom: 2px;
234 235 236 237 238 239 240 241 242

      .ci-status-link {

        svg {
          height: 16px;
          width: 16px;
          position: relative;
          top: 3px;
        }
243 244 245 246 247

        &:hover,
        &:focus {
          text-decoration: none;
        }
248
      }
249
    }
Stefan Tatschner's avatar
Stefan Tatschner committed
250 251 252 253 254
  }

  .merge-request-labels {
    display: inline-block;
  }
255
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
256 257 258

.merge-request-angle {
  text-align: center;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
259
  margin: 0 auto;
260 261
  font-size: 2em;
  line-height: 1.1;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
262 263
}

264
// hide mr close link for inline diff comment form
265 266 267
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
268
}
269

Douwe Maan's avatar
Douwe Maan committed
270 271
#modal_merge_info .modal-dialog {
  width: 600px;
272 273 274 275

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

276
    margin-right: 20px;
277 278 279 280
    margin-top: 5px;
    position: absolute;
    right: 0;
  }
Douwe Maan's avatar
Douwe Maan committed
281
}
282

283 284 285
.mr-source-target {
  line-height: 31px;
}
286

287 288 289 290 291 292 293 294 295 296 297 298
.panel-new-merge-request {
  .panel-heading {
    padding: 5px 10px;
    font-weight: 600;
    line-height: 25px;
  }

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

  .panel-footer {
Phil Hughes's avatar
Phil Hughes committed
299
    padding: 5px 10px;
300 301 302 303

    .btn {
      min-width: auto;
    }
304 305 306 307 308 309 310
  }

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

311 312
    .item-title {
      @media (min-width: $screen-sm-min) {
313
        width: 45%;
314 315 316
      }
    }

317
    .avatar {
318 319
      left: 0;
      top: 2px;
320 321 322 323 324 325 326 327 328 329 330 331
    }

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

  .btn-clipboard {
    margin-right: 5px;
    padding: 0;
    background: transparent;
  }
Phil Hughes's avatar
Phil Hughes committed
332 333 334 335

  .ci-status-link {
    margin-right: 5px;
  }
336 337 338 339 340
}

.merge-request-select {
  padding-left: 5px;
  padding-right: 5px;
Phil Hughes's avatar
Phil Hughes committed
341 342 343 344 345 346
  margin-bottom: 10px;

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

347
  @media (min-width: $screen-xs-min) {
Phil Hughes's avatar
Phil Hughes committed
348 349 350 351
    float: left;
    width: 50%;
    margin-bottom: 0;
  }
352 353 354 355 356 357 358 359 360 361

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

  .dropdown-menu {
    left: 5px;
    right: 5px;
    width: auto;
  }
362
}
Phil Hughes's avatar
Phil Hughes committed
363

Phil Hughes's avatar
Phil Hughes committed
364 365 366
.issuable-form-select-holder {
  display: inline-block;
  width: 250px;
367 368 369 370

  .dropdown-menu-toggle {
    width: 100%;
  }
Phil Hughes's avatar
Phil Hughes committed
371
}
Annabel Dunstone's avatar
Annabel Dunstone committed
372 373

.table-holder {
374
  .ci-table {
Annabel Dunstone's avatar
Annabel Dunstone committed
375 376 377 378 379 380 381

    th {
      background-color: $white-light;
      color: $gl-placeholder-color;
    }
  }
}
382 383 384 385 386 387 388 389 390 391

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

    &:not(:last-child) {
      margin-right: 10px;
    }
  }
}
392

393
.mr-version-controls {
394
  background: $background-color;
tauriedavis's avatar
tauriedavis committed
395 396 397 398 399 400 401 402 403 404 405
  border-bottom: 1px solid $border-color;
  color: $gl-text-color;

  .mr-version-menus-container {
    display: -webkit-flex;
    display: flex;
    -webkit-align-items: center;
    align-items: center;
    padding: 16px;
  }

406
  .content-block {
407
    border-top: 1px solid $border-color;
408 409 410
    padding: $gl-padding-top $gl-padding;
  }

tauriedavis's avatar
tauriedavis committed
411 412 413 414 415
  .comments-disabled-notif {
    .btn {
      margin-left: 5px;
    }
  }
416

417 418
  .mr-version-dropdown,
  .mr-version-compare-dropdown {
tauriedavis's avatar
tauriedavis committed
419
    margin: 0 7px;
420 421 422 423 424
  }

  .dropdown-title {
    color: $gl-text-color;
  }
425

426
  .fa-info-circle {
tauriedavis's avatar
tauriedavis committed
427 428
    color: $orange-normal;
    padding-right: 5px;
429
  }
430
}
431

432 433 434 435 436 437 438 439
.merge-request-tabs {
  background-color: #fff;

  &.affix {
    top: 100px;
    z-index: 9;
  }
}