merge_requests.scss 3.44 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: 12px;
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 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85

    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;
    }
86 87 88 89

    a.monospace {
      color: inherit;
    }
90 91 92 93 94
  }

  .mr-widget-body,
  .ci_widget,
  .mr-widget-footer {
95
    padding: $gl-padding;
96
  }
97

98 99 100
  .normal {
    color: #5c5d5e;
  }
101 102 103

  .mr-widget-body {
    h4 {
104 105
      font-weight: 600;
      font-size: 17px;
106
      margin: 5px 0;
107
      color: #313236;
108 109 110 111 112 113 114 115 116 117 118 119 120 121
    }

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

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

  .ci-coverage {
    float: right;
  }
randx's avatar
randx committed
122
}
123

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

136
.label-branch {
137
  color: #313236;
138
  font-family: $monospace_font;
139
  font-weight: bold;
140
  overflow: hidden;
141
  font-size: 90%;
142
  margin: 0 3px;
143 144 145 146
}

.mr-list {
  .merge-request {
147
    padding: 10px 15px;
148 149 150
    position: relative;

    .merge-request-title {
151
      margin-bottom: 2px;
152
    }
Stefan Tatschner's avatar
Stefan Tatschner committed
153 154 155 156 157 158
  }

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

159
  .merge-request-no-comments {
Stefan Tatschner's avatar
Stefan Tatschner committed
160
    opacity: 0.5;
161 162
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
163 164 165

.merge-request-angle {
  text-align: center;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
166
  margin: 0 auto;
167 168
  font-size: 2em;
  line-height: 1.1;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
169 170
}

171
// hide mr close link for inline diff comment form
172 173 174
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
175
}
176

177 178 179
.merge-request-form .select2-container {
  width: 250px !important;
}
180

Douwe Maan's avatar
Douwe Maan committed
181 182
#modal_merge_info .modal-dialog {
  width: 600px;
183 184 185 186

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

187
    margin-right: 20px;
188 189 190 191
    margin-top: 5px;
    position: absolute;
    right: 0;
  }
Douwe Maan's avatar
Douwe Maan committed
192
}
193

194 195 196
.mr-source-target {
  line-height: 31px;
}
197 198 199 200 201 202 203

.disabled-comment-area {
  padding: 16px 0;

  .disabled-profile {
    width: 40px;
    height: 40px;
204
    background: $border-gray-dark;
205 206 207 208 209 210
    border-radius: 20px;
    display: inline-block;
    margin-right: 10px;
  }

  .disabled-comment {
211
    background: $gray-light;
212 213 214 215
    display: inline-block;
    vertical-align: top;
    height: 200px;
    border-radius: 4px;
216
    border: 1px solid $border-gray-normal;
217 218 219 220 221 222 223 224 225 226 227 228 229 230 231
    padding-top: 90px;
    text-align: center;
    right: 20px;
    position: absolute;
    left: 70px;
    margin-bottom: 20px;

    span {
      color: #B2B2B2;

      a {
        color: $md-link-color;
      }
    }
  }
232
}