merge_requests.scss 2.67 KB
Newer Older
1 2
/**
 * MR -> show: Automerge widget
randx's avatar
randx committed
3 4
 *
 */
5
.mr-state-widget {
6 7 8 9 10 11 12
  background: #FAFAFA;
  margin-bottom: 20px;
  color: #666;
  border: 1px solid #e5e5e5;
  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
  @include border-radius(3px);

13
  form {
14
    margin-bottom: 0;
15
    .clearfix {
16
      margin-bottom: 0;
randx's avatar
randx committed
17 18 19
    }
  }

20 21 22 23 24 25 26
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
    }

    .accept-control {
      display: inline-block;
27
      margin: 0;
28
      margin-left: 20px;
29
      padding: 5px;
30 31
      line-height: 20px;

32
      .remove_source_checkbox {
33 34
        margin: 0;
      }
35
    }
randx's avatar
randx committed
36
  }
37 38 39 40 41 42 43 44 45 46 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 78 79 80 81 82 83 84 85 86 87 88 89

  .ci_widget {
    border-bottom: 1px solid #EEE;

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

  .mr-widget-body {
    h4 {
      font-weight: bold;
      margin: 5px 0;
    }

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

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

  .ci-coverage {
    float: right;
  }
randx's avatar
randx committed
90
}
91

92 93 94 95 96 97 98
@media(min-width: $screen-sm-max) {
  .merge-request .merge-request-tabs{
    li {
      a {
        padding: 15px 40px;
        font-size: 14px;
      }
99 100 101
    }
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
102

103 104 105 106 107
.merge-request .merge-request-tabs{
  margin-top: 30px;
  margin-bottom: 20px;
}

108 109 110
.mr_source_commit,
.mr_target_commit {
  .commit {
111
    margin: 0;
112
    padding: 2px 0;
113
    list-style: none;
114
    &:hover {
115
      background: none;
116 117 118 119
    }
  }
}

120
.label-branch {
121
  color: #222;
122
  font-family: $monospace_font;
123
  font-weight: bold;
124
  overflow: hidden;
125 126 127 128
}

.mr-list {
  .merge-request {
129
    padding: 10px 15px;
130 131 132 133
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
134
      font-size: $list-font-size;
135
      font-weight: bold;
136 137 138 139
    }

    .merge-request-info {
      color: #999;
140
      font-size: 13px;
141
    }
Stefan Tatschner's avatar
Stefan Tatschner committed
142 143 144 145 146 147 148 149 150

  }

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

  .merge-request-no-comments {
    opacity: 0.5;
151 152
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
153 154 155

.merge-request-angle {
  text-align: center;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
156
  margin: 0 auto;
157 158
  font-size: 2em;
  line-height: 1.1;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
159 160
}

161
.merge-request-form-info {
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
162 163
  padding-top: 15px;
}
164 165

// hide mr close link for inline diff comment form
166 167 168
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
169
}
170

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
171 172 173 174 175 176 177 178 179
.merge-request-show-labels {
  a {
    margin-right: 5px;
    margin-bottom: 5px;
    display: inline-block;
    .color-label {
      padding: 6px 10px;
    }
  }
180
}
181 182 183 184

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