Merge branch '10677-framework-css' into 'master'

Removes EE differences for framework.scss

Closes gitlab-ee#10677

See merge request gitlab-org/gitlab-ce!26590
This commit is contained in:
Phil Hughes 2019-03-27 08:43:51 +00:00
commit 978aa04f30
2 changed files with 93 additions and 0 deletions

View file

@ -60,6 +60,7 @@
@import 'framework/memory_graph'; @import 'framework/memory_graph';
@import 'framework/responsive_tables'; @import 'framework/responsive_tables';
@import 'framework/stacked_progress_bar'; @import 'framework/stacked_progress_bar';
@import 'framework/sortable';
@import 'framework/ci_variable_list'; @import 'framework/ci_variable_list';
@import 'framework/feature_highlight'; @import 'framework/feature_highlight';
@import 'framework/terms'; @import 'framework/terms';

View file

@ -0,0 +1,92 @@
.sortable-container {
background-color: $gray-light;
.flex-list {
padding: 5px;
margin-bottom: 0;
}
}
.sortable-row {
.flex-row {
display: flex;
&.issuable-info-container {
padding-right: 0;
}
}
.sortable-link {
color: $black;
}
}
.gl-sortable {
.header {
user-select: none;
&:hover {
cursor: pointer;
background-color: $gray-100;
}
&:focus {
outline: 1px solid $blue-300;
}
}
}
.related-issues-list-item {
.card-body,
.issuable-info-container {
padding: $gl-padding-4 $gl-padding-4 $gl-padding-4 $gl-padding;
.block-truncated {
padding: $gl-padding-8 0;
line-height: $gl-btn-line-height;
}
@include media-breakpoint-down(md) {
padding-left: $gl-padding;
.block-truncated {
flex-direction: column-reverse;
padding: $gl-padding-4 0;
.text-secondary {
margin-top: $gl-padding-4;
}
.issue-token-title-text {
display: block;
}
}
.issue-item-remove-button {
align-self: baseline;
}
}
@include media-breakpoint-only(md) {
.block-truncated .issue-token-title-text {
white-space: nowrap;
}
.issue-item-remove-button {
align-self: center;
}
}
@include media-breakpoint-down(sm) {
padding-left: $gl-padding-8;
.block-truncated .issue-token-title-text {
white-space: normal;
}
}
}
&.is-dragging {
padding: 0;
}
}