merge_requests.scss 2.66 KB
Newer Older
randx's avatar
randx committed
1

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

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
14
  .accept-group {
15 16 17 18
    label {
      margin: 5px;
      margin-left: 20px;
    }
randx's avatar
randx committed
19 20
  }
}
21

22 23 24
@media(min-width: $screen-sm-max) {
  .merge-request .merge-request-tabs{
    margin: 20px 0;
25

26 27 28 29 30
    li {
      a {
        padding: 15px 40px;
        font-size: 14px;
      }
31 32 33
    }
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
34

35 36 37
.mr_source_commit,
.mr_target_commit {
  .commit {
38
    margin: 0;
39
    padding: 2px 0;
40
    list-style: none;
41
    &:hover {
42
      background: none;
43 44 45 46
    }
  }
}

47 48
.label-branch {
  @include border-radius(4px);
49
  padding: 3px 4px;
50
  border: none;
51 52
  background: $hover;
  color: #333;
53 54
  font-family: $monospace_font;
  font-weight: normal;
55 56 57 58 59
  overflow: hidden;

  .label-project {
    @include border-radius-left(4px);
    padding: 3px 4px;
60
    background: #279;
61 62 63 64
    position: relative;
    left: -4px;
    letter-spacing: -1px;
  }
65 66 67 68
}

.mr-list {
  .merge-request {
69
    padding: 10px 15px;
70 71 72 73 74 75 76 77 78
    position: relative;

    .merge-request-title {
      margin-bottom: 5px;
      font-size: 14px;
    }

    .merge-request-info {
      color: #999;
79 80 81 82

      .merge-request-labels {
        display: inline-block;
      }
83 84 85
    }
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
86 87 88

.merge-request-angle {
  text-align: center;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
89
  margin: 0 auto;
90 91
  font-size: 2em;
  line-height: 1.1;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
92 93
}

94
.merge-request-form-info {
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
95 96
  padding-top: 15px;
}
97 98

// hide mr close link for inline diff comment form
99 100 101
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
  display: none;
102
}
103 104

.mr-state-widget {
105
  background: $box_bg;
106
  margin-bottom: 20px;
107
  color: #666;
108 109 110 111 112
  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));

  .ci_widget {
    padding: 10px 15px;
    font-size: 15px;
113 114
    border-bottom: 1px solid #BBB;
    color: #777;
115
    background-color: #F5F5F5;
116 117 118 119

    &.ci-success {
      color: $bg_success;
      border-color: $border_success;
120
      background-color: #F1FAF1;
121 122 123 124 125
    }

    &.ci-pending {
      color: #548;
      border-color: #548;
126
      background-color: #F4F1FA;
127 128 129 130 131
    }

    &.ci-running {
      color: $bg_warning;
      border-color: $border_warning;
132
      background-color: #FAF5F1;
133 134 135 136 137
    }

    &.ci-failed {
      color: $bg_danger;
      border-color: $border_danger;
138
      background-color: #FAF1F1;
139 140 141 142 143
    }

    &.ci-error {
      color: $bg_danger;
      border-color: $border_danger;
144
      background-color: #FAF1F1;
145 146 147 148 149 150
    }
  }

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

151
    h4 {
152
      font-weight: normal;
153 154 155 156 157 158
    }

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

160 161 162 163 164
  .mr-widget-footer {
    padding: 10px 15px;
    border-top: 1px solid #EEE;
  }

165 166 167
  .ci-coverage {
    float: right;
  }
168
}
169 170 171 172

.merge-request-show-labels .label {
  padding: 6px 10px;
}