inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-30 18:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1975] Fixing missing style mixin invocations (#2685)

Browse Source 
* Fixing missing theme mixin inclusion for forms

* Fix missing style mixins in core

* Make process-services' scss mixins' naming conventional
This commit is contained in:
Popovics András 2017-11-21 12:41:47 +00:00 committed by Eugenio Romano
parent a2ee8dbfcf
commit 4f651ab868
9 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss
View File

@ -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;

6
lib/core/form/components/widgets/form.scss
View File

@ -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 {

2
lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss
View File

@ -1,4 +1,4 @@
@mixin mat-hyperlink-widget-theme($theme) {
@mixin adf-hyperlink-widget-theme($theme) {
$primary: map-get($theme, primary);
.adf-hyperlink-widget {

2
lib/core/login/components/login.component.html
View File

@ -87,7 +87,7 @@
<div *ngIf="actualLoginStep === LoginSteps.Checking" class="adf-interactive-login-label">
<span class="adf-login-button-label">{{ 'LOGIN.BUTTON.CHECKING' | translate }}</span>
<div class="adf-login-spinner-container">
<mat-spinner id="checking-spinner" class="adf-login-checking-spinner" [diameter]="25" color="accent"></mat-spinner>
<mat-spinner id="checking-spinner" class="adf-login-checking-spinner" [diameter]="25"></mat-spinner>
</div>
</div>

2
lib/core/styles/_default-class.scss
View File

@ -1,4 +1,4 @@
@mixin adf-default-class($theme) {
@mixin adf-default-class-theme($theme) {
.adf-hide-small {
@media screen and ($mat-small) {

49
lib/core/styles/_index.scss
View File

@ -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);
}

2
lib/process-services/attachment/process-attachment-list.component.scss
View File

@ -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;

2
lib/process-services/attachment/task-attachment-list.component.scss
View File

@ -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;

8
lib/process-services/styles/_index.scss
View File

@ -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);
}