Added Tailwind

This commit is contained in:
Lorenz Hilpert
2020-09-22 19:25:41 +02:00
parent c43264f71c
commit b1da89717d
50 changed files with 942 additions and 308 deletions

View File

@@ -14,13 +14,13 @@
"options": {
"tsConfig": "libs/ui/tsconfig.lib.json",
"project": "libs/ui/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "libs/ui/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -51,7 +51,7 @@
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"aot": true,
"outputPath": "dist/sales",
@@ -75,7 +75,10 @@
"apps/sales/src/scss"
]
},
"scripts": []
"scripts": [],
"customWebpackConfig": {
"path": "apps/sales/webpack.config.js"
}
},
"configurations": {
"production": {
@@ -114,13 +117,16 @@
"maximumWarning": "6kb"
}
]
}
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "sales:build"
"browserTarget": "sales:build",
"customWebpackConfig": {
"path": "apps/sales/webpack.config.js"
}
},
"configurations": {
"test": {
@@ -222,13 +228,13 @@
"options": {
"tsConfig": "libs/sso/tsconfig.lib.json",
"project": "libs/sso/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "libs/sso/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -262,13 +268,13 @@
"options": {
"tsConfig": "apps/swagger/availability/tsconfig.lib.json",
"project": "apps/swagger/availability/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/availability/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -302,13 +308,13 @@
"options": {
"tsConfig": "apps/swagger/checkout/tsconfig.lib.json",
"project": "apps/swagger/checkout/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/checkout/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -342,13 +348,13 @@
"options": {
"tsConfig": "apps/swagger/crm/tsconfig.lib.json",
"project": "apps/swagger/crm/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/crm/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -382,13 +388,13 @@
"options": {
"tsConfig": "apps/swagger/isa/tsconfig.lib.json",
"project": "apps/swagger/isa/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/isa/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -422,13 +428,13 @@
"options": {
"tsConfig": "apps/swagger/oms/tsconfig.lib.json",
"project": "apps/swagger/oms/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/oms/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -462,13 +468,13 @@
"options": {
"tsConfig": "apps/swagger/print/tsconfig.lib.json",
"project": "apps/swagger/print/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/print/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -502,13 +508,13 @@
"options": {
"tsConfig": "apps/swagger/cat/tsconfig.lib.json",
"project": "apps/swagger/cat/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/cat/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -542,13 +548,13 @@
"options": {
"tsConfig": "apps/swagger/eis/tsconfig.lib.json",
"project": "apps/swagger/eis/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/swagger/eis/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -582,13 +588,13 @@
"options": {
"tsConfig": "apps/native-container/tsconfig.lib.json",
"project": "apps/native-container/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/native-container/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -622,13 +628,13 @@
"options": {
"tsConfig": "apps/isa/remission/tsconfig.lib.json",
"project": "apps/isa/remission/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/isa/remission/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -662,13 +668,13 @@
"options": {
"tsConfig": "apps/domain/crm/tsconfig.lib.json",
"project": "apps/domain/crm/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/domain/crm/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
@@ -702,13 +708,13 @@
"options": {
"tsConfig": "apps/domain/checkout/tsconfig.lib.json",
"project": "apps/domain/checkout/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "apps/domain/checkout/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {

View File

@@ -1,4 +1,4 @@
@import '../../../assets/scss/variables';
@import 'variables';
.breadacrumb-grid {
display: grid;

View File

@@ -1,4 +1,4 @@
@import '../../../assets/scss/variables';
@import 'variables';
.header-wrapper {
background-color: white;

View File

@@ -1,4 +1,4 @@
@import '../../../assets/scss/variables';
@import 'variables';
.menu {
position: fixed;

View File

@@ -1,4 +1,4 @@
@import '../../../assets/scss/variables';
@import 'variables';
.grid-container {
display: grid;

View File

@@ -1,4 +1,4 @@
@import '../../../assets/scss/variables';
@import 'variables';
.grid-container {
display: flex;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.pay-method-modal {
font-family: 'Open Sans';

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.cart-confirmation-container {
background-color: #ffffff;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.cart-container {
background-color: #ffffff;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.create-customer-container {
border-radius: 4px;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
:host {
position: relative;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
:host {
position: relative;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.customer-edit-container {
background-color: white;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.customer-loyalty-container {
font-family: 'Open Sans';

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.customer-section-search {
border-radius: 4px;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.customer-search-result-container {
font-family: 'Open Sans';

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
:host {
position: relative;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-wrapper {
display: grid;
grid-template-columns: min-content auto;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.kpi-container {
margin-top: 10px;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
:host {
position: relative;

View File

@@ -1,4 +1,4 @@
@import '../../../../..//assets/scss/variables';
@import 'variables';
.card-container {
display: grid;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
display: grid;
grid-template-columns: min-content auto;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
background-color: white;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.goods-in-search-container {
background-image: linear-gradient(-180deg, #ffffff 0%, #ffffff 100%);

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
display: grid;
grid-template-columns: min-content auto;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
display: grid;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.product-detail-container {
// display: grid;

View File

@@ -1,4 +1,4 @@
@import '../../../../../../../assets/scss/variables';
@import 'variables';
.filter-name {
font-size: 16px;

View File

@@ -1,4 +1,4 @@
@import '../../../../../../../assets/scss/variables';
@import 'variables';
.filter-container {
display: flex;

View File

@@ -1,4 +1,4 @@
@import '../../../../../../../assets/scss/variables';
@import 'variables';
.article-search-container {
background-image: linear-gradient(-180deg, #ffffff 0%, #ffffff 100%);

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.modal-wrapper {
font-family: 'Open Sans';

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
display: grid;
grid-template-columns: min-content auto;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
min-height: 200px;

View File

@@ -1,4 +1,4 @@
@import '../../../../../scss/variables';
@import 'variables';
.container {
background-color: $content-background-color;

View File

@@ -1,4 +1,4 @@
@import '../../../../../../scss/variables';
@import 'variables';
.item {
font-family: $font-family;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
background-color: white;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.container {
.header {

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.card-container {
display: grid;
grid-template-columns: min-content auto;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
.container {
.header {

View File

@@ -1,4 +1,4 @@
@import '../../../../../scss/variables';
@import 'variables';
app-search {
width: 80vw;

View File

@@ -1,4 +1,4 @@
@import '../../../../../assets/scss/variables';
@import 'variables';
:host {
display: flex;

View File

@@ -1,4 +1,4 @@
@import '../../../assets/scss/variables';
@import 'variables';
:host {
height: 100%;

View File

@@ -1,15 +0,0 @@
/* constants declaration */
$color-active: #1f466c;
$color-inactive: #557596;
$branch-color-active: #596470;
$branch-color-inactive: #89949e;
$hima-content-color: #e6eff9;
$hima-branch-content-color: #edeff0;
$hima-content-shadow-color: #dde5ec;
$hima-color-red: #f70400;
$important-notification: #1f466c;
$hima-button-color: #f70400;
$hima-error-msg-color: #f70400;
$hima-secondary-title-color: #557596;
$hima-download-cart-color: #1f466c;
$hima-color-text-neutral: #be8100;

View File

@@ -1,4 +1,20 @@
/* COMMON */
/* constants declaration (Umwerk Scheiss) */
$color-active: #1f466c;
$color-inactive: #557596;
$branch-color-active: #596470;
$branch-color-inactive: #89949e;
$hima-content-color: #e6eff9;
$hima-branch-content-color: #edeff0;
$hima-content-shadow-color: #dde5ec;
$hima-color-red: #f70400;
$important-notification: #1f466c;
$hima-button-color: #f70400;
$hima-error-msg-color: #f70400;
$hima-secondary-title-color: #557596;
$hima-download-cart-color: #1f466c;
$hima-color-text-neutral: #be8100;
/* Umwerk Scheiss ENDE */
$font-family: 'Open Sans';
$font-size: 16px;
$font-weight: normal;

View File

@@ -1,6 +1,10 @@
@import 'tailwindcss/base';
@import 'tailwindcss/components';
@import 'tailwindcss/utilities';
@import '~perfect-scrollbar/css/perfect-scrollbar.css';
@import '~@angular/cdk/overlay-prebuilt.css';
@import 'scss/theme';
@import './scss/theme';
::-webkit-scrollbar {
width: 0; // remove scrollbar space

View File

@@ -0,0 +1,26 @@
module.exports = {
module: {
rules: [
{
test: /\.scss$/,
loader: 'postcss-loader',
options: {
ident: 'postcss',
syntax: 'postcss-scss',
plugins: () => [
// (ง ͠° ͟ʖ ͡°)ง
// !!!!WIRD WEGEN WEBPACK NICHT BENÖTIGT!!!!
// DIE IN DEN TUTORIALS HABEN DOCH KEINE AHNUNG
// require('postcss-import')({
// addModulesDirectories: ['node_modules'],
// path: ['apps/sales/src/scss'],
// skipDuplicates: false,
// }),
require('tailwindcss'),
require('autoprefixer'),
],
},
},
],
},
};

BIN
assets/icons.afdesign Normal file
View File

Binary file not shown.

954
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

View File

@@ -67,7 +67,7 @@
"ngx-infinite-scroll": "^7.2.0",
"ngx-perfect-scrollbar": "^7.2.1",
"ngx-toggle-switch": "^2.0.5",
"node-sass": "^4.12.0",
"node-sass": "^4.14.1",
"rxjs": "~6.6.3",
"scandit-sdk": "^4.1.1",
"scandit-sdk-angular": "^2.0.0",
@@ -79,6 +79,7 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^10.0.1",
"@angular-devkit/build-angular": "~0.1001.2",
"@angular-devkit/build-ng-packagr": "~0.1001.2",
"@angular/cli": "^10.1.2",
@@ -103,9 +104,12 @@
"ng-swagger-gen": "^1.5.0",
"ngrx-store-freeze": "^0.2.4",
"npm-run-all": "^4.1.5",
"postcss-loader": "^3.0.0",
"postcss-scss": "^2.1.1",
"prettier": "2.0.1",
"pretty-quick": "^2.0.1",
"protractor": "~7.0.0",
"tailwindcss": "^1.6.3",
"ts-node": "~7.0.0",
"tslint": "~6.1.0",
"typescript": "~4.0.3"

43
tailwind.config.js Normal file
View File

@@ -0,0 +1,43 @@
module.exports = {
purge: [],
theme: {
screens: {
tablet: '640px',
desktop: '1024px',
'desktop-l': '1280px',
'desktop-xl': '1680px',
},
zIndex: {
dropdown: 10,
sticky: 20,
fixed: 30,
modalBackdrop: 40,
modal: 50,
popover: 60,
tooltip: 70,
},
extend: {
maxWidth: {
content: '916px',
},
colors: {
brand: '#f70400',
// active: '#1f466c',
// inactive: '#3980c6',
// disabled: '#b0cce8',
customer: '#e6eff9',
'font-customer': '#557eb8',
'active-customer': '#1f466c',
'inactive-customer': '#9cbfe2',
'disabled-customer': '#d7e6f4',
branch: '#edeff0',
'font-branch': '#557eb8',
'active-branch': '#596470',
'inactive-branch': '#9ca5b0',
'disabled-branch': '#c6cbd2',
},
},
},
variants: {},
plugins: [],
};