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

523 lines
7.9 KiB
SCSS
Raw Normal View History

/**
* MR -> show: Automerge widget
2012-06-13 13:02:30 -04:00
*
*/
.mr-state-widget {
2016-12-12 17:26:21 -05:00
background: $gray-light;
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;
form {
margin-bottom: 0;
.clearfix {
margin-bottom: 0;
2012-06-13 13:02:30 -04:00
}
}
.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
.btn-success.dropdown-toggle .fa {
color: inherit;
}
.btn-success.dropdown-toggle:disabled {
background-color: $gl-success;
}
.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;
}
}
.dropdown-toggle {
.fa {
color: inherit;
}
}
}
.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 {
color: $gl-text-color;
}
.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
}
.ci_widget {
border-bottom: 1px solid $well-inner-border;
2016-12-30 15:18:27 -05:00
color: $gl-text-color;
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
i,
svg {
margin-right: 8px;
}
2016-07-19 09:47:26 -04:00
svg {
position: relative;
top: 1px;
2016-07-21 10:28:41 -04:00
overflow: visible;
}
& > span {
padding-right: 4px;
}
@media (max-width: $screen-xs-max) {
flex-wrap: wrap;
}
}
.mr-widget-body,
.ci_widget,
.mr-widget-footer {
padding: $gl-padding;
}
.mr-widget-pipeline-graph {
flex-shrink: 0;
.dropdown-menu {
margin-top: 11px;
}
.ci-action-icon-wrapper {
line-height: 16px;
}
2017-02-08 13:33:38 -05:00
@media (min-width: $screen-sm-min) {
.stage-cell {
padding: 0 4px;
}
}
@media (max-width: $screen-xs-max) {
order: 1;
margin-top: $gl-padding-top;
border-radius: 3px;
background-color: $white-light;
border: 1px solid $gray-darker;
width: 100%;
text-align: center;
.dropdown-menu {
margin-left: -97.5px;
}
.arrow-up::before,
.arrow-up::after, {
margin-left: 97.5px;
}
}
}
.normal {
2016-12-30 15:18:27 -05:00
color: $gl-text-color;
}
2016-10-04 10:03:13 -04:00
.js-deployment-link {
display: inline-block;
}
2016-10-04 10:03:13 -04:00
.mr-widget-body {
h4 {
font-weight: 600;
2016-12-21 12:57:56 -05:00
font-size: 16px;
margin: 5px 0;
2016-12-30 15:18:27 -05:00
color: $gl-text-color;
&.has-conflicts .fa-exclamation-triangle {
color: $gl-warning;
}
}
p:last-child {
margin-bottom: 0;
}
2016-05-31 15:08:40 -04:00
.btn-grouped {
margin-left: 0;
margin-right: 7px;
}
@media (max-width: $screen-xs-max) {
2016-05-31 15:08:40 -04:00
h4 {
2016-12-02 14:43:33 -05:00
font-size: 14px;
2016-05-31 15:08:40 -04:00
}
p {
font-size: 13px;
}
.btn,
.btn-group,
.accept-action {
margin-bottom: 4px;
}
.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;
}
}
}
.mr-widget-footer {
2016-11-30 08:25:25 -05:00
border-top: 1px solid $gray-darker;
}
.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
}
.mr_source_commit,
.mr_target_commit {
margin-bottom: 0;
.commit {
margin: 0;
2016-07-05 11:16:49 -04:00
padding-top: 2px;
padding-bottom: 2px;
list-style: none;
&:hover {
background: none;
}
}
}
2013-04-06 08:10:24 -04:00
.label-branch {
2016-12-30 15:18:27 -05:00
color: $gl-text-color;
2013-04-06 08:10:24 -04:00
font-family: $monospace_font;
font-weight: bold;
overflow: hidden;
font-size: 90%;
margin: 0 3px;
2016-04-11 11:00:45 -04:00
word-break: break-all;
2013-04-06 08:10:24 -04:00
}
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 {
width: 600px;
.dark {
margin-right: 40px;
}
.btn-clipboard {
@extend .pull-right;
margin-right: 20px;
margin-top: 5px;
position: absolute;
right: 0;
}
2015-08-09 11:34:28 -04:00
}
.mr-source-target {
line-height: 31px;
}
.panel-new-merge-request {
.panel-heading {
padding: 5px 10px;
font-weight: 600;
line-height: 25px;
}
.panel-body {
padding: 10px 5px;
}
.panel-footer {
2016-04-06 06:08:24 -04:00
padding: 5px 10px;
.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
.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;
&:not(:last-child) {
margin-right: 10px;
}
}
}
.mr-version-controls {
2016-12-12 17:26:21 -05:00
background: $gray-light;
2016-09-14 17:51:06 -04:00
border-bottom: 1px solid $border-color;
color: $gl-text-color;
.mr-version-menus-container {
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
padding: 16px;
}
.content-block {
border-top: 1px solid $border-color;
padding: $gl-padding-top $gl-padding;
}
2016-09-14 17:51:06 -04:00
.comments-disabled-notif {
.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 {
2016-09-14 17:51:06 -04:00
color: $orange-normal;
padding-right: 5px;
}
}
.merge-request-tabs-holder {
2016-10-26 12:57:48 -04:00
background-color: $white-light;
&.affix {
top: 0;
left: 0;
2016-10-26 12:57:48 -04:00
z-index: 10;
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;
}
}
}
.limit-container-width {
.merge-request-tabs-container {
max-width: $limited-layout-width;
margin-left: auto;
margin-right: auto;
}
}
.limit-container-width:not(.container-limited) {
.merge-request-tabs-holder:not(.affix) {
.merge-request-tabs-container {
max-width: $limited-layout-width - ($gl-padding * 2);
}
}
}