diff --git a/ng2-components/ng2-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts index e57b5eb4e0..34e012a1b4 100644 --- a/ng2-components/ng2-activiti-tasklist/index.ts +++ b/ng2-components/ng2-activiti-tasklist/index.ts @@ -17,6 +17,7 @@ import { DatePipe } from '@angular/common'; import { ModuleWithProviders, NgModule } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; import { ActivitiFormModule } from 'ng2-activiti-form'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; @@ -156,6 +157,7 @@ export const ACTIVITI_TASKLIST_PROVIDERS: any[] = [ CoreModule, DataTableModule, ActivitiFormModule, + FlexLayoutModule, MaterialModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index 8fc42fc159..cebcf7c2c3 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -43,6 +43,7 @@ "@angular/common": "4.2.5", "@angular/compiler": "4.2.5", "@angular/core": "4.2.5", + "@angular/flex-layout": "^2.0.0-beta.9", "@angular/forms": "4.2.5", "@angular/http": "4.2.5", "@angular/material": "2.0.0-beta.8", diff --git a/ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.css b/ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.css deleted file mode 100644 index 75fe759764..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.css +++ /dev/null @@ -1,22 +0,0 @@ -.mdl-card__media { - margin: 0; -} - -.mdl-card__media > img { - max-width: 100%; -} - -.mdl-card__actions { - display: flex; - box-sizing:border-box; - align-items: center; -} -.mdl-card__actions > .mdl-button--icon { - margin-right: 3px; - margin-left: 3px; -} - -.mdl-card:hover { - box-shadow: 0 8px 10px 1px rgba(0, 0, 0, .14), 0 3px 14px 2px rgba(0, 0, 0, .12), 0 5px 5px -3px rgba(0, 0, 0, .2); - cursor: pointer; -} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.scss new file mode 100644 index 0000000000..f3d866fe17 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.scss @@ -0,0 +1,93 @@ +$themes: ( + theme-1: (bg: #269abc, color: #168aac), + theme-2: (bg: #7da9b0, color: #6d99a0), + theme-3: (bg: #7689ab, color: #66799b), + theme-4: (bg: #c74e3e, color: #b73e2e), + theme-5: (bg: #fab96c, color: #eaa95c), + theme-6: (bg: #759d4c, color: #658d3c), + theme-7: (bg: #b1b489, color: #a1a479), + theme-8: (bg: #a17299, color: #916289), + theme-9: (bg: #696c67, color: #595c57), + theme-10: (bg: #cabb33, color: #baab23) +); + +.adf-app-listgrid { + padding: 8px; + + &-item { + outline: none; + padding: 8px; + box-sizing: border-box; + + &-card { + + @for $i from 1 through 10 { + &.theme-#{$i} { + $theme: map-get($themes, theme-#{$i}); + background-color: map-get($theme, bg); + } + } + + outline: none; + transition: transform 280ms cubic-bezier(.4,0,.2,1), box-shadow 280ms cubic-bezier(.4,0,.2,1); + min-height: 200px; + padding: 0; + + &:hover { + box-shadow: 0 8px 10px 1px rgba(0, 0, 0, .14), 0 3px 14px 2px rgba(0, 0, 0, .12), 0 5px 5px -3px rgba(0, 0, 0, .2); + cursor: pointer; + transform: scale(1.015); + } + + &-logo { + position: absolute; + right: 20px; + top: 20px; + padding: 16px; + + &-icon { + font-size: 70px; + width: 1em; + height: 1em; + + @for $i from 1 through 10 { + .theme-#{$i} & { + $theme: map-get($themes, theme-#{$i}); + color: map-get($theme, color); + } + } + } + } + + &-title { + padding: 16px; + + h1 { + color: white; + width: 80%; + font-size: 24px; + margin: 0; + line-height: normal; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + } + + &-subtitle { + padding: 16px; + } + + &-actions { + padding: 16px; + border-top: 1px solid rgba(0,0,0,.1); + min-height: 64px; + box-sizing: border-box; + + &-icon { + color: #e9f1f3; + } + } + } + } +} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.css b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.css deleted file mode 100644 index a5ae7c58d1..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.css +++ /dev/null @@ -1,140 +0,0 @@ -:host { - width: 100%; -} - -.application-title { - color: white; - width: 80%; -} - -.logo { - position: absolute; - right: 20px; - top: 20px; -} -.logo i{ - font-size: 70px; -} -.theme-1 { - background-color: #269abc; -} -.theme-1 .logo i { - color: #168aac; -} -.theme-1 .mdl-card__actions i { - color: #168aac; -} -.theme-1 .mdl-card__actions i:hover { - color: #b7dfea; -} -.theme-2 { - background-color: #7da9b0; -} -.theme-2 .logo i { - color: #6d99a0; -} -.theme-2 .mdl-card__actions i { - color: #6d99a0; -} -.theme-2 .mdl-card__actions i:hover { - color: #def2f5; -} -.theme-3 { - background-color: #7689ab; -} -.theme-3 .logo i { - color: #66799b; -} -.theme-3 .mdl-card__actions i { - color: #66799b; -} -.theme-3 .mdl-card__actions i:hover { - color: #a2b4d6; -} -.theme-4 { - background-color: #c74e3e; -} -.theme-4 .logo i { - color: #b73e2e; -} -.theme-4 .mdl-card__actions i { - color: #b73e2e; -} -.theme-4 .mdl-card__actions i:hover { - color: #de8b80; -} -.theme-5 { - background-color: #fab96c; -} -.theme-5 .logo i { - color: #eaa95c; -} -.theme-5 .mdl-card__actions i { - color: #eaa95c; -} -.theme-5 .mdl-card__actions i:hover { - color: #fdd9ae; -} -.theme-6 { - background-color: #759d4c; -} -.theme-6 .logo i { - color: #658d3c; -} -.theme-6 .mdl-card__actions i { - color: #658d3c; -} -.theme-6 .mdl-card__actions i:hover { - color: #a8d07f; -} -.theme-7 { - background-color: #b1b489; -} -.theme-7 .logo i { - color: #a1a479; -} -.theme-7 .mdl-card__actions i { - color: #a1a479; -} -.theme-7 .mdl-card__actions i:hover { - color: #d9dcb2; -} -.theme-8 { - background-color: #a17299; -} -.theme-8 .logo i { - color: #916289; -} -.theme-8 .mdl-card__actions i { - color: #916289; -} -.theme-8 .mdl-card__actions i:hover { - color: #d0a8c9; -} -.theme-9 { - background-color: #696c67; -} -.theme-9 .logo i { - color: #595c57; -} -.theme-9 .mdl-card__actions i { - color: #595c57; -} -.theme-9 .mdl-card__actions i:hover { - color: #a6a9a4; -} -.theme-10 { - background-color: #cabb33; -} -.theme-10 .logo i { - color: #baab23; -} -.theme-10 .mdl-card__actions i { - color: #baab23; -} -.theme-10 .mdl-card__actions i:hover { - color: #efe79e; -} -.selectedIcon{ - color: #e9f1f3!important; -} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html index ffa4a09e17..ebf91de101 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html @@ -1,24 +1,35 @@
{{app.description}}
-{{app.description}}
+