Commit 301315f3 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ee1979-css' into 'master'

Update common CSS for MR approvals

See merge request gitlab-org/gitlab-ce!24141
parents 77de0063 27c84cb3
...@@ -384,10 +384,17 @@ img.emoji { ...@@ -384,10 +384,17 @@ img.emoji {
.flex-align-self-center { align-self: center; } .flex-align-self-center { align-self: center; }
.flex-grow { flex-grow: 1; } .flex-grow { flex-grow: 1; }
.flex-no-shrink { flex-shrink: 0; } .flex-no-shrink { flex-shrink: 0; }
.mw-460 { max-width: 460px; }
.ws-initial { white-space: initial; } .ws-initial { white-space: initial; }
.overflow-auto { overflow: auto; }
/** COMMON SIZING CLASSES **/
.w-0 { width: 0; }
.h-13em { height: 13em; }
.mw-460 { max-width: 460px; }
.mw-6em { max-width: 6em; }
.min-height-0 { min-height: 0; } .min-height-0 { min-height: 0; }
/** COMMON SPACING CLASSES **/
.gl-pl-0 { padding-left: 0; } .gl-pl-0 { padding-left: 0; }
.gl-pl-1 { padding-left: #{0.5 * $grid-size}; } .gl-pl-1 { padding-left: #{0.5 * $grid-size}; }
.gl-pl-2 { padding-left: $grid-size; } .gl-pl-2 { padding-left: $grid-size; }
......
...@@ -36,6 +36,15 @@ label { ...@@ -36,6 +36,15 @@ label {
} }
} }
.label-wrapper {
display: block;
margin: 0;
}
.form-label {
@extend label;
}
.form-control-label { .form-control-label {
@extend .col-md-2; @extend .col-md-2;
} }
......
...@@ -57,6 +57,16 @@ ...@@ -57,6 +57,16 @@
color: $gl-text-color; color: $gl-text-color;
} }
} }
&.is-invalid {
~ .invalid-feedback {
display: block;
}
.select2-choices {
border-color: $red-500;
}
}
} }
.select2-drop, .select2-drop,
...@@ -67,10 +77,18 @@ ...@@ -67,10 +77,18 @@
min-width: 175px; min-width: 175px;
color: $gl-text-color; color: $gl-text-color;
z-index: 999; z-index: 999;
.modal-open & {
z-index: $zindex-modal + 200;
}
} }
.select2-drop-mask { .select2-drop-mask {
z-index: 998; z-index: 998;
.modal-open & {
z-index: $zindex-modal + 100;
}
} }
.select2-drop.select2-drop-above.select2-drop-active { .select2-drop.select2-drop-above.select2-drop-active {
......
...@@ -50,6 +50,14 @@ table { ...@@ -50,6 +50,14 @@ table {
border-color: $white-normal; border-color: $white-normal;
} }
} }
.thead-white {
th {
background-color: $white-light;
color: $gl-text-color-secondary;
border-top: 0;
}
}
} }
&.responsive-table { &.responsive-table {
...@@ -153,3 +161,4 @@ table { ...@@ -153,3 +161,4 @@ table {
border-top: 0; border-top: 0;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment