Clean up css overrides (#1081)

* fix height on search-libraries DL

* [ACA-2141] deleted adf-info-drawer css overrides - already moved to ADF

* [ACA-2151] deleted adf-version-manager css overrides - already moved to ADF

* [ACA-2144] deleted adf-search-filter css overrides - already moved to ADF

* [ACA-2145] deleted adf-search-sorting-picker css overrides - already moved to ADF

* [ACA-2147] partial clean-up of adf-toolbar-theme css overrides

- need to fix the colors schema to be able to remove it completely

* [ACA-2149] deleted adf-upload-dialog-theme css overrides - already moved to ADF

* [ACA-2146] clean-up of adf-sidenav-layout-theme css overrides

- might need to make another change on ADF side for height value

* [ACA-2150] deleted adf-upload-drag-area-theme css overrides - already moved to ADF

* [ACA-2146] prepare to move to corresponding ADF component theme
This commit is contained in:
Suzana Dirla
2019-04-19 10:19:12 +03:00
committed by GitHub
parent 434ab8a655
commit 5788d1e7c4
11 changed files with 25 additions and 289 deletions
+11 -14
View File
@@ -15,14 +15,8 @@
@import '../components/shared/content-node-share/content-node-share.dialog.scss';
@import './overrides/adf-toolbar.theme';
@import './overrides/adf-search-filter.theme';
@import './overrides/adf-info-drawer.theme';
@import './overrides/adf-upload-dialog.theme';
@import './overrides/adf-sidenav-layout.theme';
@import 'overrides/adf-layout-container.theme';
@import './overrides/adf-document-list.theme';
@import './overrides/adf-upload-drag-area.theme';
@import './overrides/adf-search-sorting-picker.theme';
@import './overrides/adf-version-manager.theme';
@import 'snackbar';
@@ -68,14 +62,8 @@ $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent);
$foreground: map-get($custom-theme, foreground);
@mixin custom-theme($theme) {
@include adf-toolbar-theme($theme);
@include adf-search-filter-theme($theme);
@include adf-info-drawer-theme($theme);
@include adf-sidenav-layout-theme($theme);
@include custom-adf-toolbar-theme($theme);
@include adf-document-list-theme($theme);
@include adf-upload-drag-area-theme($theme);
@include adf-search-sorting-picker-theme($theme);
@include adf-version-manager-theme($theme);
@include layout-theme($theme);
@include aca-search-input-theme($theme);
@@ -99,3 +87,12 @@ $data-table-thumbnail-width: 35px;
$adf-pagination--border: 1px solid mat-color($foreground, text, 0.07);
$adf-pagination__empty--height: 0;
$adf-toolbar-single-row-height: 48px;
$adf-toolbar-padding: 14px;
$adf-upload-dragging-color: unset;
$adf-upload-dragging-border: 1px solid #00bcd4;
$adf-upload-dragging-background: #e0f7fa;
$adf-upload-dragging-level1-color: unset;
$adf-upload-dragging-level1-border: none;
@@ -120,7 +120,8 @@
}
.adf-search-results .adf-datatable .adf-datatable-cell {
padding-top: 12px;
padding-bottom: 12px;
padding-top: 9px;
padding-bottom: 9px;
min-height: auto;
}
}
@@ -1,42 +0,0 @@
@import 'mixins';
@mixin adf-info-drawer-theme($theme) {
$foreground: map-get($theme, foreground);
$accent: map-get($theme, accent);
$icon-size: 48px;
.adf-info-drawer {
@include flex-column;
.adf-info-drawer-layout {
@include flex-column;
overflow: auto;
.mat-tab-label {
// cannot move this color style to ADF, but:
// check if this is still needed after ADF upgrades @angular/material version to be > 7.1.0
color: mat-color($accent);
}
.adf-info-drawer-layout-content
.adf-info-drawer-tabs
.mat-tab-body-content {
.adf-manage-versions-empty,
.adf-manage-versions-no-permission {
margin: 24px;
color: mat-color($foreground, text, 0.54);
text-align: justify;
display: flex;
flex-direction: column;
&-icon {
width: $icon-size;
height: $icon-size;
font-size: $icon-size;
margin: auto;
}
}
}
}
}
}
@@ -0,0 +1,10 @@
@mixin adf-layout-container-theme($theme) {
$adf-layout-container-height: 100% !default;
adf-layout-container {
.mat-drawer-content > div,
.mat-drawer-content > div > div {
height: $adf-layout-container-height;
}
}
}
@@ -1,15 +0,0 @@
@mixin adf-search-filter-theme($theme) {
$foreground: map-get($theme, foreground);
.adf-search-filter {
.mat-expansion-panel-header-title {
font-size: 14px;
color: mat-color($foreground, text, 0.87);
}
.mat-checkbox-label,
.mat-radio-label {
color: mat-color($foreground, text, 0.54);
}
}
}
@@ -1,9 +0,0 @@
@mixin adf-search-sorting-picker-theme($theme) {
$foreground: map-get($theme, foreground);
.adf-search-sorting-picker {
.mat-icon-button {
color: mat-color($foreground, text, 0.54);
}
}
}
@@ -1,30 +0,0 @@
@import 'mixins';
@mixin adf-sidenav-layout-theme($theme) {
adf-sidenav-layout {
@include flex-column;
// TODO: move to ADF
@media screen and ($mat-xsmall) {
.mat-drawer {
width: calc(-50px + 100vw) !important;
max-width: 320px !important;
}
}
.mat-drawer-content {
@include flex-column;
overflow: auto;
}
}
.adf-sidenav-layout {
@include flex-column;
}
.mat-drawer-content > div,
.mat-drawer-content > div > div {
@include flex-column;
overflow: auto;
}
}
+1 -27
View File
@@ -1,31 +1,5 @@
$adf-toolbar-single-row-height: 48px;
$adf-toolbar-padding: 14px;
@mixin adf-toolbar-theme($theme) {
$foreground: map-get($theme, foreground);
.adf-viewer {
.adf-toolbar {
.mat-toolbar {
color: mat-color($foreground, text, 0.54);
}
}
}
@mixin custom-adf-toolbar-theme($theme) {
.adf-toolbar {
@include angular-material-theme($theme);
.mat-toolbar-single-row {
padding: 0 $adf-toolbar-padding;
height: $adf-toolbar-single-row-height;
}
&.adf-toolbar--inline {
.mat-toolbar {
background-color: inherit;
border: none !important;
padding: 0;
}
}
}
}
@@ -1,41 +0,0 @@
@mixin adf-upload-dialog-theme($theme) {
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
$warn: map-get($theme, warn);
.adf-upload-dialog {
z-index: 999;
}
// todo: move to ADF 3.x.x
.adf-file-uploading-row {
&__group,
&__block {
min-width: 100px;
display: flex;
justify-content: flex-end;
}
}
.adf-file-uploading-row {
&__status {
&--done {
color: mat-color($accent);
}
&--error {
color: mat-color($warn);
}
}
&__action {
&--cancel {
color: mat-color($warn);
}
&--remove {
color: mat-color($warn);
}
}
}
}
@@ -1,90 +0,0 @@
@import 'mixins';
$adf-upload-dragging-color: unset !default;
$adf-upload-dragging-border: 1px solid #00bcd4 !default;
$adf-upload-dragging-background: #e0f7fa !default;
$adf-upload-dragging-level1-color: unset !default;
$adf-upload-dragging-level1-border: none !default;
@mixin file-draggable__input-focus($text-color, $border) {
color: $text-color;
border: $border !important;
margin-left: 0 !important;
}
@mixin adf-upload-drag-area-theme($theme) {
adf-upload-drag-area {
@include flex-column;
.adf-upload-border {
@include flex-column;
vertical-align: unset;
text-align: unset;
width: 100%;
box-sizing: border-box;
}
.adf-file-draggable__input-focus {
color: $adf-upload-dragging-color;
border: $adf-upload-dragging-border;
adf-document-list {
background: $adf-upload-dragging-background;
adf-datatable > table {
background: inherit;
}
}
}
.adf-upload__dragging {
background: $adf-upload-dragging-background;
color: $adf-upload-dragging-color;
}
.adf-upload__dragging td {
border-top: $adf-upload-dragging-border !important;
border-bottom: $adf-upload-dragging-border !important;
&:first-child {
border-left: $adf-upload-dragging-border !important;
}
&:last-child {
border-right: $adf-upload-dragging-border !important;
}
}
&:first-child {
& > div {
adf-upload-drag-area {
.adf-file-draggable__input-focus {
@include file-draggable__input-focus(
$adf-upload-dragging-color,
$adf-upload-dragging-border
);
}
}
}
.adf-upload-border {
vertical-align: inherit !important;
text-align: inherit !important;
}
.adf-file-draggable__input-focus {
color: $adf-upload-dragging-level1-color !important;
border: $adf-upload-dragging-level1-border !important;
margin-left: 0 !important;
adf-upload-drag-area {
& > div {
@include file-draggable__input-focus(
$adf-upload-dragging-color,
$adf-upload-dragging-border
);
}
}
}
}
}
}
@@ -1,19 +0,0 @@
@mixin adf-version-manager-theme($theme) {
adf-version-manager {
.mat-list .mat-3-line {
height: auto !important;
width: 100% !important;
}
.mat-list-item-content {
padding: 16px 0 !important;
}
.adf-version-list-item-comment.mat-line {
height: 100%;
word-break: break-all;
white-space: unset !important;
overflow: unset !important;
}
}
}