[ADF-theming-fix] Fix theming related issues (#2276)

* First steps

* Every package have separate entry points for styling mixins

* Moving to config dir, and using it in demo shell

* Remove webpack config include path magic from activiti-form package

* Fixing all the webpack common configs and using relative paths in the prebuilt themes

* Datatable header fix

* Update documentation
This commit is contained in:
Popovics András
2017-09-05 15:16:41 +01:00
committed by Mario Romano
parent 738290ce37
commit 407e11664a
72 changed files with 8936 additions and 7538 deletions
+25 -4
View File
@@ -1,6 +1,16 @@
@import '~@angular/material/theming';
@import 'colors';
@import 'all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import '~ng2-alfresco-core/styles/index';
@import '~ng2-activiti-analytics/styles/index';
@import '~ng2-activiti-diagrams/styles/index';
@import '~ng2-activiti-form/styles/index';
@import '~ng2-activiti-processlist/styles/index';
@import '~ng2-activiti-tasklist/styles/index';
@import '~ng2-alfresco-datatable/styles/index';
@import '~ng2-alfresco-documentlist/styles/index';
@import '~ng2-alfresco-login/styles/index';
@import '~ng2-alfresco-upload/styles/index';
@import '~ng2-alfresco-userinfo/styles/index';
@include mat-core();
@@ -10,4 +20,15 @@ $warn: mat-palette($alfresco-warn);
$theme: mat-light-theme($primary, $accent, $warn);
@include angular-material-theme($theme);
@include alfresco-material-theme($theme);
@include alfresco-core-theme($theme);
@include alfresco-activity-analytics-theme($theme);
@include alfresco-activity-diagrams-theme($theme);
@include alfresco-activity-form-theme($theme);
@include alfresco-activity-processlist-theme($theme);
@include alfresco-activity-tasklist-theme($theme);
@include alfresco-datatable-theme($theme);
@include alfresco-documentlist-theme($theme);
@include alfresco-login-theme($theme);
@include alfresco-upload-theme($theme);
@include alfresco-userinfo-theme($theme);
+17 -1
View File
@@ -65,23 +65,39 @@ module.exports = webpackMerge(commonConfig, {
resolve: {
alias: {
"ng2-alfresco-core$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core'),
"ng2-alfresco-datatable$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-datatable/index.ts'),
"ng2-alfresco-datatable": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-datatable'),
"ng2-activiti-form/stencils/runtime.ng1$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-form/stencils/runtime.ng1'),
"ng2-activiti-form/stencils/runtime.adf$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-form/stencils/runtime.adf'),
"ng2-activiti-diagrams$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-diagrams/index.ts'),
"ng2-activiti-diagrams": path.resolve(__dirname, '../../ng2-components/ng2-activiti-diagrams'),
"ng2-activiti-analytics$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-analytics/index.ts'),
"ng2-activiti-analytics": path.resolve(__dirname, '../../ng2-components/ng2-activiti-analytics'),
"ng2-activiti-form$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-form/index.ts'),
"ng2-activiti-form": path.resolve(__dirname, '../../ng2-components/ng2-activiti-form'),
"ng2-activiti-tasklist$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-tasklist/index.ts'),
"ng2-activiti-tasklist": path.resolve(__dirname, '../../ng2-components/ng2-activiti-tasklist'),
"ng2-activiti-processlist$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-processlist/index.ts'),
"ng2-activiti-processlist": path.resolve(__dirname, '../../ng2-components/ng2-activiti-processlist'),
"ng2-alfresco-documentlist$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-documentlist/index.ts'),
"ng2-alfresco-documentlist": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-documentlist'),
"ng2-alfresco-login$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-login/index.ts'),
"ng2-alfresco-login": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-login'),
"ng2-alfresco-search$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-search/index.ts'),
"ng2-alfresco-search": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-search'),
"ng2-alfresco-social$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-social/index.ts'),
"ng2-alfresco-social": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-social'),
"ng2-alfresco-tag$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-tag/index.ts'),
"ng2-alfresco-tag": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-tag'),
"ng2-alfresco-upload$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-upload/index.ts'),
"ng2-alfresco-upload": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-upload'),
"ng2-alfresco-viewer$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-viewer/index.ts'),
"ng2-alfresco-viewer": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-viewer'),
"ng2-alfresco-webscript$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-webscript/index.ts'),
"ng2-alfresco-userinfo$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-userinfo/index.ts')
"ng2-alfresco-webscript": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-webscript'),
"ng2-alfresco-userinfo$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-userinfo/index.ts'),
"ng2-alfresco-userinfo": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-userinfo')
},
extensions: ['.ts', '.js'],
modules: [path.resolve(__dirname, '../node_modules')]
+37 -12
View File
@@ -21,7 +21,7 @@ Available pre-built themes:
If you're using Angular CLI you can include one of the prebuilt theme in yours `styles.css` file:
```css
@import 'ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css';
@import '~ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css';
```
Or you can add it directly in your index.html
@@ -31,12 +31,25 @@ Or you can add it directly in your index.html
### Defining a custom theme
When you want more customization than a pre-built theme offers, you can create your own theme file.
When you want more customization than a pre-built theme offers, you can create your own theme file. You need to include the packages only what you really use in your application.
```scss
/*
* Include only packages what you are using (and core by default)
*/
@import '~@angular/material/theming';
@import 'colors';
@import 'all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import '~ng2-alfresco-core/styles/index';
@import '~ng2-activiti-analytics/styles/index';
@import '~ng2-activiti-diagrams/styles/index';
@import '~ng2-activiti-form/styles/index';
@import '~ng2-activiti-processlist/styles/index';
@import '~ng2-activiti-tasklist/styles/index';
@import '~ng2-alfresco-datatable/styles/index';
@import '~ng2-alfresco-documentlist/styles/index';
@import '~ng2-alfresco-login/styles/index';
//@import '~ng2-alfresco-upload/styles/index';
//@import '~ng2-alfresco-userinfo/styles/index';
@include mat-core();
@@ -44,10 +57,21 @@ $primary: mat-palette($alfresco-accent-orange);
$accent: mat-palette($alfresco-accent-purple);
$warn: mat-palette($alfresco-warn);
$theme: mat-light-theme($primary, $accent, $warn);
//or $theme: mat-dark-theme($primary, $accent, $warn); for dark theme
@include angular-material-theme($theme);
@include alfresco-material-theme($theme);
@include alfresco-core-theme($theme);
@include alfresco-activity-analytics-theme($theme);
@include alfresco-activity-diagrams-theme($theme);
@include alfresco-activity-form-theme($theme);
@include alfresco-activity-processlist-theme($theme);
@include alfresco-activity-tasklist-theme($theme);
@include alfresco-datatable-theme($theme);
@include alfresco-documentlist-theme($theme);
@include alfresco-login-theme($theme);
//@include alfresco-upload-theme($theme);
//@include alfresco-userinfo-theme($theme);
```
Notes: if you are using the Generator or the demo shell you need only to change the`/app/theme.scss` with your set of colors
@@ -59,8 +83,9 @@ You can create multiple themes for your application:
```scss
@import '~@angular/material/theming';
@import 'colors';
@import 'all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import '~ng2-alfresco-core/styles/index';
...
@include mat-core();
@@ -71,12 +96,12 @@ $warn: mat-palette($alfresco-warn);
$theme: mat-light-theme($primary, $accent, $warn);
$dark-theme: mat-dark-theme($primary, $accent, $warn);
@include angular-material-theme($theme);
@include alfresco-material-theme($theme);
@include alfresco-core-theme($theme);
...like above
.adf-dark-theme {
@include angular-material-theme($dark-theme);
@include alfresco-material-theme($dark-theme);
@include alfresco-core-theme($dark-theme);
...like above
}
```
Any component with the `add-dark-theme` class will use the dark theme, while other components will fall back to the default.
@@ -0,0 +1,25 @@
@import 'ng2-alfresco-core/styles/index';
@import 'ng2-activiti-analytics/styles/index';
@import 'ng2-activiti-diagrams/styles/index';
@import 'ng2-activiti-form/styles/index';
@import 'ng2-activiti-processlist/styles/index';
@import 'ng2-activiti-tasklist/styles/index';
@import 'ng2-alfresco-datatable/styles/index';
@import 'ng2-alfresco-documentlist/styles/index';
@import 'ng2-alfresco-login/styles/index';
@import 'ng2-alfresco-upload/styles/index';
@import 'ng2-alfresco-userinfo/styles/index';
@mixin alfresco-material-theme($theme) {
@include alfresco-core-theme($theme);
@include alfresco-activity-analytics-theme($theme);
@include alfresco-activity-diagrams-theme($theme);
@include alfresco-activity-form-theme($theme);
@include alfresco-activity-processlist-theme($theme);
@include alfresco-activity-tasklist-theme($theme);
@include alfresco-datatable-theme($theme);
@include alfresco-documentlist-theme($theme);
@include alfresco-login-theme($theme);
@include alfresco-upload-theme($theme);
@include alfresco-userinfo-theme($theme);
}
@@ -1,6 +1,5 @@
@import '~@angular/material/theming';
@import '../colors';
@import '../all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,6 +1,5 @@
@import '~@angular/material/theming';
@import '../colors';
@import '../all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,6 +1,5 @@
@import '~@angular/material/theming';
@import '../colors';
@import '../all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,6 +1,5 @@
@import '~@angular/material/theming';
@import '../colors';
@import '../all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,6 +1,5 @@
@import '~@angular/material/theming';
@import '../colors';
@import '../all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,6 +1,5 @@
@import '~@angular/material/theming';
@import '../colors';
@import '../all-theme';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,5 +1,5 @@
@import '../all-theme';
@import '~@angular/material/theming';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,5 +1,5 @@
@import '../all-theme';
@import '~@angular/material/theming';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
@@ -1,5 +1,5 @@
@import '../all-theme';
@import '~@angular/material/theming';
@import '~ng2-alfresco-core/styles/theming';
@import './all-theme';
@include mat-core();
+4 -6
View File
@@ -40,7 +40,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": path.resolve(__dirname, '../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core$": path.resolve(__dirname, '../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": path.resolve(__dirname, '../ng2-alfresco-core'),
"ng2-alfresco-datatable": path.resolve(__dirname, '../ng2-alfresco-datatable/index.ts'),
"ng2-activiti-diagrams": path.resolve(__dirname, '../ng2-activiti-diagrams/index.ts'),
"ng2-activiti-analytics": path.resolve(__dirname, '../ng2-activiti-analytics/index.ts'),
@@ -57,7 +58,7 @@ module.exports = {
"ng2-alfresco-webscript": path.resolve(__dirname, '../ng2-alfresco-webscript/index.ts'),
"ng2-alfresco-userinfo": path.resolve(__dirname, '../ng2-alfresco-userinfo/index.ts')
},
extensions: ['.ts', '.js'],
extensions: ['.ts', '.js', '.scss'],
modules: [helpers.root('node_modules')]
},
@@ -109,10 +110,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}]
},
{
+31 -13
View File
@@ -6,31 +6,49 @@ const extractScss = new ExtractTextPlugin('./ng2-alfresco-core/prebuilt-themes/[
module.exports = {
entry: {
'adf-blue-orange': './ng2-alfresco-core/styles/prebuilt/adf-blue-orange.scss',
'adf-blue-purple': './ng2-alfresco-core/styles/prebuilt/adf-blue-purple.scss',
'adf-cyan-orange': './ng2-alfresco-core/styles/prebuilt/adf-cyan-orange.scss',
'adf-cyan-purple': './ng2-alfresco-core/styles/prebuilt/adf-cyan-purple.scss',
'adf-green-purple': './ng2-alfresco-core/styles/prebuilt/adf-green-purple.scss',
'adf-green-orange': './ng2-alfresco-core/styles/prebuilt/adf-green-orange.scss',
'adf-pink-bluegrey': './ng2-alfresco-core/styles/prebuilt/adf-pink-bluegrey.scss',
'adf-indigo-pink': './ng2-alfresco-core/styles/prebuilt/adf-indigo-pink.scss',
'adf-purple-green': './ng2-alfresco-core/styles/prebuilt/adf-purple-green.scss'
'adf-blue-orange': './config/prebuilt/adf-blue-orange.scss',
'adf-blue-purple': './config/prebuilt/adf-blue-purple.scss',
'adf-cyan-orange': './config/prebuilt/adf-cyan-orange.scss',
'adf-cyan-purple': './config/prebuilt/adf-cyan-purple.scss',
'adf-green-purple': './config/prebuilt/adf-green-purple.scss',
'adf-green-orange': './config/prebuilt/adf-green-orange.scss',
'adf-pink-bluegrey': './config/prebuilt/adf-pink-bluegrey.scss',
'adf-indigo-pink': './config/prebuilt/adf-indigo-pink.scss',
'adf-purple-green': './config/prebuilt/adf-purple-green.scss'
},
output: {
filename: './dist/[name].js'
},
resolve: {
alias: {
"ng2-alfresco-core": path.resolve(__dirname, '../ng2-alfresco-core'),
"ng2-alfresco-datatable": path.resolve(__dirname, '../ng2-alfresco-datatable'),
"ng2-activiti-diagrams": path.resolve(__dirname, '../ng2-activiti-diagrams'),
"ng2-activiti-analytics": path.resolve(__dirname, '../ng2-activiti-analytics'),
"ng2-activiti-form": path.resolve(__dirname, '../ng2-activiti-form'),
"ng2-activiti-tasklist": path.resolve(__dirname, '../ng2-activiti-tasklist'),
"ng2-activiti-processlist": path.resolve(__dirname, '../ng2-activiti-processlist'),
"ng2-alfresco-documentlist": path.resolve(__dirname, '../ng2-alfresco-documentlist'),
"ng2-alfresco-login": path.resolve(__dirname, '../ng2-alfresco-login'),
"ng2-alfresco-search": path.resolve(__dirname, '../ng2-alfresco-search'),
"ng2-alfresco-social": path.resolve(__dirname, '../ng2-alfresco-social'),
"ng2-alfresco-tag": path.resolve(__dirname, '../ng2-alfresco-tag'),
"ng2-alfresco-upload": path.resolve(__dirname, '../ng2-alfresco-upload'),
"ng2-alfresco-viewer": path.resolve(__dirname, '../ng2-alfresco-viewer'),
"ng2-alfresco-webscript": path.resolve(__dirname, '../ng2-alfresco-webscript'),
"ng2-alfresco-userinfo": path.resolve(__dirname, '../ng2-alfresco-userinfo'),
}
},
module: {
rules: [{
test: /\.scss$/,
use: extractScss.extract([{
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}])
}]
},
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core'),
"ng2-activiti-diagrams": helpers.root('../ng2-activiti-diagrams/index.ts')
},
extensions: ['.ts', '.js'],
@@ -68,10 +69,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,5 @@
@import '../src/components/analytics-report-list.component';
@mixin alfresco-activity-analytics-theme($theme) {
@include mat-analytics-report-list-theme($theme);
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,5 @@
@import '../src/components/tooltip/diagram-tooltip.component';
@mixin alfresco-activity-diagrams-theme($theme) {
@include mat-diagram-tooltip-theme($theme);
}
@@ -19,9 +19,10 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
extensions: ['.ts', '.js', '.scss'],
symlinks: false,
modules: [helpers.root('../../ng2-components'), helpers.root('node_modules')]
},
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,5 +1,5 @@
@import '../form';
@import 'mixins';
@import '~ng2-alfresco-core/styles/mixins';
@mixin mat-dynamic-table-theme($theme) {
$foreground: map-get($theme, foreground);
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
.adf {
&-date-editor {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
.adf {
&-dropdown-editor-select {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
.adf {
&-text-editor {
@@ -1,5 +1,5 @@
@import './hyperlink/hyperlink.widget';
@import 'colors';
@import '~ng2-alfresco-core/styles/colors';
@mixin mat-form-theme($theme) {
$primary: map-get($theme, primary);
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -1,4 +1,4 @@
@import 'theming';
@import '~ng2-alfresco-core/styles/theming';
@import '../form';
.adf {
@@ -0,0 +1,9 @@
@import '../src/components/widgets/form';
@import '../src/components/widgets/container/container.widget';
@import '../src/components/widgets/dynamic-table/dynamic-table.widget';
@mixin alfresco-activity-form-theme($theme) {
@include mat-form-theme($theme);
@include mat-container-widget-theme($theme);
@include mat-dynamic-table-theme($theme);
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core'),
"ng2-alfresco-datatable": helpers.root('../ng2-alfresco-datatable/index.ts'),
"ng2-activiti-tasklist": helpers.root('../ng2-activiti-tasklist/index.ts'),
"ng2-activiti-form": helpers.root('../ng2-activiti-form/index.ts')
@@ -70,10 +71,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,5 @@
@import '../src/components/process-filters.component';
@mixin alfresco-activity-processlist-theme($theme) {
@include mat-filters-process-theme($theme);
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core'),
"ng2-alfresco-datatable": helpers.root('../ng2-alfresco-datatable/index.ts'),
"ng2-activiti-form": helpers.root('../ng2-activiti-form/index.ts')
},
@@ -69,10 +70,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,15 @@
@import '../src/components/comment-list.component';
@import '../src/components/start-task.component';
@import '../src/components/people-search.component';
@import '../src/components/people.component';
@import '../src/components/task-filters.component';
@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);
}
@@ -64,10 +64,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -11,7 +11,7 @@
border-top: $adf-pagination--border;
height: $adf-pagination--height;
line-height: $adf-pagination--height;
color: mat-color($primary, default-contrast);
color: mat-color($foreground, text);
&__block {
display: flex;
@@ -1,67 +0,0 @@
@import '../../ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component';
@import '../../ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component';
@import '../../ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component';
@import '../../ng2-activiti-form/src/components/widgets/form';
@import '../../ng2-activiti-form/src/components/widgets/container/container.widget';
@import '../../ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.scss';
@import '../../ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component';
@import '../../ng2-activiti-analytics/src/components/analytics-report-list.component';
@import '../../ng2-activiti-tasklist/src/components/comment-list.component';
@import '../../ng2-activiti-tasklist/src/components/start-task.component';
@import '../../ng2-activiti-tasklist/src/components/people-search.component';
@import '../../ng2-activiti-tasklist/src/components/people.component';
@import '../../ng2-activiti-tasklist/src/components/task-filters.component';
@import '../../ng2-activiti-tasklist/src/components/task-header.component';
@import '../../ng2-activiti-processlist/src/components/process-filters.component';
@import '../../ng2-alfresco-upload/src/components/file-uploading-list-row.component';
@import '../../ng2-alfresco-upload/src/components/file-uploading-dialog.component';
@import '../../ng2-alfresco-login/src/components/login.component';
@import '../../ng2-alfresco-core/src/components/collapsable/accordion-group.component';
@import '../../ng2-alfresco-core/src/components/view/card-view-textitem.component';
@import '../../ng2-alfresco-core/src/components/view/card-view-dateitem.component';
@import '../../ng2-alfresco-core/src/components/view/card-view.component';
@import '../../ng2-alfresco-core/src/components/toolbar/toolbar.component';
@import '../../ng2-alfresco-core/src/components/pagination/pagination.component';
@import '../../ng2-alfresco-core/styles/theme-colors';
@import '../../ng2-alfresco-datatable/src/components/datatable/datatable.component.scss';
@import '../../ng2-alfresco-userinfo/src/components/user-info.component.scss';
@mixin alfresco-material-theme($theme) {
@include mat-colors-theme($theme);
@include mat-breadcrumb-theme($theme);
@include mat-form-theme($theme);
@include mat-container-widget-theme($theme);
@include mat-diagram-tooltip-theme($theme);
@include mat-comment-list-theme($theme);
@include mat-start-task-theme($theme);
@include mat-people-search-theme($theme);
@include mat-file-uploading-row-theme($theme);
@include mat-people-theme($theme);
@include mat-login-theme($theme);
@include mat-accordion-theme($theme);
@include mat-filters-task-theme($theme);
@include mat-filters-process-theme($theme);
@include mat-analytics-report-list-theme($theme);
@include mat-header-theme($theme);
@include mat-card-view-textitem-theme($theme);
@include mat-card-view-dateitem-theme($theme);
@include mat-pagination-theme($theme);
@include mat-upload-dialog-theme($theme);
@include mat-card-view-theme($theme);
@include mat-adf-toolbar-theme($theme);
@include mat-dynamic-table-theme($theme);
@include mat-breadcrumb-dropdown-theme($theme);
@include mat-datatable-theme($theme);
@include mat-content-node-selector-theme($theme);
@include mat-userinfo-theme($theme);
}
@@ -0,0 +1,17 @@
@import './theme-colors';
@import '../src/components/collapsable/accordion-group.component';
@import '../src/components/view/card-view-textitem.component';
@import '../src/components/view/card-view-dateitem.component';
@import '../src/components/view/card-view.component';
@import '../src/components/toolbar/toolbar.component';
@import '../src/components/pagination/pagination.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-pagination-theme($theme);
@include mat-colors-theme($theme);
}
@@ -1,6 +1,5 @@
@import 'mixins';
@import 'variables';
@import 'colors';
@import '_all-theme';
@import './mixins';
@import './variables';
@import './colors';
@import '~@angular/material/theming';
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -6,7 +6,7 @@
$data-table-font-size: 14px !default;
$data-table-header-font-size: 12px !default;
$data-table-header-sort-icon-size: 16px !default;
$data-table-header-color: mat-color($primary, default-contrast) !default;
$data-table-header-color: mat-color($foreground, text) !default;
$data-table-header-sorted-color: mat-color($foreground, text) !default;
$data-table-header-sorted-icon-hover-color: mat-color($foreground, disabled-text) !default;
$data-table-divider-color: mat-color($foreground, text, .07) !default;
@@ -0,0 +1,5 @@
@import '../src/components/datatable/datatable.component';
@mixin alfresco-datatable-theme($theme) {
@include mat-datatable-theme($theme);
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core'),
"ng2-alfresco-datatable": helpers.root('../ng2-alfresco-datatable/index.ts')
},
extensions: ['.ts', '.js'],
@@ -68,10 +69,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,9 @@
@import '../src/components/breadcrumb/breadcrumb.component';
@import '../src/components/breadcrumb/dropdown-breadcrumb.component';
@import '../src/components/content-node-selector/content-node-selector.component';
@mixin alfresco-documentlist-theme($theme) {
@include mat-breadcrumb-theme($theme);
@include mat-breadcrumb-dropdown-theme($theme);
@include mat-content-node-selector-theme($theme) ;
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,5 @@
@import '../src/components/login.component';
@mixin alfresco-login-theme($theme) {
@include mat-login-theme($theme);
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core'),
"ng2-alfresco-datatable": helpers.root('../ng2-alfresco-datatable/index.ts'),
"ng2-alfresco-documentlist": helpers.root('../ng2-alfresco-documentlist/index.ts')
},
@@ -69,10 +70,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,7 @@
@import '../src/components/file-uploading-list-row.component';
@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);
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -0,0 +1,5 @@
@import '../src/components/user-info.component';
@mixin alfresco-userinfo-theme($theme) {
@include mat-userinfo-theme($theme);
}
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts')
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core')
},
extensions: ['.ts', '.js'],
symlinks: false,
@@ -67,10 +68,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
@@ -19,7 +19,8 @@ module.exports = {
resolve: {
alias: {
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core$": helpers.root('../ng2-alfresco-core/index.ts'),
"ng2-alfresco-core": helpers.root('../ng2-alfresco-core'),
"ng2-alfresco-datatable": helpers.root('../ng2-alfresco-datatable/index.ts')
},
extensions: ['.ts', '.js'],
@@ -68,10 +69,7 @@ module.exports = {
}, {
loader: "raw-loader"
}, {
loader: "sass-loader",
options: {
includePaths: [ path.resolve(__dirname, '../../ng2-alfresco-core/styles')]
}
loader: "sass-loader"
}],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
+2 -1
View File
@@ -7,7 +7,8 @@
"clean": "rimraf node_modules",
"clean-lock": "rimraf package-lock.json",
"rimraf": "rimraf",
"build": "npm run toc && npm run markdownlint && npm run webpack -- --config config/webpack.build.js --progress --profile --bail",
"build": "npm run toc && npm run markdownlint && npm run webpack -- --config config/webpack.build.js --progress --profile --bail && npm run build-style",
"build-style": "npm run webpack -- --config config/webpack.style.js --progress --profile --bail",
"test": "node node_modules/karma/bin/karma start --reporters mocha,coverage --single-run --component .",
"test-browser": "node node_modules/karma/bin/karma start karma.conf.js --reporters kjhtml",
"coverage": "",