merge_requests.scss 5.14 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;
9
  @include border-radius(2px);
10

11
  form {
12
    margin-bottom: 0;
13
    .clearfix {
14
      margin-bottom: 0;
randx's avatar
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's avatar
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 72 73
    }

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

74 75 76 77 78 79 80 81
    &.ci-success_with_warnings {
      color: $gl-success;

      i {
        color: $gl-warning;
      }
    }

82 83 84 85 86
    &.ci-skipped {
      background-color: #eee;
      color: #888;
    }

87
    &.ci-pending {
88 89 90
      color: $gl-warning;
    }

91 92 93 94
    &.ci-running {
      color: $blue-normal;
    }

95 96 97 98
    &.ci-failed,
    &.ci-error {
      color: $gl-danger;
    }
99

100 101 102 103
    &.ci-canceled {
      color: $gl-gray;
    }

104 105 106
    a.monospace {
      color: inherit;
    }
107 108 109 110 111
  }

  .mr-widget-body,
  .ci_widget,
  .mr-widget-footer {
112
    padding: $gl-padding;
113
  }
114

115 116 117
  .normal {
    color: #5c5d5e;
  }
118 119 120

  .mr-widget-body {
    h4 {
121 122
      font-weight: 600;
      font-size: 17px;
123
      margin: 5px 0;
Annabel Dunstone's avatar
Annabel Dunstone committed
124
      color: $gl-gray-dark;
125 126 127 128 129

      &.has-conflicts .fa-exclamation-triangle {
        color: $gl-warning;
      }

130 131 132 133 134
    }

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

136 137 138 139 140 141
    .btn-grouped {
      margin-left: 0;
      margin-right: 7px;
    }

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

      p {
        font-size: 13px;
      }

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

156 157 158 159 160
      .accept-action {
        width: 100%;
        text-align: center;
      }

161 162 163 164 165 166
      .accept-control {
        width: 100%;
        text-align: center;
        margin: 0;
      }
    }
167 168 169
  }

  .mr-widget-footer {
170
    border-top: 1px solid #eee;
171 172 173 174 175
  }

  .ci-coverage {
    float: right;
  }
randx's avatar
randx committed
176
}
177

178 179
.mr_source_commit,
.mr_target_commit {
180 181
  margin-bottom: 0;

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

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

.mr-list {
  .merge-request {
205
    padding: 10px 15px;
206 207 208
    position: relative;

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

      .ci-status-link {

        svg {
          height: 16px;
          width: 16px;
          position: relative;
          top: 3px;
        }
      }
220
    }
Stefan Tatschner's avatar
Stefan Tatschner committed
221 222 223 224 225 226
  }

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

227
  .merge-request-no-comments {
Stefan Tatschner's avatar
Stefan Tatschner committed
228
    opacity: 0.5;
229 230
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
231 232 233

.merge-request-angle {
  text-align: center;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
234
  margin: 0 auto;
235 236
  font-size: 2em;
  line-height: 1.1;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
237 238
}

239
// hide mr close link for inline diff comment form
240 241 242
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
243
}
244

Douwe Maan's avatar
Douwe Maan committed
245 246
#modal_merge_info .modal-dialog {
  width: 600px;
247 248 249 250

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

251
    margin-right: 20px;
252 253 254 255
    margin-top: 5px;
    position: absolute;
    right: 0;
  }
Douwe Maan's avatar
Douwe Maan committed
256
}
257

258 259 260
.mr-source-target {
  line-height: 31px;
}
261

262 263 264 265 266
.builds {
  .table-holder {
    overflow-x: scroll;
  }
}
267 268 269 270 271 272 273 274 275 276 277 278 279

.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
280
    padding: 5px 10px;
281 282 283 284

    .btn {
      min-width: auto;
    }
285 286 287 288 289 290 291
  }

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

292 293
    .item-title {
      @media (min-width: $screen-sm-min) {
294
        width: 45%;
295 296 297
      }
    }

298
    .avatar {
299 300
      left: 0;
      top: 2px;
301 302 303 304 305 306 307 308 309 310 311 312
    }

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

  .btn-clipboard {
    margin-right: 5px;
    padding: 0;
    background: transparent;
  }
Phil Hughes's avatar
Phil Hughes committed
313 314 315 316

  .ci-status-link {
    margin-right: 5px;
  }
317 318 319 320 321
}

.merge-request-select {
  padding-left: 5px;
  padding-right: 5px;
Phil Hughes's avatar
Phil Hughes committed
322 323 324 325 326 327
  margin-bottom: 10px;

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

328
  @media (min-width: $screen-xs-min) {
Phil Hughes's avatar
Phil Hughes committed
329 330 331 332
    float: left;
    width: 50%;
    margin-bottom: 0;
  }
333 334 335 336 337 338 339 340 341 342

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

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

Phil Hughes's avatar
Phil Hughes committed
345 346 347
.issuable-form-select-holder {
  display: inline-block;
  width: 250px;
Phil Hughes's avatar
Phil Hughes committed
348
}
Annabel Dunstone's avatar
Annabel Dunstone committed
349 350 351 352 353 354 355 356 357 358

.table-holder {
  .builds {

    th {
      background-color: $white-light;
      color: $gl-placeholder-color;
    }
  }
}
359 360 361 362 363 364 365 366 367 368

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

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