merge_requests.scss 2.57 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
.merge-request .merge-request-tabs{
23
  border-bottom: 2px solid $border_primary;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
24
  margin: 20px 0;
25

26 27
  li {
    a {
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
28
      padding: 15px 40px;
29
      font-size: 14px;
30 31 32
      margin-bottom: -2px;
      border-bottom: 2px solid $border_primary;
      @include border-radius(0px);
33 34 35
    }
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
36

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

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

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

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

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

    .merge-request-info {
      color: #999;
81 82 83 84

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

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

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

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

.mr-state-widget {
107 108 109 110 111 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
  background: #f9f9f9;
  margin-bottom: 20px;
  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));

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

    &.ci-success {
      color: $bg_success;
      border-color: $border_success;
    }

    &.ci-pending {
      color: #548;
      border-color: #548;
    }

    &.ci-running {
      color: $bg_warning;
      border-color: $border_warning;
    }

    &.ci-failed {
      color: $bg_danger;
      border-color: $border_danger;
    }

    &.ci-error {
      color: $bg_danger;
      border-color: $border_danger;
    }
  }

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

145 146 147 148 149 150 151 152
    h4 {
      margin-top: 0px;
    }

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

154 155 156 157 158
  .mr-widget-footer {
    padding: 10px 15px;
    border-top: 1px solid #EEE;
  }

159 160 161
  .ci-coverage {
    float: right;
  }
162
}
163 164 165 166

.merge-request-show-labels .label {
  padding: 6px 10px;
}
167 168 169 170

.mr-commits .commit {
  padding: 10px 15px;
}