From 3f412e9e1798b14c8f842b41ceeb934f545e2606 Mon Sep 17 00:00:00 2001 From: Thermo_SIM Date: Sat, 20 Feb 2021 16:32:14 +0100 Subject: [PATCH] fix layout --- .../assets/icons/svg/slide-controstampo.svg | 18 +- .../assets/icons/svg/slide-cornice.svg | 34 +-- .../wwwroot/assets/icons/svg/slide-lastra.svg | 12 +- .../icons/svg/slide-piastra-riduzione.svg | 26 ++- .../wwwroot/assets/styles/base/riscaldi.less | 23 ++ Thermo.Active/wwwroot/assets/styles/style.css | 21 ++ .../assets/svg/disegno-piastra-riduzione.svg | 216 ++---------------- .../app_modules_thermo/components/index.ts | 7 +- .../formato/components/show-formato-info.ts | 14 +- .../formato/components/show-formato-info.vue | 22 +- .../components/controstampo.vue | 2 +- .../components/discesa-cornice.vue | 2 +- .../components/salita-stampo.vue | 2 +- .../components/base-components/resistance.ts | 52 ++--- .../components/base-components/resistance.vue | 9 +- 15 files changed, 181 insertions(+), 279 deletions(-) diff --git a/Thermo.Active/wwwroot/assets/icons/svg/slide-controstampo.svg b/Thermo.Active/wwwroot/assets/icons/svg/slide-controstampo.svg index dcb592c3..d2f99fab 100644 --- a/Thermo.Active/wwwroot/assets/icons/svg/slide-controstampo.svg +++ b/Thermo.Active/wwwroot/assets/icons/svg/slide-controstampo.svg @@ -1,7 +1,15 @@ - - - - - + + + + + + + + + + + + + diff --git a/Thermo.Active/wwwroot/assets/icons/svg/slide-cornice.svg b/Thermo.Active/wwwroot/assets/icons/svg/slide-cornice.svg index 9a0c3c75..6d98a8fb 100644 --- a/Thermo.Active/wwwroot/assets/icons/svg/slide-cornice.svg +++ b/Thermo.Active/wwwroot/assets/icons/svg/slide-cornice.svg @@ -1,15 +1,23 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/Thermo.Active/wwwroot/assets/icons/svg/slide-lastra.svg b/Thermo.Active/wwwroot/assets/icons/svg/slide-lastra.svg index 6246624e..f4fcd940 100644 --- a/Thermo.Active/wwwroot/assets/icons/svg/slide-lastra.svg +++ b/Thermo.Active/wwwroot/assets/icons/svg/slide-lastra.svg @@ -1,5 +1,11 @@ - - - + + + + + + + + + diff --git a/Thermo.Active/wwwroot/assets/icons/svg/slide-piastra-riduzione.svg b/Thermo.Active/wwwroot/assets/icons/svg/slide-piastra-riduzione.svg index 66130595..50bc1a55 100644 --- a/Thermo.Active/wwwroot/assets/icons/svg/slide-piastra-riduzione.svg +++ b/Thermo.Active/wwwroot/assets/icons/svg/slide-piastra-riduzione.svg @@ -1,11 +1,19 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less b/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less index 17b0594f..3cbf6d1b 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less +++ b/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less @@ -19,6 +19,23 @@ pointer-events: none; } + .subresselected{ + width: calc(100% - 4px); + height: calc(100% - 4px); + margin: 2px; + border-radius: 4px; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: black; + } + div{ + width: 100%; + height: 100% + } + .resistance { width: calc(100% - 4px); height: calc(100% - 4px); @@ -32,6 +49,12 @@ font-size: 32px; font-weight: bold; color: #fff; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + &.disabled { cursor: not-allowed; } diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 3d18afa6..1838f016 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4802,6 +4802,22 @@ article .box .body { .warmers svg .thermoImage { pointer-events: none; } +.warmers svg .subresselected { + width: calc(100% - 4px); + height: calc(100% - 4px); + margin: 2px; + border-radius: 4px; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: black; +} +.warmers svg div { + width: 100%; + height: 100%; +} .warmers svg .resistance { width: calc(100% - 4px); height: calc(100% - 4px); @@ -4815,6 +4831,11 @@ article .box .body { font-size: 32px; font-weight: bold; color: #fff; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } .warmers svg .resistance.disabled { cursor: not-allowed; diff --git a/Thermo.Active/wwwroot/assets/svg/disegno-piastra-riduzione.svg b/Thermo.Active/wwwroot/assets/svg/disegno-piastra-riduzione.svg index e8ba4403..3cd3fd31 100644 --- a/Thermo.Active/wwwroot/assets/svg/disegno-piastra-riduzione.svg +++ b/Thermo.Active/wwwroot/assets/svg/disegno-piastra-riduzione.svg @@ -1,197 +1,21 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts index fe9be64e..8c5dc458 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts @@ -15,14 +15,17 @@ export default { loadMore } +declare let $: any; Vue.directive('focusOn', { bind: function (el: HTMLElement, binding) { el.addEventListener('click', (ev) => { let element = document.getElementById(binding.arg) as HTMLElement; if (element) { - element.scrollIntoView({ behavior: "smooth", block: "center", inline: "nearest" }); - element.focus(); + var topPos = element.offsetTop; + $("aside#formato").animate({ scrollTop: topPos }, 200, 'swing', function() { + element.focus(); + }); } }) } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts index 407a8570..57f6d7aa 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts @@ -21,6 +21,7 @@ import { Deferred } from "@/services"; import { recipeService } from "@/services/recipeService"; import { debounce } from "@/_base/debounce"; +declare let $: any; @Component({ components: { modal: Modal, @@ -110,7 +111,18 @@ export default class ShowFormatoInfo extends Vue { takeScreenshot() { messageService.publishToChannel("take-screenshot"); -} + } + + clickSection(key){ + this.show = key; + + var myElement = document.getElementById("view-" + key); + if(myElement) + { + var topPos = myElement.offsetTop; + $("aside#formato").scrollTop(topPos); + } + } async conferma() { // recipeActions.setCurrent(store, this.recipe); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue index 09a47009..0978416a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue @@ -10,12 +10,12 @@
-
@@ -45,27 +45,27 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue index a8d1ca00..8742ddc3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue @@ -1,6 +1,6 @@