merge_requests.scss 3.4 KB
Newer Older
1 2
/**
 * MR -> show: Automerge widget
R
randx 已提交
3 4
 *
 */
5
.mr-state-widget {
6
  background: #F7F8FA;
7
  margin-bottom: 20px;
D
Dmitriy Zaporozhets 已提交
8
  color: $gl-gray;
9 10
  border: 1px solid #dce0e6;
  @include border-radius(2px);
11

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

D
Dmitriy Zaporozhets 已提交
19 20 21
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
B
Baldinof 已提交
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;
        }
      }
D
Dmitriy Zaporozhets 已提交
36 37 38 39
    }

    .accept-control {
      display: inline-block;
D
Dmitriy Zaporozhets 已提交
40
      margin: 0;
41
      margin-left: 20px;
42
      padding: 5px;
D
Dmitriy Zaporozhets 已提交
43 44
      line-height: 20px;

D
Dmitriy Zaporozhets 已提交
45 46 47 48 49 50 51 52
      &.right {
        float: right;
        padding-top: 12px;
        a {
          color: $gl-gray;
        }
      }

53
      .remove_source_checkbox {
D
Dmitriy Zaporozhets 已提交
54 55
        margin: 0;
      }
56
    }
R
randx 已提交
57
  }
58 59

  .ci_widget {
D
Dmitriy Zaporozhets 已提交
60
    border-bottom: 1px solid #eef0f2;
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 90 91

    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;
  }
92

93 94 95
  .normal {
    color: #5c5d5e;
  }
96 97 98

  .mr-widget-body {
    h4 {
99 100
      font-weight: 600;
      font-size: 17px;
101
      margin: 5px 0;
102
      color: #313236;
103 104 105 106 107 108 109 110 111 112 113 114 115 116
    }

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

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

  .ci-coverage {
    float: right;
  }
R
randx 已提交
117
}
118

119
.merge-request .merge-request-tabs {
120
  @include nav-menu;
D
Dmitriy Zaporozhets 已提交
121 122 123
  margin: -$gl-padding;
  padding: $gl-padding;
  text-align: center;
124
  margin-bottom: 1px;
125 126
}

127 128 129 130 131 132 133 134 135 136 137 138 139 140
// Mobile
@media (max-width: 480px) {
  .merge-request .merge-request-tabs {
    margin: 0;
    padding: 0;

    li {
      a {
        padding: 0;
      }
    }
  }
}

141 142 143
.mr_source_commit,
.mr_target_commit {
  .commit {
144
    margin: 0;
145
    padding: 2px 0;
146
    list-style: none;
147
    &:hover {
148
      background: none;
149 150 151 152
    }
  }
}

D
Dmitriy Zaporozhets 已提交
153
.label-branch {
154
  color: #313236;
D
Dmitriy Zaporozhets 已提交
155
  font-family: $monospace_font;
156
  font-weight: bold;
157
  overflow: hidden;
158 159
  font-size: 14px;
  margin: 0 3px;
D
Dmitriy Zaporozhets 已提交
160 161 162 163
}

.mr-list {
  .merge-request {
164
    padding: 10px 15px;
D
Dmitriy Zaporozhets 已提交
165 166 167 168
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
169
      font-size: $list-font-size;
170
      font-weight: bold;
D
Dmitriy Zaporozhets 已提交
171 172 173
    }

    .merge-request-info {
174
      color: $gl-gray;
D
Dmitriy Zaporozhets 已提交
175
    }
S
Stefan Tatschner 已提交
176 177 178 179 180 181 182 183 184

  }

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

  .merge-request-no-comments {
    opacity: 0.5;
D
Dmitriy Zaporozhets 已提交
185 186
  }
}
D
Dmitriy Zaporozhets 已提交
187 188 189

.merge-request-angle {
  text-align: center;
D
Dmitriy Zaporozhets 已提交
190
  margin: 0 auto;
191 192
  font-size: 2em;
  line-height: 1.1;
D
Dmitriy Zaporozhets 已提交
193 194
}

195
.merge-request-form-info {
D
Dmitriy Zaporozhets 已提交
196 197
  padding-top: 15px;
}
198 199

// hide mr close link for inline diff comment form
200 201 202
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
203
}
204

D
Dmitriy Zaporozhets 已提交
205 206 207 208 209 210 211 212 213
.merge-request-show-labels {
  a {
    margin-right: 5px;
    margin-bottom: 5px;
    display: inline-block;
    .color-label {
      padding: 6px 10px;
    }
  }
D
Drew Blessing 已提交
214
}
215 216 217 218

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

D
Douwe Maan 已提交
220 221
#modal_merge_info .modal-dialog {
  width: 600px;
222 223 224 225 226 227 228 229 230

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

    margin-right: 18px;
    margin-top: 5px;
    position: absolute;
    right: 0;
  }
D
Douwe Maan 已提交
231
}
232

233 234 235
.mr-source-target {
  line-height: 31px;
}