BigW Consortium Gitlab

merge_requests.scss 2.86 KB
Newer Older
randx committed
1

2 3
  /**
   * MR -> show: Automerge widget
randx committed
4 5
 *
 */
6 7
.automerge_widget {
  form {
8
    margin-bottom: 0;
9
    .clearfix {
10
      margin-bottom: 0;
randx committed
11 12 13
    }
  }

14 15 16 17 18 19 20
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
    }

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

27
      .remove_source_checkbox {
28
        margin: 0;
29
        font-weight: bold;
30
      }
31
    }
randx committed
32 33
  }
}
34

35 36 37
@media(min-width: $screen-sm-max) {
  .merge-request .merge-request-tabs{
    margin: 20px 0;
38

39 40 41 42 43
    li {
      a {
        padding: 15px 40px;
        font-size: 14px;
      }
44 45 46
    }
  }
}
Dmitriy Zaporozhets committed
47

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

60 61
.label-branch {
  @include border-radius(4px);
62
  padding: 3px 4px;
63
  border: none;
64 65
  background: $hover;
  color: #333;
66 67
  font-family: $monospace_font;
  font-weight: normal;
68 69 70 71 72
  overflow: hidden;

  .label-project {
    @include border-radius-left(4px);
    padding: 3px 4px;
73
    background: #279;
74 75 76 77
    position: relative;
    left: -4px;
    letter-spacing: -1px;
  }
78 79 80 81
}

.mr-list {
  .merge-request {
82
    padding: 10px 15px;
83 84 85 86
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
87
      font-size: $list-font-size;
88
      font-weight: bold;
89 90 91 92
    }

    .merge-request-info {
      color: #999;
93
      font-size: 13px;
94
    }
95 96 97 98 99 100 101 102 103

  }

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

  .merge-request-no-comments {
    opacity: 0.5;
104 105
  }
}
106 107 108

.merge-request-angle {
  text-align: center;
Dmitriy Zaporozhets committed
109
  margin: 0 auto;
110 111
  font-size: 2em;
  line-height: 1.1;
112 113
}

114
.merge-request-form-info {
Dmitriy Zaporozhets committed
115 116
  padding-top: 15px;
}
117 118

// hide mr close link for inline diff comment form
119 120 121
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
122
}
123 124

.mr-state-widget {
125
  font-size: 13px;
126
  background: #FAFAFA;
127
  margin-bottom: 20px;
128
  color: #666;
129 130 131
  border: 1px solid #e5e5e5;
  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
  @include border-radius(3px);
132 133 134 135

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

    &.ci-success {
139
      color: $gl-success;
140 141
    }

142
    &.ci-pending,
143
    &.ci-running {
144
      color: $gl-warning;
145 146
    }

147 148
    &.ci-failed,
    &.ci-canceled,
149
    &.ci-error {
150
      color: $gl-danger;
151 152 153 154 155 156
    }
  }

  .mr-widget-body {
    padding: 10px 15px;

157
    h4 {
158
      font-weight: bold;
159
      margin: 5px 0;
160 161 162 163 164 165
    }

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

167 168 169 170 171
  .mr-widget-footer {
    padding: 10px 15px;
    border-top: 1px solid #EEE;
  }

172 173 174
  .ci-coverage {
    float: right;
  }
175
}
176

177 178 179 180 181 182 183 184 185
.merge-request-show-labels {
  a {
    margin-right: 5px;
    margin-bottom: 5px;
    display: inline-block;
    .color-label {
      padding: 6px 10px;
    }
  }
186
}
187 188 189 190

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