diff --git a/cypress/e2e/context_and_state.ts b/cypress/e2e/context_and_state.ts index 014c3b6f7..4a77f0515 100644 --- a/cypress/e2e/context_and_state.ts +++ b/cypress/e2e/context_and_state.ts @@ -234,7 +234,7 @@ describe('Kendraio context and state', () => { loadFlowCode([ { "type": "context-save", - "valueGetter": "`true`", + "valueGetter": "`false`", "contextKey": "state.global.disabled", }, { diff --git a/src/app/_shared/components/material/mat-input.component.ts b/src/app/_shared/components/material/mat-input.component.ts index e13693119..355c203f2 100644 --- a/src/app/_shared/components/material/mat-input.component.ts +++ b/src/app/_shared/components/material/mat-input.component.ts @@ -5,9 +5,9 @@ import { ICellEditorAngularComp } from 'ag-grid-angular'; @Component({ selector: "input-cell", template: ` - +
- + @@ -16,10 +16,10 @@ import { ICellEditorAngularComp } from 'ag-grid-angular'; `, styles: [ ` - .container { - width: 350px; - } - ` + .container { + width: 350px; + } + ` ] }) export class MatInputComponent implements ICellEditorAngularComp { diff --git a/src/app/_shared/ui-form/types/array.type.html b/src/app/_shared/ui-form/types/array.type.html index 5871bcdf8..db2033b30 100644 --- a/src/app/_shared/ui-form/types/array.type.html +++ b/src/app/_shared/ui-form/types/array.type.html @@ -1,4 +1,4 @@ - +

{{ to.label }}

{{ to.description }}

@@ -8,7 +8,7 @@

{{ to.label }}

- +
diff --git a/src/app/_shared/ui-form/types/array.type.scss b/src/app/_shared/ui-form/types/array.type.scss index 1f9b33548..ac1a6fcf4 100644 --- a/src/app/_shared/ui-form/types/array.type.scss +++ b/src/app/_shared/ui-form/types/array.type.scss @@ -2,6 +2,3 @@ display: block; margin-bottom: 1em; } -mat-card { - margin-bottom: 1em; -} diff --git a/src/app/_shared/ui-form/types/image-viewer.type.ts b/src/app/_shared/ui-form/types/image-viewer.type.ts index f5918c682..fe76018e9 100644 --- a/src/app/_shared/ui-form/types/image-viewer.type.ts +++ b/src/app/_shared/ui-form/types/image-viewer.type.ts @@ -6,7 +6,7 @@ import { FieldType } from '@ngx-formly/core'; selector: 'app-thumbnail-viewer', template: ` - + {{to.label}} diff --git a/src/app/_shared/ui-form/types/money.component.ts b/src/app/_shared/ui-form/types/money.component.ts index 83a0dafa4..dfd0a96c8 100644 --- a/src/app/_shared/ui-form/types/money.component.ts +++ b/src/app/_shared/ui-form/types/money.component.ts @@ -6,7 +6,7 @@ import createNumberMask from 'text-mask-addons/dist/createNumberMask'; selector: 'formly-field-input-money', template: ` - + {{ to.label }} + {{ to.label }} diff --git a/src/app/_shared/ui-form/types/playlists.component.html b/src/app/_shared/ui-form/types/playlists.component.html index da7b4353c..0f1b7124e 100644 --- a/src/app/_shared/ui-form/types/playlists.component.html +++ b/src/app/_shared/ui-form/types/playlists.component.html @@ -1,7 +1,7 @@
- + diff --git a/src/app/_shared/ui-form/types/textarea.type.ts b/src/app/_shared/ui-form/types/textarea.type.ts index d9050febf..8e77d24df 100644 --- a/src/app/_shared/ui-form/types/textarea.type.ts +++ b/src/app/_shared/ui-form/types/textarea.type.ts @@ -19,7 +19,7 @@ import { MatInput } from '@angular/material/input'; - + diff --git a/src/app/components/block-comparison-builder-box/block-comparison-builder-box.component.html b/src/app/components/block-comparison-builder-box/block-comparison-builder-box.component.html index db3e49d10..a159f61e7 100644 --- a/src/app/components/block-comparison-builder-box/block-comparison-builder-box.component.html +++ b/src/app/components/block-comparison-builder-box/block-comparison-builder-box.component.html @@ -1,5 +1,5 @@
- + Value source (jmespath) diff --git a/src/app/components/block-gosub-builder-box/block-gosub-builder-box.component.html b/src/app/components/block-gosub-builder-box/block-gosub-builder-box.component.html index 4d3b9d6ae..4c2007a30 100644 --- a/src/app/components/block-gosub-builder-box/block-gosub-builder-box.component.html +++ b/src/app/components/block-gosub-builder-box/block-gosub-builder-box.component.html @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ - + \ No newline at end of file diff --git a/src/app/components/block-mapping-builder-box/block-mapping-builder-box.component.html b/src/app/components/block-mapping-builder-box/block-mapping-builder-box.component.html index 40651655f..fea4ff85a 100644 --- a/src/app/components/block-mapping-builder-box/block-mapping-builder-box.component.html +++ b/src/app/components/block-mapping-builder-box/block-mapping-builder-box.component.html @@ -1,5 +1,5 @@ - + diff --git a/src/app/components/layout/layout.component.html b/src/app/components/layout/layout.component.html index 9b7b67f98..637b164af 100644 --- a/src/app/components/layout/layout.component.html +++ b/src/app/components/layout/layout.component.html @@ -1,13 +1,8 @@ - + - - - - - favorite Assets @@ -19,13 +14,11 @@ - {{ link.icon }} {{ link.title }} - @@ -44,18 +37,13 @@ - - - - -
- +
diff --git a/src/app/components/layout/layout.component.scss b/src/app/components/layout/layout.component.scss index 78a47966e..14d75c19f 100644 --- a/src/app/components/layout/layout.component.scss +++ b/src/app/components/layout/layout.component.scss @@ -1,14 +1,15 @@ .spacer { flex: 1 1 auto; } + .page-content { margin: 1em; } .app-container { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - } + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; +} diff --git a/src/app/components/layout/layout.component.ts b/src/app/components/layout/layout.component.ts index f586a0d75..24360e99d 100644 --- a/src/app/components/layout/layout.component.ts +++ b/src/app/components/layout/layout.component.ts @@ -1,9 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { MatMenu } from '@angular/material/menu'; import { MatSidenav } from '@angular/material/sidenav'; import { Observable } from 'rxjs'; -import {SharedModule} from '../../_shared/shared.module'; import { PageTitleService } from '../../services/page-title.service'; @Component({ diff --git a/src/app/components/workflow-sidenav/workflow-sidenav.component.html b/src/app/components/workflow-sidenav/workflow-sidenav.component.html index 7e77d0f31..372b895da 100644 --- a/src/app/components/workflow-sidenav/workflow-sidenav.component.html +++ b/src/app/components/workflow-sidenav/workflow-sidenav.component.html @@ -7,7 +7,7 @@ - +
- -
+ +
+

+ Title: {{ workflow.title }}
+ Adapter: {{ workflow.getAdapterName() }}
+ Workflow ID: {{ workflow.id }}
+ Tags: {{ workflow.tags.join(', ') }} +

-
-

- Title: {{ workflow.title }}
- Adapter: {{ workflow.getAdapterName() }}
- Flow ID: {{ workflow.id || 'Flow ID' }}
- Tags: {{ workflow.tags.join(', ') }} -

+
diff --git a/src/app/components/workflow-sidenav/workflow-sidenav.component.scss b/src/app/components/workflow-sidenav/workflow-sidenav.component.scss index 563db05cd..71e4ab54f 100644 --- a/src/app/components/workflow-sidenav/workflow-sidenav.component.scss +++ b/src/app/components/workflow-sidenav/workflow-sidenav.component.scss @@ -12,9 +12,15 @@ .adapter-metadata { margin-bottom: 1em; } -.metadata-edit { - float: right; + +.adapter-metadata-edit{ + display: flex; +} + +.adapter-metadata-edit-text { + flex: 1; } + app-blocks-editor { display: block; margin-bottom: 4rem; diff --git a/src/app/dialogs/adapter-blocks-config-select-dialog/adapter-blocks-config-select-dialog.component.html b/src/app/dialogs/adapter-blocks-config-select-dialog/adapter-blocks-config-select-dialog.component.html index 7b14a2de8..3d79eee48 100644 --- a/src/app/dialogs/adapter-blocks-config-select-dialog/adapter-blocks-config-select-dialog.component.html +++ b/src/app/dialogs/adapter-blocks-config-select-dialog/adapter-blocks-config-select-dialog.component.html @@ -1,20 +1,22 @@ -

Load config from Adapter:

- + +

Load config from Adapter:

+ - + - + - - -

- - + + + + + + diff --git a/src/app/dialogs/adapter-query-select-dialog/adapter-query-select-dialog.component.html b/src/app/dialogs/adapter-query-select-dialog/adapter-query-select-dialog.component.html index 5994d9cc8..54595ba21 100644 --- a/src/app/dialogs/adapter-query-select-dialog/adapter-query-select-dialog.component.html +++ b/src/app/dialogs/adapter-query-select-dialog/adapter-query-select-dialog.component.html @@ -1,20 +1,22 @@ -

Load query from Adapter:

- + +

Load query from Adapter:

+ - + - + - - -

- - + + + + + + diff --git a/src/app/dialogs/add-block-dialog/add-block-dialog.component.html b/src/app/dialogs/add-block-dialog/add-block-dialog.component.html index ac5d16820..91098b081 100644 --- a/src/app/dialogs/add-block-dialog/add-block-dialog.component.html +++ b/src/app/dialogs/add-block-dialog/add-block-dialog.component.html @@ -14,7 +14,7 @@
- +

{{ selectedBlockType.label }}

{{ selectedBlockType.description }}

diff --git a/src/app/dialogs/add-block-dialog/add-block-dialog.component.scss b/src/app/dialogs/add-block-dialog/add-block-dialog.component.scss index 95c54d0bb..b1844fc65 100644 --- a/src/app/dialogs/add-block-dialog/add-block-dialog.component.scss +++ b/src/app/dialogs/add-block-dialog/add-block-dialog.component.scss @@ -1,17 +1,12 @@ .dialog-buttons > button { margin-right: 1em; } -.button-selections { - margin-bottom: 1em; -} -mat-card { - height: 150px; +.button-selections { margin-bottom: 1em; } - -.mat-flat-button { +.mat-mdc-unelevated-button { display: inline-block; min-width: 12em; height: 3em; diff --git a/src/app/dialogs/edit-clip-dialog/edit-clip-dialog.component.html b/src/app/dialogs/edit-clip-dialog/edit-clip-dialog.component.html index 20effaa03..4b7d113b5 100644 --- a/src/app/dialogs/edit-clip-dialog/edit-clip-dialog.component.html +++ b/src/app/dialogs/edit-clip-dialog/edit-clip-dialog.component.html @@ -1,29 +1,26 @@

Edit Clip

- + + + + - - - + + + + {{group}} + + + - - - - {{group}} - - - - - - - - - - - - - + + + + + + +
diff --git a/src/app/dialogs/edit-workflow-metadata-dialog/edit-workflow-metadata-dialog.component.html b/src/app/dialogs/edit-workflow-metadata-dialog/edit-workflow-metadata-dialog.component.html index 5949f61f4..f32b321dc 100644 --- a/src/app/dialogs/edit-workflow-metadata-dialog/edit-workflow-metadata-dialog.component.html +++ b/src/app/dialogs/edit-workflow-metadata-dialog/edit-workflow-metadata-dialog.component.html @@ -1,30 +1,32 @@ -
- - - - - - - - - - - - - {{tag}} - cancel - - - - -
+ +
+ + + + + + + + + + + + + {{tag}} + cancel + + + + +
+ + + + + -
- - -
diff --git a/src/app/dialogs/export-config-dialog/export-config-dialog.component.html b/src/app/dialogs/export-config-dialog/export-config-dialog.component.html index b2d9915bc..a2ce54ea9 100644 --- a/src/app/dialogs/export-config-dialog/export-config-dialog.component.html +++ b/src/app/dialogs/export-config-dialog/export-config-dialog.component.html @@ -1,6 +1,10 @@ -

Config export:

-
- - + +

Config export:

+ + + + + + \ No newline at end of file diff --git a/src/app/dialogs/form-data-select-dialog/form-data-select-dialog.component.html b/src/app/dialogs/form-data-select-dialog/form-data-select-dialog.component.html index 9d67ae881..31ff2ee30 100644 --- a/src/app/dialogs/form-data-select-dialog/form-data-select-dialog.component.html +++ b/src/app/dialogs/form-data-select-dialog/form-data-select-dialog.component.html @@ -1,11 +1,12 @@

Select data ({{ data?.schemaName }}):

- - - -

- - + + + + + + + diff --git a/src/app/dialogs/form-select-dialog/form-select-dialog.component.html b/src/app/dialogs/form-select-dialog/form-select-dialog.component.html index b8d03d127..7804f6c51 100644 --- a/src/app/dialogs/form-select-dialog/form-select-dialog.component.html +++ b/src/app/dialogs/form-select-dialog/form-select-dialog.component.html @@ -1,28 +1,30 @@

Load form from Adapter:

- + + - + - - - - + + + + + - - - -No forms + -

- - + No forms + + + + + diff --git a/src/app/dialogs/import-progress-dialog/import-progress-dialog.component.html b/src/app/dialogs/import-progress-dialog/import-progress-dialog.component.html index 2e29961b8..b859fc912 100644 --- a/src/app/dialogs/import-progress-dialog/import-progress-dialog.component.html +++ b/src/app/dialogs/import-progress-dialog/import-progress-dialog.component.html @@ -1,2 +1,4 @@

Importing...

- + + + diff --git a/src/app/dialogs/load-workflow-dialog/load-workflow-dialog.component.html b/src/app/dialogs/load-workflow-dialog/load-workflow-dialog.component.html index 5c3512da8..7dcca37a2 100644 --- a/src/app/dialogs/load-workflow-dialog/load-workflow-dialog.component.html +++ b/src/app/dialogs/load-workflow-dialog/load-workflow-dialog.component.html @@ -1,4 +1,4 @@ -
+ Select configuration @@ -7,9 +7,11 @@ -
-
- - -
+ + + + + + + diff --git a/src/app/dialogs/paste-config-dialog/paste-config-dialog.component.html b/src/app/dialogs/paste-config-dialog/paste-config-dialog.component.html index b553aefb6..3756f7c23 100644 --- a/src/app/dialogs/paste-config-dialog/paste-config-dialog.component.html +++ b/src/app/dialogs/paste-config-dialog/paste-config-dialog.component.html @@ -1,6 +1,9 @@ -

Paste config:

- -
- - + +

Paste config:

+ + + + + + diff --git a/src/app/dialogs/save-workflow-dialog/save-workflow-dialog.component.html b/src/app/dialogs/save-workflow-dialog/save-workflow-dialog.component.html index ac4030426..0ebe07924 100644 --- a/src/app/dialogs/save-workflow-dialog/save-workflow-dialog.component.html +++ b/src/app/dialogs/save-workflow-dialog/save-workflow-dialog.component.html @@ -1,21 +1,29 @@
-
-

- Workflow ID: {{ data.adapterName }}/{{ data.id }} -

-
- - - + +
+

+ Workflow ID: {{ data.adapterName }}/{{ data.id }} +

+
+ + + + + +
-
-

- Please login to save workflows. -

-
- + +
+

+ Please login to save workflows. +

+
+ + + + diff --git a/src/app/dialogs/show-share-link-dialog/show-share-link-dialog.component.html b/src/app/dialogs/show-share-link-dialog/show-share-link-dialog.component.html index c7a8970a6..9cde7dc4c 100644 --- a/src/app/dialogs/show-share-link-dialog/show-share-link-dialog.component.html +++ b/src/app/dialogs/show-share-link-dialog/show-share-link-dialog.component.html @@ -1,16 +1,27 @@ - - + + + + +
-

Share the following flow link:

-
- - + +

Share the following flow link:

+
+ + + + +
-

Share the following database link:

-
- - + +

Share the following database link:

+
+ + + + +
diff --git a/src/app/dialogs/swagger-form-select-dialog/swagger-form-select-dialog.component.html b/src/app/dialogs/swagger-form-select-dialog/swagger-form-select-dialog.component.html index d7afd3ee4..9384aa8cd 100644 --- a/src/app/dialogs/swagger-form-select-dialog/swagger-form-select-dialog.component.html +++ b/src/app/dialogs/swagger-form-select-dialog/swagger-form-select-dialog.component.html @@ -1,26 +1,28 @@

Load form from Swagger:

- + + - + - - - + + + + - - - -No Swagger config + -

- - + No Swagger config + + + + + \ No newline at end of file diff --git a/src/app/form-controls/formly-card-list/formly-card-list.component.html b/src/app/form-controls/formly-card-list/formly-card-list.component.html index a0f0f4466..9623a60db 100644 --- a/src/app/form-controls/formly-card-list/formly-card-list.component.html +++ b/src/app/form-controls/formly-card-list/formly-card-list.component.html @@ -1,6 +1,6 @@ - +
- + Publisher @@ -12,7 +12,7 @@

Import from Bloomen API

 - + 
{{ userInfo$ | async | json }}
diff --git a/src/app/pages/connect/connect.component.html b/src/app/pages/connect/connect.component.html index f6ddd57bd..c36344d37 100644 --- a/src/app/pages/connect/connect.component.html +++ b/src/app/pages/connect/connect.component.html @@ -1,18 +1,11 @@ - -

Loading...

-
- - - - -
- -
+ + person + click here for the old account page +
diff --git a/src/app/pages/connect/connect.component.scss b/src/app/pages/connect/connect.component.scss index 59449d342..5d4a67df3 100644 --- a/src/app/pages/connect/connect.component.scss +++ b/src/app/pages/connect/connect.component.scss @@ -1,13 +1,12 @@ -.preview-message { - font-size: 0.75rem; - margin-bottom: 1rem; - margin-top: 1rem; - padding: 0.5rem; - background-color: #f7fafc; - display: flex; - justify-content: flex-start; - align-items: center; +.preview-message a { + color: black; + text-decoration: none; } -.preview-message p { - margin: 0 1rem 0 0; + +.preview-message .mat-icon { + padding-top: 2px; } + +.preview-message span { + padding-left: 10px; +} \ No newline at end of file diff --git a/src/app/pages/settings-page/settings-page.component.html b/src/app/pages/settings-page/settings-page.component.html index f3fb4b716..01fac36ca 100644 --- a/src/app/pages/settings-page/settings-page.component.html +++ b/src/app/pages/settings-page/settings-page.component.html @@ -1,4 +1,4 @@ - +

Delete all data...

@@ -7,7 +7,7 @@ - +

Debug mode {{ isDebug ? 'enabled' : 'disabled' }}

@@ -16,7 +16,7 @@ - +

Show Help {{ showHelp ? 'on' : 'off' }}

diff --git a/src/app/pages/settings-page/settings-page.component.scss b/src/app/pages/settings-page/settings-page.component.scss index 08577110d..e69de29bb 100644 --- a/src/app/pages/settings-page/settings-page.component.scss +++ b/src/app/pages/settings-page/settings-page.component.scss @@ -1,3 +0,0 @@ -mat-card { - margin-bottom: 1em; -} diff --git a/src/app/pages/test-api-page/test-api-page.component.html b/src/app/pages/test-api-page/test-api-page.component.html index 2c6ea7fa0..9a6589345 100644 --- a/src/app/pages/test-api-page/test-api-page.component.html +++ b/src/app/pages/test-api-page/test-api-page.component.html @@ -2,7 +2,7 @@

Temporary page to test API

- + @@ -13,7 +13,7 @@

Temporary page to test API

 - + @@ -26,10 +26,10 @@

Temporary page to test API

 - + 
{{ entity | json }}
 - + 
{{ allItems | json }}
 diff --git a/src/app/pages/test-api-page/test-api-page.component.scss b/src/app/pages/test-api-page/test-api-page.component.scss index 08577110d..e69de29bb 100644 --- a/src/app/pages/test-api-page/test-api-page.component.scss +++ b/src/app/pages/test-api-page/test-api-page.component.scss @@ -1,3 +0,0 @@ -mat-card { - margin-bottom: 1em; -} diff --git a/src/app/pages/upload-page/upload-page.component.scss b/src/app/pages/upload-page/upload-page.component.scss index fb7804102..590667777 100644 --- a/src/app/pages/upload-page/upload-page.component.scss +++ b/src/app/pages/upload-page/upload-page.component.scss @@ -2,12 +2,9 @@ flex: 1 1 auto; min-width: 2rem; } + .upload-file, .upload-button { margin-top: 1em; text-align: center; } - -mat-progress-bar { - max-width: 70%; -} diff --git a/src/app/pages/user-page/user-page.component.html b/src/app/pages/user-page/user-page.component.html index 13e0f5c3a..85ed233d0 100644 --- a/src/app/pages/user-page/user-page.component.html +++ b/src/app/pages/user-page/user-page.component.html @@ -1,6 +1,6 @@ - +

Identities

You are logged in as {{ profile?.nickname }}

@@ -33,7 +33,7 @@

Identities

 - +

Connected Profiles

No profiles are saved on this device. You can connect multiple profiles by diff --git a/src/app/pages/user-page/user-page.component.scss b/src/app/pages/user-page/user-page.component.scss index 153089762..1f661aff4 100644 --- a/src/app/pages/user-page/user-page.component.scss +++ b/src/app/pages/user-page/user-page.component.scss @@ -1,6 +1,3 @@ -mat-card { - margin-bottom: 1em; -} .full-width-field { width: 100%; diff --git a/src/app/pages/youtube-page/youtube-page.component.html b/src/app/pages/youtube-page/youtube-page.component.html index 61510bd8e..82fe035ca 100644 --- a/src/app/pages/youtube-page/youtube-page.component.html +++ b/src/app/pages/youtube-page/youtube-page.component.html @@ -1,4 +1,4 @@ - +

{{ error }}

 diff --git a/src/styles.scss b/src/styles.scss index e76dc01e4..609daddb4 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -17,12 +17,11 @@ // If you specify typography styles for the components you use elsewhere, you should delete this line. // If you don't need the default component typographies but still want the hierarchy styles, // you can delete this line and instead use: -// `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());` -@include mat.all-legacy-component-typographies(); -@include mat.legacy-core(); +@include mat.all-component-typographies(); +@include mat.core(); @import '@angular/material/theming'; -@include mat-core(); +// @include mat-core(); // Define the palettes for your theme using the Material Design palettes available in palette.scss // (imported above). For each palette, you can optionally specify a default, lighter, and darker @@ -48,7 +47,7 @@ $kendraio-app-theme: mat.define-light-theme(( // Include theme styles for core and each component used in your app. // Alternatively, you can import and @include the theme mixins for each component // that you are using. -@include mat.all-legacy-component-themes($kendraio-app-theme); +@include mat.all-component-themes($kendraio-app-theme); @include angular-material-theme($kendraio-app-theme); @@ -62,10 +61,10 @@ body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; } margin-top: 1em; } -dynamic-material-form-control .mat-form-field { +dynamic-material-form-control .mat-mdc-form-field { width: 100%; } -.mat-radio-button ~ .mat-radio-button { +.mat-mdc-radio-button ~ .mat-radio-button { margin-left: 16px; } diff --git a/src/styles/_ng-select-theme.scss b/src/styles/_ng-select-theme.scss index 880f8f7d4..ce5e0c622 100644 --- a/src/styles/_ng-select-theme.scss +++ b/src/styles/_ng-select-theme.scss @@ -75,7 +75,7 @@ color: mat.get-color-from-palette($foreground, text) !important; - .mat-option.ng-option-selected:not(.ng-option-marked):not(:hover) { + .mat-mdc-option.ng-option-selected:not(.ng-option-marked):not(:hover) { background: mat.get-color-from-palette($background, card); &:not(.ng-option-disabled) { diff --git a/src/styles/main.scss b/src/styles/main.scss index a111a7ff3..b7eaa192d 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -10,10 +10,6 @@ Global Style Guide: @import "~@ng-select/ng-select/themes/material.theme.css"; -.formFieldWidth380 .mat-form-field-infix { - width: 380px; -} - .ken-tree-invisible { display: none; opacity: 0; @@ -36,12 +32,6 @@ Global Style Guide: overflow: hidden; } -.ken-tree li>ul>.mat-tree-node li, -.mat-nested-tree-node li { - // background: rgba(0, 0, 0, 0.04); - // font-size: 12px -} - .mat-nested-tree-node ul li { min-height: 28px !important; } @@ -61,22 +51,16 @@ button:focus { padding: 16px; } -.mat-tree-node { - // padding-left: 16px; -} - button.active { - // background-color: silver!important; opacity: 0.4; cursor: default; } .menu-item--active { - // background: rgba(0, 0, 0, 0.2); background-color: whitesmoke; } -.mat-menu-item { +.mat-mdc-menu-item { padding: 10px 16px; } @@ -147,15 +131,17 @@ button.active { right: 0; } -.mat-menu-item { - text-transform: capitalize; +.mat-drawer-side { + margin-left: 10px; } -// .mat-drawer, .mat-sidenav { -// min-width:200px; -// transition: all 3s ease-in-out; -// position: relative!important; -// } +.mat-drawer-side li .mat-icon { + margin-right: 10px; +} + +.mat-mdc-menu-item { + text-transform: capitalize; +} .form-container>* { width: 100%; @@ -165,17 +151,16 @@ dynamic-material-form-control:not(:last-child) { margin-right: 40px; } -.mat-menu-item .mat-icon-no-color, -.mat-menu-item-submenu-trigger::after { +.mat-mdc-menu-item .mat-icon-no-color, +.mat-mdc-menu-item-submenu-trigger::after { color: rgba(0, 0, 0, 1); } -.mat-card { - img { - object-fit: cover; - width: 100%; - margin-top: 20px; - } +.mat-mdc-card { + transition: box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1); + display: block; + position: relative; + padding: 1em; } // HELPER CLASS @@ -227,48 +212,13 @@ formly-field { } } - -.mat-form-field-type-boolean .mat-form-field-wrapper { - padding-bottom: 0 !important; - height: 44px; -} - -formly-object-type formly-object-type>formly-field { - //margin-left: 40px -} - -formly-object-type legend { - //margin-left: 20px -} - -formly-object-type { - // background-color: blue; -} - formly-array-type { - // >.mat-card { - // display: flex; - // flex-wrap: wrap; - // align-content: space-around ; - // align-items: flex-end; - .mat-card { + .mat-mdc-card { margin-right: 16px; } - // } - mat-card-header { - font-size: 1.5rem; - } - - mat-card { - margin-bottom: 16px - } } -.mat-form-field{ - margin-bottom: 1rem; -} - // Fix for cut-off Formly Material label .mdc-text-field--filled::before{ content: "" !important; @@ -287,4 +237,8 @@ formly-array-type { content: "(read-only)"; } -// Kendraio3ca31f6bcb87c68721363847192dbd57 \ No newline at end of file +.block-comment-container { + width: 95%; + margin-left: 2%; + position: relative; +}