BigW Consortium Gitlab

merge_requests.scss 6.12 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;
Clement Ho committed
9
  border-radius: 2px;
10

11
  form {
12
    margin-bottom: 0;
13

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

19 20 21
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
22
      float: left;
23 24 25 26

      .accept_merge_request {
        &.ci-pending,
        &.ci-running {
27
          @include btn-blue;
28 29 30 31 32 33 34 35 36
        }

        &.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
        padding-right: 0;
51

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

57
      .remove_source_checkbox {
58 59
        margin: 0;
      }
60
    }
randx committed
61
  }
62 63

  .ci_widget {
64
    border-bottom: 1px solid $well-inner-border;
65
    color: $gl-gray;
66

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

74 75 76 77 78
    &.ci-success_with_warnings {

      i {
        color: $gl-warning;
      }
79 80 81 82 83 84
    }
  }

  .mr-widget-body,
  .ci_widget,
  .mr-widget-footer {
85
    padding: $gl-padding;
86
  }
87

88
  .normal {
89
    color: $gl-text-color-dark;
90
  }
91

92
  .js-deployment-link {
93 94
    display: inline-block;
  }
95

96 97
  .mr-widget-body {
    h4 {
98 99
      font-weight: 600;
      font-size: 17px;
100
      margin: 5px 0;
101
      color: $gl-gray-dark;
102 103 104 105

      &.has-conflicts .fa-exclamation-triangle {
        color: $gl-warning;
      }
106 107 108 109 110
    }

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

112 113 114 115 116 117
    .btn-grouped {
      margin-left: 0;
      margin-right: 7px;
    }

    @media (max-width: $screen-xs-max) {
118
      h4 {
119
        font-size: 14px;
120 121 122 123 124 125 126 127 128 129 130 131
      }

      p {
        font-size: 13px;
      }

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

132 133 134 135 136
      .btn-grouped {
        float: none;
        margin-right: 0;
      }

137 138 139 140 141
      .accept-action {
        width: 100%;
        text-align: center;
      }

142 143 144 145 146 147
      .accept-control {
        width: 100%;
        text-align: center;
        margin: 0;
      }
    }
148 149 150
  }

  .mr-widget-footer {
151
    border-top: 1px solid $gray-darker;
152 153 154 155 156
  }

  .ci-coverage {
    float: right;
  }
157

158
  .stop-env-container {
159 160
    color: $gl-text-color;
    float: right;
161

162 163 164 165
    a {
      color: $gl-text-color;
    }
  }
randx committed
166
}
167

168 169
.mr_source_commit,
.mr_target_commit {
170 171
  margin-bottom: 0;

172
  .commit {
173
    margin: 0;
174 175
    padding-top: 2px;
    padding-bottom: 2px;
176
    list-style: none;
177

178
    &:hover {
179
      background: none;
180 181 182 183
    }
  }
}

184
.label-branch {
185
  color: $gl-gray-dark;
186
  font-family: $monospace_font;
187
  font-weight: bold;
188
  overflow: hidden;
189
  font-size: 90%;
190
  margin: 0 3px;
Annabel Dunstone committed
191
  word-break: break-all;
192 193
}

194 195 196 197 198 199 200
.commits-empty {
  text-align: center;

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

202 203 204 205 206
  svg {
    width: 230px;
  }
}

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

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

      .ci-status-link {

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

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

  .merge-request-labels {
    display: inline-block;
  }
235
}
236 237 238

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

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

Douwe Maan committed
250 251
#modal_merge_info .modal-dialog {
  width: 600px;
252

253 254 255 256
  .dark {
    margin-right: 40px;
  }

257 258 259
  .btn-clipboard {
    @extend .pull-right;

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

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

271 272 273 274 275 276 277 278 279 280 281 282
.panel-new-merge-request {
  .panel-heading {
    padding: 5px 10px;
    font-weight: 600;
    line-height: 25px;
  }

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

  .panel-footer {
283
    padding: 5px 10px;
284 285 286 287

    .btn {
      min-width: auto;
    }
288 289 290 291 292 293 294
  }

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

295 296
    .item-title {
      @media (min-width: $screen-sm-min) {
297
        width: 45%;
298 299 300
      }
    }

301
    .avatar {
302 303
      left: 0;
      top: 2px;
304 305 306 307 308 309 310 311 312 313 314 315
    }

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

  .btn-clipboard {
    margin-right: 5px;
    padding: 0;
    background: transparent;
  }
Phil Hughes committed
316 317 318 319

  .ci-status-link {
    margin-right: 5px;
  }
320 321 322 323 324
}

.merge-request-select {
  padding-left: 5px;
  padding-right: 5px;
325 326 327 328 329 330
  margin-bottom: 10px;

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

331
  @media (min-width: $screen-xs-min) {
332 333 334 335
    float: left;
    width: 50%;
    margin-bottom: 0;
  }
336 337 338 339 340 341 342 343 344 345

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

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

Phil Hughes committed
348 349 350
.issuable-form-select-holder {
  display: inline-block;
  width: 250px;
351 352 353 354

  .dropdown-menu-toggle {
    width: 100%;
  }
Phil Hughes committed
355
}
356 357

.table-holder {
358
  .ci-table {
359 360 361 362 363 364 365

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

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

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

377
.mr-version-controls {
378
  background: $background-color;
tauriedavis committed
379 380 381 382 383 384 385 386 387 388 389
  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;
  }

390
  .content-block {
391
    border-top: 1px solid $border-color;
392 393 394
    padding: $gl-padding-top $gl-padding;
  }

tauriedavis committed
395 396 397 398 399
  .comments-disabled-notif {
    .btn {
      margin-left: 5px;
    }
  }
400

401 402
  .mr-version-dropdown,
  .mr-version-compare-dropdown {
tauriedavis committed
403
    margin: 0 7px;
404 405 406 407 408
  }

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

410
  .fa-info-circle {
tauriedavis committed
411 412
    color: $orange-normal;
    padding-right: 5px;
413
  }
414
}
415

416
.merge-request-tabs-holder {
417
  background-color: $white-light;
418 419 420

  &.affix {
    top: 100px;
421
    left: 0;
422
    z-index: 10;
423 424 425 426 427 428
    transition: right .15s;
  }

  &:not(.affix) .container-fluid {
    padding-left: 0;
    padding-right: 0;
429 430
  }
}