merge_requests.scss 2.7 KB
Newer Older
1 2 3

  /**
   * MR -> show: Automerge widget
R
randx 已提交
4 5
 *
 */
6
.mr-state-widget {
7
  form {
8
    margin-bottom: 0;
9
    .clearfix {
10
      margin-bottom: 0;
R
randx 已提交
11 12 13
    }
  }

D
Dmitriy Zaporozhets 已提交
14 15 16 17 18 19 20
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
    }

    .accept-control {
      display: inline-block;
D
Dmitriy Zaporozhets 已提交
21
      margin: 0;
22
      margin-left: 20px;
23
      padding: 10px 0;
D
Dmitriy Zaporozhets 已提交
24
      line-height: 20px;
25
      font-weight: bold;
D
Dmitriy Zaporozhets 已提交
26

27
      .remove_source_checkbox {
D
Dmitriy Zaporozhets 已提交
28
        margin: 0;
29
        font-weight: bold;
D
Dmitriy Zaporozhets 已提交
30
      }
31
    }
R
randx 已提交
32 33
  }
}
34

35 36 37 38 39 40 41
@media(min-width: $screen-sm-max) {
  .merge-request .merge-request-tabs{
    li {
      a {
        padding: 15px 40px;
        font-size: 14px;
      }
42 43 44
    }
  }
}
D
Dmitriy Zaporozhets 已提交
45

46 47 48 49 50
.merge-request .merge-request-tabs{
  margin-top: 30px;
  margin-bottom: 20px;
}

51 52 53
.mr_source_commit,
.mr_target_commit {
  .commit {
54
    margin: 0;
55
    padding: 2px 0;
56
    list-style: none;
57
    &:hover {
58
      background: none;
59 60 61 62
    }
  }
}

D
Dmitriy Zaporozhets 已提交
63
.label-branch {
64
  color: #222;
D
Dmitriy Zaporozhets 已提交
65
  font-family: $monospace_font;
66
  font-weight: bold;
67
  overflow: hidden;
D
Dmitriy Zaporozhets 已提交
68 69 70 71
}

.mr-list {
  .merge-request {
72
    padding: 10px 15px;
D
Dmitriy Zaporozhets 已提交
73 74 75 76
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
77
      font-size: $list-font-size;
78
      font-weight: bold;
D
Dmitriy Zaporozhets 已提交
79 80 81 82
    }

    .merge-request-info {
      color: #999;
83
      font-size: 13px;
D
Dmitriy Zaporozhets 已提交
84
    }
S
Stefan Tatschner 已提交
85 86 87 88 89 90 91 92 93

  }

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

  .merge-request-no-comments {
    opacity: 0.5;
D
Dmitriy Zaporozhets 已提交
94 95
  }
}
D
Dmitriy Zaporozhets 已提交
96 97 98

.merge-request-angle {
  text-align: center;
D
Dmitriy Zaporozhets 已提交
99
  margin: 0 auto;
100 101
  font-size: 2em;
  line-height: 1.1;
D
Dmitriy Zaporozhets 已提交
102 103
}

104
.merge-request-form-info {
D
Dmitriy Zaporozhets 已提交
105 106
  padding-top: 15px;
}
107 108

// hide mr close link for inline diff comment form
109 110 111
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
112
}
113

114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
.mr-state-widget {
  font-size: 13px;
  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);

  .ci_widget {
    padding: 10px 15px;
    font-size: 15px;
    border-bottom: 1px solid #EEE;

    &.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 {
    padding: 10px 15px;

    h4 {
      font-weight: bold;
      margin: 5px 0;
    }

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

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

  .ci-coverage {
    float: right;
  }
}

D
Dmitriy Zaporozhets 已提交
172 173 174 175 176 177 178 179 180
.merge-request-show-labels {
  a {
    margin-right: 5px;
    margin-bottom: 5px;
    display: inline-block;
    .color-label {
      padding: 6px 10px;
    }
  }
D
Drew Blessing 已提交
181
}
182 183 184 185

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