debian-mirror-gitlab/app/assets/stylesheets/pages/merge_requests.scss

731 lines
11 KiB
SCSS
Raw Normal View History

2015-09-11 14:41:01 +05:30
/**
* MR -> show: Automerge widget
2015-04-26 12:48:37 +05:30
*
*/
2017-09-10 17:25:29 +05:30
.space-children {
@include clearfix;
> * {
float: left;
}
> *:not(:last-child) {
margin-right: 10px;
}
}
2015-09-11 14:41:01 +05:30
.mr-state-widget {
2017-08-17 22:00:37 +05:30
color: $gl-text-color;
border: 1px solid $border-color;
2016-11-03 12:29:30 +05:30
border-radius: 2px;
2017-09-10 17:25:29 +05:30
line-height: 28px;
.mr-widget-heading,
.mr-widget-section,
.mr-widget-footer {
padding: $gl-padding;
border-top: solid 1px $border-color;
}
.mr-widget-footer {
padding: 0;
}
2015-09-11 14:41:01 +05:30
2015-04-26 12:48:37 +05:30
form {
margin-bottom: 0;
2016-11-03 12:29:30 +05:30
2015-04-26 12:48:37 +05:30
.clearfix {
margin-bottom: 0;
}
}
2017-09-10 17:25:29 +05:30
label {
margin-bottom: 0;
}
.btn {
font-size: $gl-font-size;
&[disabled] {
opacity: 0.3;
}
&.btn-xs {
line-height: 1;
padding: 5px 10px;
margin-top: 1px;
}
&.dropdown-toggle {
.fa {
color: inherit;
}
}
}
2015-04-26 12:48:37 +05:30
.accept-merge-holder {
.accept-action {
display: inline-block;
2015-12-23 02:04:40 +05:30
float: left;
2015-11-26 14:37:03 +05:30
2017-08-17 22:00:37 +05:30
.accept-merge-request {
2015-11-26 14:37:03 +05:30
&.ci-pending,
&.ci-running {
2017-08-17 22:00:37 +05:30
@include btn-blue;
2015-11-26 14:37:03 +05:30
}
&.ci-skipped,
&.ci-failed,
&.ci-canceled,
&.ci-error {
@include btn-red;
}
}
2015-04-26 12:48:37 +05:30
}
.accept-control {
display: inline-block;
2015-12-23 02:04:40 +05:30
float: left;
2015-04-26 12:48:37 +05:30
margin: 0;
margin-left: 20px;
2015-09-11 14:41:01 +05:30
padding: 5px;
padding-top: 8px;
2015-04-26 12:48:37 +05:30
line-height: 20px;
2015-09-25 12:07:36 +05:30
&.right {
float: right;
2017-08-17 22:00:37 +05:30
padding-right: 0;
}
.modify-merge-commit-link {
padding: 0;
background-color: transparent;
border: 0;
2016-11-03 12:29:30 +05:30
2017-08-17 22:00:37 +05:30
color: $gl-text-color;
&:hover,
&:focus {
text-decoration: underline;
2015-09-25 12:07:36 +05:30
}
}
2017-08-17 22:00:37 +05:30
.merge-param-checkbox {
2015-04-26 12:48:37 +05:30
margin: 0;
}
2017-08-17 22:00:37 +05:30
a .fa-question-circle {
color: $gl-text-color-secondary;
&:hover,
&:focus {
color: $link-hover-color;
}
}
2015-04-26 12:48:37 +05:30
}
}
2015-09-11 14:41:01 +05:30
2017-08-17 22:00:37 +05:30
.ci-widget {
color: $gl-text-color;
display: flex;
2015-09-11 14:41:01 +05:30
2017-08-17 22:00:37 +05:30
@media (max-width: $screen-xs-max) {
flex-wrap: wrap;
2016-08-24 12:49:21 +05:30
}
2017-09-10 17:25:29 +05:30
}
2016-08-24 12:49:21 +05:30
2017-09-10 17:25:29 +05:30
.mr-widget-icon {
font-size: 22px;
margin-right: $status-icon-margin;
}
2015-09-11 14:41:01 +05:30
2017-09-10 17:25:29 +05:30
.ci-status-icon svg {
width: $status-icon-size;
height: $status-icon-size;
margin: 3px 0;
position: relative;
overflow: visible;
display: block;
2017-08-17 22:00:37 +05:30
}
2017-09-10 17:25:29 +05:30
.mr-widget-body {
@include clearfix;
&.media > *:first-child {
margin-right: 10px;
}
2017-08-17 22:00:37 +05:30
}
2015-09-11 14:41:01 +05:30
2017-08-17 22:00:37 +05:30
.mr-widget-pipeline-graph {
2017-09-10 17:25:29 +05:30
padding: 0 4px;
2017-08-17 22:00:37 +05:30
.dropdown-menu {
2017-09-10 17:25:29 +05:30
z-index: 300;
2016-08-24 12:49:21 +05:30
}
2017-08-17 22:00:37 +05:30
.ci-action-icon-wrapper {
line-height: 16px;
2015-09-11 14:41:01 +05:30
}
2017-09-10 17:25:29 +05:30
}
2015-12-23 02:04:40 +05:30
2017-09-10 17:25:29 +05:30
.mini-pipeline-graph-dropdown-toggle {
vertical-align: top;
}
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
.mini-pipeline-graph-dropdown-menu .mini-pipeline-graph-dropdown-item {
display: flex;
align-items: center;
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
.ci-status-text,
.ci-status-icon {
top: 0;
margin-right: 10px;
2015-12-23 02:04:40 +05:30
}
2015-09-11 14:41:01 +05:30
}
2017-08-17 22:00:37 +05:30
.normal {
2017-09-10 17:25:29 +05:30
line-height: 28px;
2015-09-11 14:41:01 +05:30
}
2017-08-17 22:00:37 +05:30
.capitalize {
text-transform: capitalize;
2015-10-24 18:46:33 +05:30
}
2017-09-10 17:25:29 +05:30
.label-branch {
@extend .ref-name;
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
color: $gl-text-color;
font-weight: 600;
overflow: hidden;
word-break: break-all;
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
&.label-truncated {
position: relative;
display: inline-block;
width: 250px;
margin-bottom: -3px;
white-space: nowrap;
text-overflow: clip;
line-height: 14px;
&::after {
position: absolute;
content: '...';
right: 0;
font-family: $regular_font;
background-color: $gray-light;
}
2017-08-17 22:00:37 +05:30
}
}
2017-09-10 17:25:29 +05:30
.mr-widget-help {
padding: 10px 16px 10px 48px;
font-style: italic;
2017-08-17 22:00:37 +05:30
}
2015-09-11 14:41:01 +05:30
.mr-widget-body {
h4 {
2017-09-10 17:25:29 +05:30
float: left;
font-weight: 600;
font-size: 14px;
line-height: inherit;
margin-top: 0;
margin-bottom: 0;
&.has-conflicts .fa-exclamation-triangle {
color: $gl-warning;
}
2015-09-11 14:41:01 +05:30
2017-08-17 22:00:37 +05:30
time {
font-weight: normal;
}
2015-09-11 14:41:01 +05:30
}
2016-06-22 15:30:34 +05:30
.btn-grouped {
margin-left: 0;
margin-right: 7px;
}
2017-08-17 22:00:37 +05:30
label {
font-weight: normal;
}
.spacing {
2017-09-10 17:25:29 +05:30
margin: 0 0 0 10px;
2017-08-17 22:00:37 +05:30
}
.bold {
2017-09-10 17:25:29 +05:30
font-weight: 600;
2017-08-17 22:00:37 +05:30
color: $gl-gray-light;
}
.state-label {
2017-09-10 17:25:29 +05:30
font-weight: 600;
2017-08-17 22:00:37 +05:30
padding-right: 10px;
}
.danger {
color: $gl-danger;
}
.spacing,
.bold {
vertical-align: middle;
}
.dropdown-menu {
li a {
padding: 5px;
}
2017-09-10 17:25:29 +05:30
.merge-opt-icon {
line-height: 1.5;
2017-08-17 22:00:37 +05:30
}
.merge-opt-title {
margin-left: 8px;
}
}
.dropdown-toggle {
.fa {
2017-09-10 17:25:29 +05:30
margin-left: 0;
2017-08-17 22:00:37 +05:30
color: inherit;
}
}
.has-custom-error {
display: inline-block;
}
2016-06-22 15:30:34 +05:30
@media (max-width: $screen-xs-max) {
p {
font-size: 13px;
}
2017-08-17 22:00:37 +05:30
.btn-grouped {
float: none;
margin-right: 0;
}
2016-06-22 15:30:34 +05:30
.accept-action {
width: 100%;
text-align: center;
}
.accept-control {
width: 100%;
text-align: center;
margin: 0;
}
}
2017-08-17 22:00:37 +05:30
.commit-message-editor {
label {
padding: 0;
}
}
2017-09-10 17:25:29 +05:30
&.mr-widget-empty-state {
line-height: 20px;
2015-09-11 14:41:01 +05:30
2017-09-10 17:25:29 +05:30
.artwork {
margin-bottom: $gl-padding;
}
.text {
span {
font-weight: 600;
}
p {
margin-top: $gl-padding;
}
}
}
2015-09-11 14:41:01 +05:30
}
.ci-coverage {
float: right;
}
2016-11-03 12:29:30 +05:30
.stop-env-container {
color: $gl-text-color;
float: right;
a {
color: $gl-text-color;
}
}
2015-04-26 12:48:37 +05:30
}
2017-08-17 22:00:37 +05:30
.mr-state-widget .mr-widget-body {
.approve-btn {
margin-right: 5px;
}
}
2015-04-26 12:48:37 +05:30
.mr_source_commit,
.mr_target_commit {
2016-06-02 11:05:42 +05:30
margin-bottom: 0;
2015-04-26 12:48:37 +05:30
.commit {
margin: 0;
2017-09-10 17:25:29 +05:30
padding: 10px;
2015-04-26 12:48:37 +05:30
list-style: none;
2016-11-03 12:29:30 +05:30
2015-04-26 12:48:37 +05:30
&:hover {
background: none;
}
}
}
2016-11-03 12:29:30 +05:30
.commits-empty {
text-align: center;
h4 {
padding-top: 20px;
padding-bottom: 10px;
}
svg {
width: 230px;
}
}
2015-04-26 12:48:37 +05:30
.mr-list {
.merge-request {
2017-08-17 22:00:37 +05:30
padding: 10px 0 10px 15px;
2015-04-26 12:48:37 +05:30
position: relative;
2017-08-17 22:00:37 +05:30
display: -webkit-flex;
display: flex;
.issue-info-container {
-webkit-flex: 1;
flex: 1;
}
2015-04-26 12:48:37 +05:30
.merge-request-title {
2016-06-02 11:05:42 +05:30
margin-bottom: 2px;
2016-08-24 12:49:21 +05:30
.ci-status-link {
svg {
height: 16px;
width: 16px;
position: relative;
top: 3px;
}
2016-09-13 17:45:13 +05:30
&:hover,
&:focus {
text-decoration: none;
}
2016-08-24 12:49:21 +05:30
}
2015-04-26 12:48:37 +05:30
}
2015-09-11 14:41:01 +05:30
}
.merge-request-labels {
display: inline-block;
}
2015-04-26 12:48:37 +05:30
}
.merge-request-angle {
text-align: center;
margin: 0 auto;
font-size: 2em;
line-height: 1.1;
}
// hide mr close link for inline diff comment form
.diff-file .close-mr-link,
.diff-file .reopen-mr-link {
display: none;
}
2015-09-11 14:41:01 +05:30
#modal_merge_info .modal-dialog {
2017-08-17 22:00:37 +05:30
.dark {
margin-right: 40px;
}
2015-11-26 14:37:03 +05:30
.btn-clipboard {
2015-12-23 02:04:40 +05:30
margin-right: 20px;
2015-11-26 14:37:03 +05:30
margin-top: 5px;
position: absolute;
right: 0;
}
2015-09-11 14:41:01 +05:30
}
2017-09-10 17:25:29 +05:30
.mr-links {
padding-left: $status-icon-size + $status-icon-margin;
}
2017-08-17 22:00:37 +05:30
.mr-info-list {
2017-09-10 17:25:29 +05:30
clear: left;
2017-08-17 22:00:37 +05:30
position: relative;
2017-09-10 17:25:29 +05:30
padding-top: 4px;
2017-08-17 22:00:37 +05:30
p {
2017-09-10 17:25:29 +05:30
margin: 0;
2017-08-17 22:00:37 +05:30
position: relative;
2017-09-10 17:25:29 +05:30
padding: 4px 0;
2017-08-17 22:00:37 +05:30
&:last-child {
2017-09-10 17:25:29 +05:30
padding-bottom: 0;
2017-08-17 22:00:37 +05:30
}
}
}
.mr-info-list.mr-memory-usage {
p {
float: left;
}
.memory-graph-container {
float: left;
margin-left: 5px;
}
}
2015-09-11 14:41:01 +05:30
.mr-source-target {
2017-09-10 17:25:29 +05:30
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
2017-08-17 22:00:37 +05:30
background-color: $gray-light;
2017-09-10 17:25:29 +05:30
border-radius: $border-radius-default $border-radius-default 0 0;
padding: $gl-padding / 2 $gl-padding;
2017-08-17 22:00:37 +05:30
.dropdown-toggle .fa {
color: $gl-text-color;
}
2015-09-11 14:41:01 +05:30
}
2016-04-02 18:10:28 +05:30
2016-06-02 11:05:42 +05:30
.panel-new-merge-request {
.panel-heading {
padding: 5px 10px;
font-weight: 600;
line-height: 25px;
2016-04-02 18:10:28 +05:30
}
2016-06-02 11:05:42 +05:30
.panel-body {
padding: 10px 5px;
}
2016-04-02 18:10:28 +05:30
2016-06-02 11:05:42 +05:30
.panel-footer {
2017-08-17 22:00:37 +05:30
padding: 0;
2016-06-22 15:30:34 +05:30
.btn {
min-width: auto;
}
2016-06-02 11:05:42 +05:30
}
2016-04-02 18:10:28 +05:30
2016-06-02 11:05:42 +05:30
.commit {
.commit-row-title {
margin-bottom: 4px;
}
2016-08-24 12:49:21 +05:30
.item-title {
@media (min-width: $screen-sm-min) {
width: 45%;
}
}
2016-06-02 11:05:42 +05:30
.avatar {
2016-08-24 12:49:21 +05:30
left: 0;
top: 2px;
2016-06-02 11:05:42 +05:30
}
}
.btn-clipboard {
margin-right: 5px;
padding: 0;
background: transparent;
}
.ci-status-link {
margin-right: 5px;
}
}
.merge-request-select {
padding-left: 5px;
padding-right: 5px;
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
2016-06-22 15:30:34 +05:30
@media (min-width: $screen-xs-min) {
2016-06-02 11:05:42 +05:30
float: left;
width: 50%;
margin-bottom: 0;
}
.dropdown-menu-toggle {
width: 100%;
}
.dropdown-menu {
left: 5px;
right: 5px;
width: auto;
}
}
.issuable-form-select-holder {
display: inline-block;
width: 250px;
2016-11-03 12:29:30 +05:30
.dropdown-menu-toggle {
width: 100%;
}
2016-06-02 11:05:42 +05:30
}
2017-08-17 22:00:37 +05:30
.target-branch-select-dropdown-container {
position: relative;
}
.assign-to-me-link {
padding-left: 12px;
white-space: nowrap;
}
2016-06-02 11:05:42 +05:30
.table-holder {
2016-11-03 12:29:30 +05:30
.ci-table {
2016-06-02 11:05:42 +05:30
th {
background-color: $white-light;
2017-08-17 22:00:37 +05:30
color: $gl-text-color-secondary;
2016-06-02 11:05:42 +05:30
}
}
}
2016-06-02 11:05:42 +05:30
.merged-buttons {
.btn {
float: left;
2016-04-02 18:10:28 +05:30
}
}
2016-09-13 17:45:13 +05:30
2016-09-29 09:46:39 +05:30
.mr-version-controls {
2017-09-10 17:25:29 +05:30
position: relative;
2017-08-17 22:00:37 +05:30
background: $gray-light;
2016-09-29 09:46:39 +05:30
color: $gl-text-color;
2017-09-10 17:25:29 +05:30
z-index: 199;
2016-09-29 09:46:39 +05:30
.mr-version-menus-container {
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
padding: 16px;
}
2016-11-03 12:29:30 +05:30
.content-block {
padding: $gl-padding-top $gl-padding;
}
2016-09-29 09:46:39 +05:30
.comments-disabled-notif {
2017-08-17 22:00:37 +05:30
line-height: 28px;
2016-09-29 09:46:39 +05:30
.btn {
margin-left: 5px;
}
}
.mr-version-dropdown,
.mr-version-compare-dropdown {
margin: 0 7px;
}
.dropdown-title {
color: $gl-text-color;
}
.fa-info-circle {
2017-08-17 22:00:37 +05:30
color: $orange-500;
2016-09-29 09:46:39 +05:30
padding-right: 5px;
}
}
2016-11-03 12:29:30 +05:30
.merge-request-tabs-holder {
2017-09-10 17:25:29 +05:30
top: $header-height;
z-index: 200;
2016-11-03 12:29:30 +05:30
background-color: $white-light;
2017-08-17 22:00:37 +05:30
border-bottom: 1px solid $border-color;
2016-11-03 12:29:30 +05:30
2017-09-10 17:25:29 +05:30
@media (min-width: $screen-sm-min) {
position: sticky;
position: -webkit-sticky;
}
2016-11-03 12:29:30 +05:30
&.affix {
left: 0;
transition: right .15s;
2017-08-17 22:00:37 +05:30
@media (max-width: $screen-xs-max) {
right: 0;
}
.merge-request-tabs-container {
padding-left: $gl-padding;
padding-right: $gl-padding;
}
2016-11-03 12:29:30 +05:30
}
2016-09-13 17:45:13 +05:30
2017-08-17 22:00:37 +05:30
.nav-links {
border: 0;
}
}
2017-09-10 17:25:29 +05:30
.with-performance-bar .merge-request-tabs-holder {
top: $header-height + $performance-bar-height;
}
2017-08-17 22:00:37 +05:30
.merge-request-tabs {
display: flex;
margin-bottom: 0;
padding: 0;
}
.limit-container-width {
.merge-request-tabs-container {
max-width: $limited-layout-width;
margin-left: auto;
margin-right: auto;
2017-09-10 17:25:29 +05:30
.inner-page-scroll-tabs {
background-color: $white-light;
margin-left: -$gl-padding;
padding-left: $gl-padding;
}
2017-08-17 22:00:37 +05:30
}
}
.merge-request-tabs-container {
display: flex;
justify-content: space-between;
@media (max-width: $screen-xs-max) {
flex-direction: column-reverse;
}
}
.limit-container-width:not(.container-limited) {
.merge-request-tabs-holder:not(.affix) {
.merge-request-tabs-container {
max-width: $limited-layout-width - ($gl-padding * 2);
}
}
}
.mr-memory-usage {
p.usage-info-loading .usage-info-load-spinner {
margin-right: 10px;
font-size: 16px;
}
2016-09-13 17:45:13 +05:30
}