Commit a8e96bfc authored by Phil Hughes's avatar Phil Hughes

Merge branch 'ee-6658-issuable-css' into 'master'

EE: Removes EE differences for issuable.scss

Closes #6658

See merge request gitlab-org/gitlab-ee!10423
parents acc177c2 b60a9790
...@@ -200,15 +200,6 @@ ...@@ -200,15 +200,6 @@
} }
} }
} }
&.weight {
.gl-field-error {
margin-top: $gl-padding-8;
margin-left: -6px;
display: flex;
align-items: center;
}
}
} }
.block-first { .block-first {
...@@ -322,7 +313,8 @@ ...@@ -322,7 +313,8 @@
} }
.no-value, .no-value,
.btn-default-hover-link { .btn-default-hover-link,
.btn-secondary-hover-link {
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
...@@ -928,53 +920,12 @@ ...@@ -928,53 +920,12 @@
} }
} }
.add-issuable-form-input-wrapper {
height: auto;
padding: $gl-vert-padding $gl-vert-padding 0 $gl-input-padding;
&.focus,
&.focus:hover {
border-color: $blue-300;
box-shadow: 0 0 4px $dropdown-input-focus-shadow;
}
}
.add-issuable-form-input-token-list {
display: flex;
flex-wrap: wrap;
align-items: baseline;
list-style: none;
margin-bottom: 0;
padding-left: 0;
}
.add-issuable-form-token-list-item {
max-width: 100%;
margin-bottom: $gl-vert-padding;
margin-right: 5px;
}
.add-issuable-form-input-list-item {
flex: 1;
min-width: 200px;
margin-bottom: $gl-vert-padding;
}
.add-issuable-form-input {
width: 100%;
border: 0;
&:focus {
outline: none;
}
}
.add-issuable-form-actions {
margin-top: $gl-padding;
}
.right-sidebar-collapsed { .right-sidebar-collapsed {
.sidebar-grouped-item { .sidebar-grouped-item {
.sidebar-collapsed-icon {
margin-bottom: 0;
}
.sidebar-collapsed-divider { .sidebar-collapsed-divider {
line-height: 5px; line-height: 5px;
font-size: 12px; font-size: 12px;
......
.block {
&.weight {
.gl-field-error {
margin-top: $gl-padding-8;
margin-left: -6px;
display: flex;
align-items: center;
}
}
}
.add-issuable-form-input-wrapper {
height: auto;
padding: $gl-vert-padding $gl-vert-padding 0 $gl-input-padding;
&.focus,
&.focus:hover {
border-color: $blue-300;
box-shadow: 0 0 4px $dropdown-input-focus-shadow;
}
}
.add-issuable-form-input-token-list {
display: flex;
flex-wrap: wrap;
align-items: baseline;
list-style: none;
margin-bottom: 0;
padding-left: 0;
}
.add-issuable-form-token-list-item {
max-width: 100%;
margin-bottom: $gl-vert-padding;
margin-right: 5px;
}
.add-issuable-form-input-list-item {
flex: 1;
min-width: 200px;
margin-bottom: $gl-vert-padding;
}
.add-issuable-form-input {
width: 100%;
border: 0;
&:focus {
outline: none;
}
}
.add-issuable-form-actions {
margin-top: $gl-padding;
}
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