merge_requests.scss 2.08 KB
Newer Older
1
/**
randx's avatar
randx committed
2 3 4 5
 * MR form
 *
 */

6
.mr_branch_box {
randx's avatar
randx committed
7 8 9
  @extend .ui-box;
  margin-bottom:20px;

10
  .body {
randx's avatar
randx committed
11 12 13 14 15 16 17 18 19
    background:#f1f1f1;
  }

}

/**
 * MR -> show: Automerge widget
 *
 */
20 21
.automerge_widget {
  &.can_be_merged {
randx's avatar
randx committed
22 23 24
    background: #DFF0D8;
  }

25
  form {
randx's avatar
randx committed
26
    margin-bottom:0;
27
    .clearfix {
randx's avatar
randx committed
28 29 30 31
      margin-bottom:0;
    }
  }

32
  .accept_group {
randx's avatar
randx committed
33 34 35 36 37 38 39
    float:left;
    border: 1px solid #ADA;
    padding: 2px;
    @include border-radius(5px);
    border-radius: 5px;
    background: #CEB;

40
    .accept_merge_request {
41
      font-size:13px;
randx's avatar
randx committed
42 43
      float:left;
    }
44
    .remove_branch_holder {
randx's avatar
randx committed
45 46 47 48
      margin-left:20px;
      margin-right:10px;
      float:left;
    }
49
    label {
randx's avatar
randx committed
50 51 52 53 54
      color:#444;
    }
  }


55
  .how_to_merge_link {
randx's avatar
randx committed
56 57 58
    @extend .primary;
  }
}
59

60 61 62
.mr_nav_tabs {
  li {
    a {
63 64 65 66 67 68
      font-weight:bold;
      padding:8px 20px;
      text-align:center;
    }
  }
}
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
69

70
li.merge_request {
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
71
  padding:7px 10px;
72
  img.avatar {
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
73
    width: 32px;
74
    margin-top: 1px;
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
75
  }
76
  p {
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
77 78 79 80
    padding: 0px;
    padding-bottom: 2px;
  }
}
randx's avatar
randx committed
81

82
.merge_in_progress {
randx's avatar
randx committed
83 84 85
  @extend .padded;
  @extend .append-bottom-10;
}
86 87 88 89 90

.label_branch {
  @include round-borders-all(4px);
  padding:2px 4px;
  border:none;
91
  font-size:14px;
92 93
  background: #474D57;
  color:#fff;
94
  font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
95
}
96

97 98 99
.mr_source_commit,
.mr_target_commit {
  .commit {
100 101 102 103 104
    margin:0;
    padding:0;
    padding: 5px;
    margin-bottom: 5px;
    .avatar { position:relative }
105
    .row_title {
106 107 108 109 110 111 112 113 114
      color:#444;
    }
    .commit-author-name,
    .dash,
    .committed_ago,
    .browse_code_link_holder {
      display:none;
    }
    list-style:none;
115
    &:hover {
116 117 118 119 120
      background:none;
    }
  }
}

121
.mr_direction_tip {
122 123
  margin-top:40px
}
124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140

.merge_requests_form_box {
  @extend .main_box;
  .merge_requests_middle_box {
    @extend .middle_box_content;
    height:30px;
    .merge_requests_assignee {
      @extend .span6;
      float:left;
    }
    .merge_requests_milestone {
      @extend .span4;
      float:left;
    }
  }
}

141 142 143 144 145
.status-badge {
  height: 32px;
  width: 100%;
  @include border-radius(5px);
}