merge_requests.scss 3.0 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 22 23 24 25
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
    }

    .accept-control {
      display: inline-block;
D
Dmitriy Zaporozhets 已提交
26
      margin: 0;
27
      margin-left: 20px;
28
      padding: 5px;
D
Dmitriy Zaporozhets 已提交
29 30
      line-height: 20px;

D
Dmitriy Zaporozhets 已提交
31 32 33 34 35 36 37 38
      &.right {
        float: right;
        padding-top: 12px;
        a {
          color: $gl-gray;
        }
      }

39
      .remove_source_checkbox {
D
Dmitriy Zaporozhets 已提交
40 41
        margin: 0;
      }
42
    }
R
randx 已提交
43
  }
44 45

  .ci_widget {
D
Dmitriy Zaporozhets 已提交
46
    border-bottom: 1px solid #eef0f2;
47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77

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

79 80 81
  .normal {
    color: #5c5d5e;
  }
82 83 84

  .mr-widget-body {
    h4 {
85 86
      font-weight: 600;
      font-size: 17px;
87
      margin: 5px 0;
88
      color: #313236;
89 90 91 92 93 94 95 96 97 98 99 100 101 102
    }

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

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

  .ci-coverage {
    float: right;
  }
R
randx 已提交
103
}
104

105
.merge-request .merge-request-tabs {
106
  @include nav-menu;
D
Dmitriy Zaporozhets 已提交
107 108 109
  margin: -$gl-padding;
  padding: $gl-padding;
  text-align: center;
110
  margin-bottom: 1px;
111 112
}

113 114 115 116 117 118 119 120 121 122 123 124 125 126
// Mobile
@media (max-width: 480px) {
  .merge-request .merge-request-tabs {
    margin: 0;
    padding: 0;

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

127 128 129
.mr_source_commit,
.mr_target_commit {
  .commit {
130
    margin: 0;
131
    padding: 2px 0;
132
    list-style: none;
133
    &:hover {
134
      background: none;
135 136 137 138
    }
  }
}

D
Dmitriy Zaporozhets 已提交
139
.label-branch {
140
  color: #313236;
D
Dmitriy Zaporozhets 已提交
141
  font-family: $monospace_font;
142
  font-weight: bold;
143
  overflow: hidden;
144 145
  font-size: 14px;
  margin: 0 3px;
D
Dmitriy Zaporozhets 已提交
146 147 148 149
}

.mr-list {
  .merge-request {
150
    padding: 10px 15px;
D
Dmitriy Zaporozhets 已提交
151 152 153 154
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
155
      font-size: $list-font-size;
156
      font-weight: bold;
D
Dmitriy Zaporozhets 已提交
157 158 159
    }

    .merge-request-info {
160
      color: $gl-gray;
D
Dmitriy Zaporozhets 已提交
161
    }
S
Stefan Tatschner 已提交
162 163 164 165 166 167 168 169 170

  }

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

  .merge-request-no-comments {
    opacity: 0.5;
D
Dmitriy Zaporozhets 已提交
171 172
  }
}
D
Dmitriy Zaporozhets 已提交
173 174 175

.merge-request-angle {
  text-align: center;
D
Dmitriy Zaporozhets 已提交
176
  margin: 0 auto;
177 178
  font-size: 2em;
  line-height: 1.1;
D
Dmitriy Zaporozhets 已提交
179 180
}

181
.merge-request-form-info {
D
Dmitriy Zaporozhets 已提交
182 183
  padding-top: 15px;
}
184 185

// hide mr close link for inline diff comment form
186 187 188
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
189
}
190

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

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

D
Douwe Maan 已提交
206 207 208
#modal_merge_info .modal-dialog {
  width: 600px;
}
209

210 211 212
.mr-source-target {
  line-height: 31px;
}