diff --git a/demo-shell-ng2/.gitignore b/demo-shell-ng2/.gitignore index 6a41a92530..83232643f8 100644 --- a/demo-shell-ng2/.gitignore +++ b/demo-shell-ng2/.gitignore @@ -52,7 +52,9 @@ app/**/*.d.ts !app/js/Polyline.js .idea -src/versions.json +**/versions.json + + dist/ coverage/ diff --git a/demo-shell-ng2/src/styles.scss b/demo-shell-ng2/src/styles.scss new file mode 100644 index 0000000000..f39629b2b8 --- /dev/null +++ b/demo-shell-ng2/src/styles.scss @@ -0,0 +1,22 @@ +@import '~@angular/material/prebuilt-themes/deeppurple-amber.css'; + +body { + font-family: Roboto, Arial, sans-serif; + margin: 0; +} + +.basic-container { + padding: 5px; +} + +.version-info { + font-size: 8pt; + float: right; +} + +/** + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ diff --git a/docs/theming.md b/docs/theming.md index 5c9e6e4dd3..3bcc16172a 100644 --- a/docs/theming.md +++ b/docs/theming.md @@ -107,3 +107,18 @@ $dark-theme: mat-dark-theme($primary, $accent, $warn); } ``` Any component with the `add-dark-theme` class will use the dark theme, while other components will fall back to the default. + + +## Default reusable class + +.adf-hide-small // Display none vieweport <960px +.adf-hide-xsmall // Display none vieweport <600px + +.adf-primary-color // Primary color +.adf-accent-color // Accent color +.adf-warn-color // Warn color +.adf-primary-contrast-text-color // Default contrast color for primary color +.adf-accent-contrast-text-color // Default contrast color for accent color +.adf-background-color // Dialog background color +.adf-primary-background-color // Primary background color +.adf-accent-background-color // Default background color for accent diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.scss b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.scss index 105c13ef2c..64ba5b08b8 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.scss +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.scss @@ -1,4 +1,4 @@ -@mixin mat-analytics-report-list-theme($theme) { +@mixin adf-analytics-report-list-theme($theme) { $primary: map-get($theme, primary); .adf-analytics-report-list { diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.scss b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.scss index 890f7df0fd..f3b014368f 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.scss +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.scss @@ -1,4 +1,4 @@ -@mixin mat-analytics-date-range-widget-theme($theme) { +@mixin adf-analytics-date-range-widget-theme($theme) { $warn: map-get($theme, warn); .adf-date-range-analytics-text-danger { diff --git a/ng2-components/ng2-activiti-analytics/styles/index.scss b/ng2-components/ng2-activiti-analytics/styles/index.scss index 9f36ba7050..3295e2ede8 100644 --- a/ng2-components/ng2-activiti-analytics/styles/index.scss +++ b/ng2-components/ng2-activiti-analytics/styles/index.scss @@ -2,6 +2,6 @@ @import '../src/components/widgets/date-range/date-range.widget'; @mixin alfresco-activity-analytics-theme($theme) { - @include mat-analytics-report-list-theme($theme); - @include mat-analytics-date-range-widget-theme($theme); + @include adf-analytics-report-list-theme($theme); + @include adf-analytics-date-range-widget-theme($theme); } diff --git a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.scss b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.scss index 9a24ba483f..22f33f4b2d 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.scss +++ b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.scss @@ -1,4 +1,4 @@ -@mixin mat-diagram-tooltip-theme($theme) { +@mixin adf-diagram-tooltip-theme($theme) { .adf { &-diagram-tooltip { diff --git a/ng2-components/ng2-activiti-diagrams/styles/index.scss b/ng2-components/ng2-activiti-diagrams/styles/index.scss index eb3261891c..e2d1cf97a8 100644 --- a/ng2-components/ng2-activiti-diagrams/styles/index.scss +++ b/ng2-components/ng2-activiti-diagrams/styles/index.scss @@ -1,5 +1,5 @@ @import '../src/components/tooltip/diagram-tooltip.component'; @mixin alfresco-activity-diagrams-theme($theme) { - @include mat-diagram-tooltip-theme($theme); + @include adf-diagram-tooltip-theme($theme); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss index 0a78c4c892..9acdc8e7b9 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss @@ -1,5 +1,5 @@ -@mixin mat-container-widget-theme($theme) { +@mixin adf-container-widget-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/form.scss b/ng2-components/ng2-activiti-form/src/components/widgets/form.scss index 7b9d5d346a..ed1c6ccce0 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/form.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/form.scss @@ -1,6 +1,6 @@ @import './hyperlink/hyperlink.widget'; -@mixin mat-form-theme($theme) { +@mixin adf-form-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss index 90220b02a3..bb5d799a34 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss @@ -1,4 +1,4 @@ -@mixin mat-people-widget-theme($theme) { +@mixin adf-people-widget-theme($theme) { $primary: map-get($theme, primary); $background: map-get($theme, background); $foreground: map-get($theme, foreground); diff --git a/ng2-components/ng2-activiti-form/styles/index.scss b/ng2-components/ng2-activiti-form/styles/index.scss index 8531a4ca32..b4de4bbfdf 100644 --- a/ng2-components/ng2-activiti-form/styles/index.scss +++ b/ng2-components/ng2-activiti-form/styles/index.scss @@ -3,8 +3,8 @@ @import '../src/components/widgets/people/people.widget'; @mixin alfresco-activity-form-theme($theme) { - @include mat-form-theme($theme); - @include mat-container-widget-theme($theme); - @include mat-people-widget-theme($theme); + @include adf-form-theme($theme); + @include adf-container-widget-theme($theme); + @include adf-people-widget-theme($theme); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.scss b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.scss index af1c0c40a3..f8689f3e6e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.scss +++ b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.scss @@ -1,4 +1,4 @@ -@mixin mat-filters-process-theme($theme) { +@mixin adf-filters-process-theme($theme) { $primary: map-get($theme, primary); .adf { diff --git a/ng2-components/ng2-activiti-processlist/styles/index.scss b/ng2-components/ng2-activiti-processlist/styles/index.scss index db9c07c217..d5ddc8e473 100644 --- a/ng2-components/ng2-activiti-processlist/styles/index.scss +++ b/ng2-components/ng2-activiti-processlist/styles/index.scss @@ -1,5 +1,5 @@ @import '../src/components/process-filters.component'; @mixin alfresco-activity-processlist-theme($theme) { - @include mat-filters-process-theme($theme); + @include adf-filters-process-theme($theme); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss index 8ed82cbca5..a1fc27edc3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss @@ -1,4 +1,4 @@ -@mixin mat-comment-list-theme($theme) { +@mixin adf-comment-list-theme($theme) { $primary: map-get($theme, primary); .adf { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss index abf01af35f..a17c5b232f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss @@ -1,4 +1,4 @@ -@mixin mat-people-search-theme($theme) { +@mixin adf-people-search-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss index d3e0a6ed6d..40be008824 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss @@ -1,4 +1,4 @@ -@mixin mat-people-theme($theme) { +@mixin adf-people-theme($theme) { $primary: map-get($theme, primary); .assignment-header { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss index afffefb708..7c7ae35d92 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss @@ -1,4 +1,4 @@ -@mixin mat-start-task-theme($theme) { +@mixin adf-start-task-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); @@ -45,18 +45,18 @@ adf-start-task { .adf { - + &-start-task-input-container .mat-input-wrapper { padding-top: 8px; } - + &-error-text-container { position: absolute; width: 81%; height: 20px; margin-top: 30px; } - + &-error-text { padding: 1px; height: 16px; @@ -65,35 +65,35 @@ float: left; color: mat-color($warn); } - + &-error-icon { float: right; font-size: 17px; color: mat-color($warn); } - + &-label { color: rgb(186, 186, 186);; } - + &-invalid { - + .mat-input-underline { background-color: #f44336 !important; } - + .adf-file { border-color: mat-color($warn); } - + .mat-input-prefix { color: mat-color($warn); } - + .adf-input { border-color: mat-color($warn); } - + .adf-label { color: mat-color($warn); &:after { @@ -101,6 +101,6 @@ } } } - } + } } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss index 942bc154a8..6be8ff8314 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss @@ -1,4 +1,4 @@ -@mixin mat-filters-task-theme($theme) { +@mixin adf-filters-task-theme($theme) { $primary: map-get($theme, primary); .adf { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.scss index e7e51eb732..526d09ac99 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.scss @@ -1,4 +1,4 @@ -@mixin mat-header-theme($theme) { +@mixin adf-header-theme($theme) { $primary: map-get($theme, primary); .adf { diff --git a/ng2-components/ng2-activiti-tasklist/styles/index.scss b/ng2-components/ng2-activiti-tasklist/styles/index.scss index a14f63f01e..d22d2d4ed2 100644 --- a/ng2-components/ng2-activiti-tasklist/styles/index.scss +++ b/ng2-components/ng2-activiti-tasklist/styles/index.scss @@ -6,10 +6,10 @@ @import '../src/components/task-header.component'; @mixin alfresco-activity-tasklist-theme($theme) { - @include mat-comment-list-theme($theme); - @include mat-start-task-theme($theme); - @include mat-people-search-theme($theme); - @include mat-people-theme($theme); - @include mat-filters-task-theme($theme); - @include mat-header-theme($theme); + @include adf-comment-list-theme($theme); + @include adf-start-task-theme($theme); + @include adf-people-search-theme($theme); + @include adf-people-theme($theme); + @include adf-filters-task-theme($theme); + @include adf-header-theme($theme); } diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.scss b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.scss index 8bfb5a0679..fabbd2b354 100644 --- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.scss @@ -1,4 +1,4 @@ -@mixin mat-accordion-theme($theme) { +@mixin adf-accordion-theme($theme) { $primary: map-get($theme, primary); .adf-panel-heading { @@ -23,9 +23,9 @@ } .adf-panel-collapse { - display: inline-block; + display: inline-block; } - + .adf-panel-heading-text { float: left; padding-left: 20px; diff --git a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss b/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss index 545ba1be00..08b6a71d0a 100644 --- a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss @@ -1,4 +1,4 @@ -@mixin mat-info-drawer-theme($theme) { +@mixin adf-info-drawer-theme($theme) { $primary: map-get($theme, primary); $background: map-get($theme, background); $foreground: map-get($theme, foreground); diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss index 1e9efdc01a..9eb63093f4 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss @@ -1,5 +1,5 @@ -@mixin mat-pagination-theme($theme) { +@mixin adf-pagination-theme($theme) { $foreground: map-get($theme, foreground); $adf-pagination--height: 48px; diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.scss b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.scss index 9078175dd0..61fcbd5c63 100644 --- a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.scss @@ -1,5 +1,5 @@ -@mixin mat-adf-toolbar-theme($theme) { +@mixin adf-adf-toolbar-theme($theme) { $foreground: map-get($theme, foreground); $adf-toolbar-height: 48px; $adf-toolbar-font-size: 14px; diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss index a2cc6155e5..e9895d7734 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss @@ -1,4 +1,4 @@ -@mixin mat-card-view-dateitem-theme($theme) { +@mixin adf-card-view-dateitem-theme($theme) { .adf { &-invisible-date-input { diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss index 30fbaf2843..11a585165a 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss @@ -1,4 +1,4 @@ -@mixin mat-card-view-textitem-theme($theme) { +@mixin adf-card-view-textitem-theme($theme) { .adf { &-textitem-icon { diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.scss index db6077ac00..2cac58417d 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.scss @@ -1,5 +1,5 @@ -@mixin mat-card-view-theme($theme) { +@mixin adf-card-view-theme($theme) { .adf { &-property-list { diff --git a/ng2-components/ng2-alfresco-core/styles/_default-class.scss b/ng2-components/ng2-alfresco-core/styles/_default-class.scss new file mode 100644 index 0000000000..df5a8aa13d --- /dev/null +++ b/ng2-components/ng2-alfresco-core/styles/_default-class.scss @@ -0,0 +1,14 @@ +@mixin adf-default-class($theme) { + + .adf-hide-small { + @media screen and ($mat-small) { + display: none !important; + } + } + + .adf-hide-xsmall { + @media screen and ($mat-xsmall) { + display: none !important; + } + } +} diff --git a/ng2-components/ng2-alfresco-core/styles/_index.scss b/ng2-components/ng2-alfresco-core/styles/_index.scss index 34e4070f3e..eb0678d909 100644 --- a/ng2-components/ng2-alfresco-core/styles/_index.scss +++ b/ng2-components/ng2-alfresco-core/styles/_index.scss @@ -1,4 +1,5 @@ @import './theme-colors'; +@import './default-class'; @import '../src/components/collapsable/accordion-group.component'; @import '../src/components/view/card-view-textitem.component'; @import '../src/components/view/card-view-dateitem.component'; @@ -8,12 +9,13 @@ @import '../src/components/info-drawer/info-drawer-layout.component'; @mixin alfresco-core-theme($theme) { - @include mat-accordion-theme($theme); - @include mat-card-view-textitem-theme($theme); - @include mat-card-view-dateitem-theme($theme); - @include mat-card-view-theme($theme); - @include mat-adf-toolbar-theme($theme); - @include mat-info-drawer-theme($theme); - @include mat-pagination-theme($theme); - @include mat-colors-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-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); } diff --git a/ng2-components/ng2-alfresco-core/styles/_theme-colors.scss b/ng2-components/ng2-alfresco-core/styles/_theme-colors.scss index 061fd4beee..3daa77ed76 100644 --- a/ng2-components/ng2-alfresco-core/styles/_theme-colors.scss +++ b/ng2-components/ng2-alfresco-core/styles/_theme-colors.scss @@ -1,4 +1,4 @@ -@mixin mat-colors-theme($theme) { +@mixin adf-colors-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); @@ -18,7 +18,7 @@ color: mat-color($warn) !important; } - .adf-background-color { + .adf-dialog-background-color { background: mat-color($background, dialog) !important; } diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.scss b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.scss index 3274351cd9..d3136f7ef2 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.scss +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.scss @@ -1,5 +1,5 @@ -@mixin mat-datatable-theme($theme) { +@mixin adf-datatable-theme($theme) { $foreground: map-get($theme, foreground); $background: map-get($theme, background); $primary: map-get($theme, primary); diff --git a/ng2-components/ng2-alfresco-datatable/styles/index.scss b/ng2-components/ng2-alfresco-datatable/styles/index.scss index 080ae71b93..98afaad56a 100644 --- a/ng2-components/ng2-alfresco-datatable/styles/index.scss +++ b/ng2-components/ng2-alfresco-datatable/styles/index.scss @@ -1,5 +1,5 @@ @import '../src/components/datatable/datatable.component'; @mixin alfresco-datatable-theme($theme) { - @include mat-datatable-theme($theme); + @include adf-datatable-theme($theme); } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.scss b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.scss index 8c979d7d03..cac4840620 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.scss +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.scss @@ -1,6 +1,6 @@ $breadcrumb-chevron-spacer: 2px; -@mixin mat-breadcrumb-theme($theme) { +@mixin adf-breadcrumb-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.scss b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.scss index 9c87d443fa..39c68592ce 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.scss +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.scss @@ -1,5 +1,5 @@ -@mixin mat-breadcrumb-dropdown-theme($theme) { +@mixin adf-breadcrumb-dropdown-theme($theme) { $primary: map-get($theme, primary); $dropdownHorizontalOffset: 30px; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.scss b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.scss index 3cbce1af6f..2d6f145776 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.scss +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.scss @@ -1,4 +1,4 @@ -@mixin mat-content-node-selector-theme($theme) { +@mixin adf-content-node-selector-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.scss b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.scss index e72cda234b..63f8e72e37 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.scss +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.scss @@ -1,4 +1,4 @@ -@mixin mat-document-list-theme($theme) { +@mixin adf-document-list-theme($theme) { $foreground: map-get($theme, foreground); .document-list_empty_template { diff --git a/ng2-components/ng2-alfresco-documentlist/styles/index.scss b/ng2-components/ng2-alfresco-documentlist/styles/index.scss index 860e29ebcb..67157126f3 100644 --- a/ng2-components/ng2-alfresco-documentlist/styles/index.scss +++ b/ng2-components/ng2-alfresco-documentlist/styles/index.scss @@ -4,8 +4,8 @@ @import '../src/components/document-list.component'; @mixin alfresco-documentlist-theme($theme) { - @include mat-breadcrumb-theme($theme); - @include mat-breadcrumb-dropdown-theme($theme); - @include mat-content-node-selector-theme($theme) ; - @include mat-document-list-theme($theme) ; + @include adf-breadcrumb-theme($theme); + @include adf-breadcrumb-dropdown-theme($theme); + @include adf-content-node-selector-theme($theme) ; + @include adf-document-list-theme($theme) ; } diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.scss b/ng2-components/ng2-alfresco-login/src/components/login.component.scss index 21626b73f1..6fd8b96f08 100644 --- a/ng2-components/ng2-alfresco-login/src/components/login.component.scss +++ b/ng2-components/ng2-alfresco-login/src/components/login.component.scss @@ -1,4 +1,4 @@ -@mixin mat-login-theme($theme) { +@mixin adf-login-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); diff --git a/ng2-components/ng2-alfresco-login/styles/index.scss b/ng2-components/ng2-alfresco-login/styles/index.scss index c6ee91f0cd..cafd89b3ff 100644 --- a/ng2-components/ng2-alfresco-login/styles/index.scss +++ b/ng2-components/ng2-alfresco-login/styles/index.scss @@ -1,5 +1,5 @@ @import '../src/components/login.component'; @mixin alfresco-login-theme($theme) { - @include mat-login-theme($theme); + @include adf-login-theme($theme); } diff --git a/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.scss b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.scss index 70e0e6dd93..c4e7b5cca5 100644 --- a/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.scss +++ b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.scss @@ -1,4 +1,4 @@ -@mixin mat-search-autocomplete-theme($theme) { +@mixin adf-search-autocomplete-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); diff --git a/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss b/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss index 52dc389b28..9b1ed50db7 100644 --- a/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss +++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss @@ -1,4 +1,4 @@ -@mixin mat-search-control-theme($theme) { +@mixin adf-search-control-theme($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); diff --git a/ng2-components/ng2-alfresco-search/styles/index.scss b/ng2-components/ng2-alfresco-search/styles/index.scss index 739cd0cbf0..a6c2d3de23 100644 --- a/ng2-components/ng2-alfresco-search/styles/index.scss +++ b/ng2-components/ng2-alfresco-search/styles/index.scss @@ -2,6 +2,6 @@ @import '../src/components/search-control.component'; @mixin alfresco-search-theme($theme) { - @include mat-search-control-theme($theme); - @include mat-search-autocomplete-theme($theme); + @include adf-search-control-theme($theme); + @include adf-search-autocomplete-theme($theme); } diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.scss b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.scss index 109d86864f..054ff4eda8 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.scss +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.scss @@ -1,5 +1,5 @@ -@mixin mat-upload-dialog-theme($theme) { +@mixin adf-upload-dialog-theme($theme) { $foreground: map-get($theme, foreground); $background: map-get($theme, background); diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list-row.component.scss b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list-row.component.scss index 68f4b94773..6c356e1e3a 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list-row.component.scss +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list-row.component.scss @@ -1,5 +1,5 @@ -@mixin mat-file-uploading-row-theme($theme) { +@mixin adf-file-uploading-row-theme($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); $primary: map-get($theme, primary); diff --git a/ng2-components/ng2-alfresco-upload/styles/index.scss b/ng2-components/ng2-alfresco-upload/styles/index.scss index dff1b54eb9..b66770be05 100644 --- a/ng2-components/ng2-alfresco-upload/styles/index.scss +++ b/ng2-components/ng2-alfresco-upload/styles/index.scss @@ -2,6 +2,6 @@ @import '../src/components/file-uploading-dialog.component'; @mixin alfresco-upload-theme($theme) { - @include mat-file-uploading-row-theme($theme); - @include mat-upload-dialog-theme($theme); + @include adf-file-uploading-row-theme($theme); + @include adf-upload-dialog-theme($theme); } diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html index 8b57082b06..ff482d8907 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html @@ -26,11 +26,11 @@ - + -
-
+
+
ecm-profile-image
@@ -52,11 +52,11 @@ - + -
-
+ bpm-profile-image
{{bpmUser.fullNameDisplay}}
 diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.scss b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.scss index 683c0b63d4..1c1fddae01 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.scss +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.scss @@ -1,4 +1,4 @@ -@mixin mat-userinfo-theme($theme) { +@mixin adf-userinfo-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); $warn: map-get($theme, warn); @@ -145,6 +145,7 @@ } &-userinfo-profile-initials { + text-transform: uppercase; background-size: cover; background: mat-color($primary, 300); border-radius: 50%; @@ -180,6 +181,7 @@ @media only screen and (min-device-width: 480px) { .mat-menu-panel.adf-userinfo-menu { max-height: 450px; + min-width: 4500px; min-width: 450px; overflow: auto; padding: 0; diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts index ea51f8ae8e..3d228d0155 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts @@ -59,9 +59,6 @@ export class UserInfoComponent implements OnInit { constructor(private ecmUserService: EcmUserService, private bpmUserService: BpmUserService, private authService: AlfrescoAuthenticationService) { - authService.onLogin.subscribe((response) => { - this.getUserInfo(); - }); } ngOnInit() { @@ -69,15 +66,15 @@ export class UserInfoComponent implements OnInit { } getUserInfo() { - this.getEcmUserInfo(); - this.getBpmUserInfo(); + this.loadEcmUserInfo(); + this.loadBpmUserInfo(); } isLoggedIn() { return this.authService.isLoggedIn(); } - getEcmUserInfo(): void { + loadEcmUserInfo(): void { if (this.authService.isEcmLoggedIn()) { this.ecmUserService.getCurrentUserInfo() .subscribe((res) => { @@ -91,7 +88,7 @@ export class UserInfoComponent implements OnInit { } } - getBpmUserInfo(): void { + loadBpmUserInfo(): void { if (this.authService.isBpmLoggedIn()) { this.bpmUserService.getCurrentUserInfo() .subscribe((res) => { diff --git a/ng2-components/ng2-alfresco-userinfo/src/i18n/en.json b/ng2-components/ng2-alfresco-userinfo/src/i18n/en.json index 264b734d28..d0b3bc81ef 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/i18n/en.json +++ b/ng2-components/ng2-alfresco-userinfo/src/i18n/en.json @@ -7,6 +7,10 @@ "BPM": { "TENANT": "Tenant" } + }, + "TAB" : { + "CS": "Content Services", + "PS": "Process Services" } } } diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts index fdb03f3953..ecbcfcd103 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts @@ -39,7 +39,7 @@ export class EcmUserService { * @param userName - the user name */ getUserInfo(userName: string): Observable { - return Observable.fromPromise(this.callApiGetPersonInfo(userName)) + return Observable.fromPromise(this.apiService.getInstance().core.peopleApi.getPerson(userName)) .map(data => data['entry']) .catch(err => this.handleError(err)); } @@ -48,10 +48,6 @@ export class EcmUserService { return this.getUserInfo('-me-'); } - private callApiGetPersonInfo(userName: string, opts?: any) { - return this.apiService.getInstance().core.peopleApi.getPerson(userName, opts); - } - getUserProfileImage(avatarId: string) { if (avatarId) { let nodeObj = {entry: {id: avatarId}}; diff --git a/ng2-components/ng2-alfresco-userinfo/styles/index.scss b/ng2-components/ng2-alfresco-userinfo/styles/index.scss index 1ba3eee7f5..755b3142d2 100644 --- a/ng2-components/ng2-alfresco-userinfo/styles/index.scss +++ b/ng2-components/ng2-alfresco-userinfo/styles/index.scss @@ -1,5 +1,5 @@ @import '../src/components/user-info.component'; @mixin alfresco-userinfo-theme($theme) { - @include mat-userinfo-theme($theme); + @include adf-userinfo-theme($theme); }