Skip to content

Commit

Permalink
Fixed images and layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrej committed Sep 23, 2023
1 parent 75146a5 commit 35ac60a
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 47 deletions.
42 changes: 21 additions & 21 deletions product-configurator/.pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion product-configurator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@rollup/plugin-node-resolve": "^15.2.1",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"eslint": "^8.49.0",
"eslint": "^8.50.0",
"eslint-plugin-lit": "^1.9.1",
"eslint-plugin-wc": "^2.0.3",
"ts-lit-plugin": "^1.2.1",
Expand Down
Binary file modified product-configurator/public/images/wallet_test/Background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified product-configurator/public/images/wallet_test/Layer1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified product-configurator/public/images/wallet_test/Layer2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 7 additions & 15 deletions product-configurator/src/components/ProductConfigurator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,8 @@ export class ProductConfigurator extends LitElement {
<style>
.configurator {
padding: 0.5rem;
border: 1px solid lightgray;
width: 100%,
height: 100%,
/* min-width: 10rem;
min-height: 20rem; */
/* width: 100vw; */
/* height: 100vh; */
display: flex;
flex-direction: column;>
flex-direction: column;
align-items: center;
}
Expand All @@ -202,8 +195,8 @@ export class ProductConfigurator extends LitElement {
.image-container {
position: relative;
/* width: 40rem; */
height: 40rem;
width: 100%;
height: 85vh;
background-image: url("${this.imageFolder}/Background.png");
background-repeat: no-repeat;
background-position: center;
Expand Down Expand Up @@ -242,8 +235,8 @@ export class ProductConfigurator extends LitElement {
mask-image: url("${this.imageFolder}/Layer1.png");
-webkit-mask-image: url("${this.imageFolder}/Layer1.png");
mix-blend-mode: ${this.getMixMode(
this.getActiveColorByLayer(0)
)};
this.getActiveColorByLayer(0)
)};
}
.layer2-image {
Expand All @@ -252,8 +245,8 @@ export class ProductConfigurator extends LitElement {
mask-image: url("${this.imageFolder}/Layer2.png");
-webkit-mask-image: url("${this.imageFolder}/Layer2.png");
mix-blend-mode: ${this.getMixMode(
this.getActiveColorByLayer(1)
)};
this.getActiveColorByLayer(1)
)};
}
</style>
Expand All @@ -268,7 +261,6 @@ export class ProductConfigurator extends LitElement {
${this.materialData.materials.map(
(entry: Material[], layerIndex: number) =>
this.colorRowTemplate(layerIndex, entry)
// console.log("ROW");
)}
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions product-configurator/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ __metadata:
languageName: node
linkType: hard

"@eslint/js@npm:8.49.0":
version: 8.49.0
resolution: "@eslint/js@npm:8.49.0"
checksum: a6601807c8aeeefe866926ad92ed98007c034a735af20ff709009e39ad1337474243d47908500a3bde04e37bfba16bcf1d3452417f962e1345bc8756edd6b830
"@eslint/js@npm:8.50.0":
version: 8.50.0
resolution: "@eslint/js@npm:8.50.0"
checksum: 302478f2acaaa7228729ec6a04f56641590185e1d8cd1c836a6db8a6b8009f80a57349341be9fbb9aa1721a7a569d1be3ffc598a33300d22816f11832095386c
languageName: node
linkType: hard

Expand Down Expand Up @@ -1281,14 +1281,14 @@ __metadata:
languageName: node
linkType: hard

"eslint@npm:^8.49.0":
version: 8.49.0
resolution: "eslint@npm:8.49.0"
"eslint@npm:^8.50.0":
version: 8.50.0
resolution: "eslint@npm:8.50.0"
dependencies:
"@eslint-community/eslint-utils": ^4.2.0
"@eslint-community/regexpp": ^4.6.1
"@eslint/eslintrc": ^2.1.2
"@eslint/js": 8.49.0
"@eslint/js": 8.50.0
"@humanwhocodes/config-array": ^0.11.11
"@humanwhocodes/module-importer": ^1.0.1
"@nodelib/fs.walk": ^1.2.8
Expand Down Expand Up @@ -1324,7 +1324,7 @@ __metadata:
text-table: ^0.2.0
bin:
eslint: bin/eslint.js
checksum: 4dfe257e1e42da2f9da872b05aaaf99b0f5aa022c1a91eee8f2af1ab72651b596366320c575ccd4e0469f7b4c97aff5bb85ae3323ebd6a293c3faef4028b0d81
checksum: 9ebfe5615dc84700000d218e32ddfdcfc227ca600f65f18e5541ec34f8902a00356a9a8804d9468fd6c8637a5ef6a3897291dad91ba6579d5b32ffeae5e31768
languageName: node
linkType: hard

Expand Down Expand Up @@ -2928,7 +2928,7 @@ __metadata:
"@rollup/plugin-node-resolve": ^15.2.1
"@typescript-eslint/eslint-plugin": ^6.7.2
"@typescript-eslint/parser": ^6.7.2
eslint: ^8.49.0
eslint: ^8.50.0
eslint-plugin-lit: ^1.9.1
eslint-plugin-wc: ^2.0.3
lit: ^2.8.0
Expand Down

0 comments on commit 35ac60a

Please sign in to comment.