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

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

D
Dmitriy Zaporozhets 已提交
18 19 20
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
B
Baldinof 已提交
21 22 23 24 25 26 27 28 29 30 31 32 33 34

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

        &.ci-skipped,
        &.ci-failed,
        &.ci-canceled,
        &.ci-error {
          @include btn-red;
        }
      }
D
Dmitriy Zaporozhets 已提交
35 36 37 38
    }

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

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

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

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

    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 {
89
    padding: $gl-padding;
90
  }
91

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

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

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

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

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

118 119
.merge-request-details {
  margin-bottom: $gl-padding;
120 121
}

122 123 124
.mr_source_commit,
.mr_target_commit {
  .commit {
125
    margin: 0;
126
    padding: 2px 0;
127
    list-style: none;
128
    &:hover {
129
      background: none;
130 131 132 133
    }
  }
}

D
Dmitriy Zaporozhets 已提交
134
.label-branch {
135
  color: #313236;
D
Dmitriy Zaporozhets 已提交
136
  font-family: $monospace_font;
137
  font-weight: bold;
138
  overflow: hidden;
139 140
  font-size: 14px;
  margin: 0 3px;
D
Dmitriy Zaporozhets 已提交
141 142 143 144
}

.mr-list {
  .merge-request {
145
    padding: 10px 15px;
D
Dmitriy Zaporozhets 已提交
146 147 148 149
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
150
      font-size: $list-font-size;
151
      font-weight: bold;
D
Dmitriy Zaporozhets 已提交
152 153 154
    }

    .merge-request-info {
155
      color: $gl-gray;
D
Dmitriy Zaporozhets 已提交
156
    }
S
Stefan Tatschner 已提交
157 158 159 160 161 162 163 164 165

  }

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

  .merge-request-no-comments {
    opacity: 0.5;
D
Dmitriy Zaporozhets 已提交
166 167
  }
}
D
Dmitriy Zaporozhets 已提交
168 169 170

.merge-request-angle {
  text-align: center;
D
Dmitriy Zaporozhets 已提交
171
  margin: 0 auto;
172 173
  font-size: 2em;
  line-height: 1.1;
D
Dmitriy Zaporozhets 已提交
174 175
}

176
.merge-request-form-info {
D
Dmitriy Zaporozhets 已提交
177 178
  padding-top: 15px;
}
179 180

// hide mr close link for inline diff comment form
181 182 183
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
184
}
185

D
Dmitriy Zaporozhets 已提交
186 187 188 189 190 191 192 193 194
.merge-request-show-labels {
  a {
    margin-right: 5px;
    margin-bottom: 5px;
    display: inline-block;
    .color-label {
      padding: 6px 10px;
    }
  }
D
Drew Blessing 已提交
195
}
196 197 198 199

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

D
Douwe Maan 已提交
201 202
#modal_merge_info .modal-dialog {
  width: 600px;
203 204 205 206 207 208 209 210 211

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

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

214 215 216
.mr-source-target {
  line-height: 31px;
}