From 4f651ab868b8160849b22a90e723f68ab3311758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Popovics=20Andr=C3=A1s?= Date: Tue, 21 Nov 2017 12:41:47 +0000 Subject: [PATCH] [ADF-1975] Fixing missing style mixin invocations (#2685) * Fixing missing theme mixin inclusion for forms * Fix missing style mixins in core * Make process-services' scss mixins' naming conventional --- .../dynamic-table/dynamic-table.widget.scss | 2 +- lib/core/form/components/widgets/form.scss | 6 +-- .../widgets/hyperlink/hyperlink.widget.scss | 2 +- .../login/components/login.component.html | 2 +- lib/core/styles/_default-class.scss | 2 +- lib/core/styles/_index.scss | 49 +++++++++++-------- .../process-attachment-list.component.scss | 2 +- .../task-attachment-list.component.scss | 2 +- lib/process-services/styles/_index.scss | 8 +-- 9 files changed, 38 insertions(+), 37 deletions(-) diff --git a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss index 4e71102fbd..03c629d693 100644 --- a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss +++ b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss @@ -1,6 +1,6 @@ @import '../form'; -@mixin mat-dynamic-table-theme($theme) { +@mixin adf-dynamic-table-theme($theme) { $foreground: map-get($theme, foreground); $dynamic-table-font-size: 14px !default; $dynamic-table-header-font-size: 12px !default; diff --git a/lib/core/form/components/widgets/form.scss b/lib/core/form/components/widgets/form.scss index 85e6431e05..d0e800cc6b 100644 --- a/lib/core/form/components/widgets/form.scss +++ b/lib/core/form/components/widgets/form.scss @@ -1,13 +1,9 @@ -@import './hyperlink/hyperlink.widget'; -@import './container/container.widget'; -@import './people/people.widget'; - @mixin adf-form-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); - @include mat-hyperlink-widget-theme($theme); + @include adf-hyperlink-widget-theme($theme); ul > li > form-field > .adf-focus { .adf-label { diff --git a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss index 9c008d63db..739c0a9ce5 100644 --- a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss +++ b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss @@ -1,4 +1,4 @@ -@mixin mat-hyperlink-widget-theme($theme) { +@mixin adf-hyperlink-widget-theme($theme) { $primary: map-get($theme, primary); .adf-hyperlink-widget { diff --git a/lib/core/login/components/login.component.html b/lib/core/login/components/login.component.html index dbea598dc8..29102525f2 100644 --- a/lib/core/login/components/login.component.html +++ b/lib/core/login/components/login.component.html @@ -87,7 +87,7 @@
diff --git a/lib/core/styles/_default-class.scss b/lib/core/styles/_default-class.scss index df5a8aa13d..87eddc72b6 100644 --- a/lib/core/styles/_default-class.scss +++ b/lib/core/styles/_default-class.scss @@ -1,4 +1,4 @@ -@mixin adf-default-class($theme) { +@mixin adf-default-class-theme($theme) { .adf-hide-small { @media screen and ($mat-small) { diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss index 745a318548..9868291429 100644 --- a/lib/core/styles/_index.scss +++ b/lib/core/styles/_index.scss @@ -2,35 +2,44 @@ @import './default-class'; @import './theming'; -@import '../collapsable/accordion-group.component'; -@import '../card-view/card-view-textitem.component'; + @import '../card-view/card-view-dateitem.component'; +@import '../card-view/card-view-textitem.component'; @import '../card-view/card-view.component'; -@import '../toolbar/toolbar.component'; -@import '../pagination/pagination.component'; -@import '../info-drawer/info-drawer-layout.component'; -@import '../settings/host-settings.component'; -@import '../userinfo/components/user-info.component'; -@import '../login/components/login.component'; +@import '../collapsable/accordion-group.component'; @import '../datatable/components/datatable/datatable.component'; +@import '../form/components/widgets/container/container.widget'; +@import '../form/components/widgets/dynamic-table/dynamic-table.widget'; @import '../form/components/widgets/form'; +@import '../form/components/widgets/hyperlink/hyperlink.widget'; +@import '../form/components/widgets/people/people.widget'; +@import '../info-drawer/info-drawer-layout.component'; +@import '../login/components/login.component'; +@import '../pagination/pagination.component'; +@import '../settings/host-settings.component'; +@import '../toolbar/toolbar.component'; +@import '../userinfo/components/user-info.component'; @import '../viewer/components/viewer.component'; @mixin adf-core-theme($theme) { - @include adf-form-theme($theme); - @include adf-host-settings-theme($theme); - @include adf-accordion-theme($theme); - @include adf-card-view-textitem-theme($theme); - @include adf-card-view-dateitem-theme($theme); - @include adf-card-view-theme($theme); - @include adf-toolbar-theme($theme); - @include adf-info-drawer-theme($theme); - @include adf-pagination-theme($theme); @include adf-colors-theme($theme); - @include adf-default-class($theme); - @include adf-userinfo-theme($theme); - @include adf-login-theme($theme); + @include adf-default-class-theme($theme); + @include adf-card-view-dateitem-theme($theme); + @include adf-card-view-textitem-theme($theme); + @include adf-card-view-theme($theme); + @include adf-accordion-theme($theme); @include adf-datatable-theme($theme); + @include adf-form-container-widget-theme($theme); + @include adf-dynamic-table-theme($theme); + @include adf-form-theme($theme); + @include adf-hyperlink-widget-theme($theme); + @include adf-form-people-widget-theme($theme); + @include adf-info-drawer-theme($theme); + @include adf-login-theme($theme); + @include adf-pagination-theme($theme); + @include adf-host-settings-theme($theme); + @include adf-toolbar-theme($theme); + @include adf-userinfo-theme($theme); @include adf-viewer-theme($theme); } diff --git a/lib/process-services/attachment/process-attachment-list.component.scss b/lib/process-services/attachment/process-attachment-list.component.scss index f086710555..27b2a771b0 100644 --- a/lib/process-services/attachment/process-attachment-list.component.scss +++ b/lib/process-services/attachment/process-attachment-list.component.scss @@ -1,4 +1,4 @@ -@mixin adf-process-attachment-list($theme) { +@mixin adf-process-attachment-list-theme($theme) { adf-datatable ::ng-deep th span { color: #232323; diff --git a/lib/process-services/attachment/task-attachment-list.component.scss b/lib/process-services/attachment/task-attachment-list.component.scss index 4dd956b825..34dc6093d2 100644 --- a/lib/process-services/attachment/task-attachment-list.component.scss +++ b/lib/process-services/attachment/task-attachment-list.component.scss @@ -1,4 +1,4 @@ -@mixin adf-task-attachment-list($theme) { +@mixin adf-task-attachment-list-theme($theme) { adf-datatable ::ng-deep th span { color: #232323; diff --git a/lib/process-services/styles/_index.scss b/lib/process-services/styles/_index.scss index cf37e910a1..a2aacf3e40 100644 --- a/lib/process-services/styles/_index.scss +++ b/lib/process-services/styles/_index.scss @@ -1,13 +1,9 @@ @import '../process-list/components/process-filters.component'; - @import '../attachment/process-attachment-list.component'; @import '../attachment/task-attachment-list.component'; - @import '../comments/comment-list.component'; - @import '../people/people-search.component'; @import '../people/people.component'; - @import '../task-list/components/start-task.component'; @import '../task-list/components/task-filters.component'; @import '../task-list/components/task-header.component'; @@ -20,6 +16,6 @@ @include adf-task-list-people-theme($theme); @include adf-task-list-filters-task-theme($theme); @include adf-task-list-header-theme($theme); - @include adf-process-attachment-list($theme); - @include adf-task-attachment-list($theme); + @include adf-process-attachment-list-theme($theme); + @include adf-task-attachment-list-theme($theme); }