Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss42
1 files changed, 16 insertions, 26 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 1e5e6da4e6c..5cf2d847405 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -64,7 +64,7 @@ $mr-widget-min-height: 69px;
background-color: $gray-light;
&.clickable:hover {
- background-color: $gl-gray-200;
+ background-color: $gl-gray-100;
cursor: pointer;
}
}
@@ -75,7 +75,7 @@ $mr-widget-min-height: 69px;
&::before {
content: '';
- border-left: 1px solid $gray-200;
+ border-left: 1px solid $gray-100;
position: absolute;
left: 28px;
top: -17px;
@@ -162,10 +162,6 @@ $mr-widget-min-height: 69px;
.btn {
font-size: $gl-font-size;
- &[disabled] {
- opacity: 0.3;
- }
-
&.dropdown-toggle {
.fa {
color: inherit;
@@ -401,6 +397,16 @@ $mr-widget-min-height: 69px;
}
}
}
+
+ &.mr-pipeline-suggest {
+ border-radius: $border-radius-default;
+ line-height: 20px;
+ border: 1px solid $border-color;
+
+ .circle-icon-container {
+ color: $gl-text-color-quaternary;
+ }
+ }
}
.mr-widget-help {
@@ -600,26 +606,6 @@ $mr-widget-min-height: 69px;
}
}
-.mr-pipeline-suggest {
- flex-wrap: wrap;
- border-radius: $border-radius-default;
- padding: $gl-padding;
- border: 1px solid $border-color;
- min-height: $mr-widget-min-height;
-
- @include media-breakpoint-up(md) {
- align-items: center;
- }
-
- .circle-icon-container {
- color: $gl-text-color-quaternary;
- }
-
- .popover {
- z-index: 240;
- }
-}
-
.card-new-merge-request {
.card-header {
padding: 5px 10px;
@@ -1050,3 +1036,7 @@ $mr-widget-min-height: 69px;
}
}
}
+
+.diff-file-row.is-active {
+ background-color: $gray-50;
+}