gitlab-org--gitlab-foss/app/assets/stylesheets/pages/merge_requests.scss

728 lines
11 KiB
SCSS
Raw Normal View History

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