merge_requests.scss 3.55 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
    }

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

  .mr-widget-footer {
116
    border-top: 1px solid #eee;
117 118 119 120 121
  }

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

124 125
.mr_source_commit,
.mr_target_commit {
126 127
  margin-bottom: 0;

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

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

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

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

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

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

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

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

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

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

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

192 193 194
.mr-source-target {
  line-height: 31px;
}
195

196 197 198 199 200
.builds {
  .table-holder {
    overflow-x: scroll;
  }
}
201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244

.panel-new-merge-request {
  .panel-heading {
    padding: 5px 10px;
    font-weight: 600;
    line-height: 25px;
  }

  .panel-body {
    padding: 10px 5px;
  }

  .panel-footer {
    padding: 10px 10px;
  }

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

    .avatar {
      width: 20px;
      height: 20px;
      margin-right: 5px;
    }

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

  .btn-clipboard {
    margin-right: 5px;
    padding: 0;
    background: transparent;
  }
}

.merge-request-select {
  float: left;
  width: 50%;
  padding-left: 5px;
  padding-right: 5px;
245 246 247 248 249 250 251 252 253 254

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

  .dropdown-menu {
    left: 5px;
    right: 5px;
    width: auto;
  }
255
}