diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less index c0863f3a..3c7a79af 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less @@ -50,26 +50,27 @@ .circle1{ position: relative; - top: 130px; + top: 200px; right: 25px; } .circle2{ position: relative; - top: 180px; + top: 400px; right: 25px; } .circle3{ + width: 135px; position: relative; - top: 175px; + top: 545px; right: 410px; } .circle4{ position: relative; - top: 60px; - right: 180px; + top: 585px; + right: 200px; } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less index b869d1b1..d32bebe1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less +++ b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less @@ -7,16 +7,24 @@ .@{modal}.estrazione-info { width: 1820px; height: 785px; - .specific { - justify-content: flex-end; -.box{ - background-color: #e5f3ff; -} -} + section.body{ + section{ + .specific { + justify-content: flex-end; + padding-left: 10px; + + .box{ + margin:0; + background-color: #e5f3ff; + } + } + } + + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less index ddd84787..acaa83b1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less +++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less @@ -10,83 +10,84 @@ width: 1820px; height: 980px; - section{ - - .specific{ - width: 470px; - @{pirometro-margin}:37%; - } - - .termospecific{ - @{pirometro-margin}:0%; - - .svg-area{ - padding-left: 90px; - width: 1270px; - height: 800px; - - .disegnoTermoSuperiore{ - flex-shrink: 0; - width: 1100px; - height: 750px; - } - - .border-termo-superiore{ - - .circle1{ - position: relative; - top: 135px; - right: 1150px; - } - - .circle2{ - position: relative; - top: 355px; - right: 1150px; - } - - .circle3{ - position: relative; - top: 425px; - right: 1150px; - } - - .circle4{ - position: relative; - top: 470px; - right: 635px; - } - - .circle5{ - position: relative; - top: 400px; - right: 255px; - } - - .circle6{ - width: 64px; - height: 20px; - color:white; - object-fit: contain; - background-color: #c03d58; - position: relative; - top: 95px; - right: 125px; - } - - } + section.body{ + + section{ + .specific{ + width: 470px; + @{pirometro-margin}:37%; } - button{ - margin-left: 5px; - width: 48px; - height: 48px; - object-fit: contain; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); - border: solid 1px #001e48; - background-image: linear-gradient(to bottom, #1756ad, #002680); + .termospecific{ + @{pirometro-margin}:0%; + + .svg-area{ + padding-left: 90px; + width: 1270px; + height: 800px; + + .disegnoTermoSuperiore{ + flex-shrink: 0; + width: 1100px; + height: 750px; + } + + .border-termo-superiore{ + + .circle1{ + position: relative; + top: 135px; + right: 1150px; + } + + .circle2{ + position: relative; + top: 355px; + right: 1150px; + } + + .circle3{ + position: relative; + top: 425px; + right: 1150px; + } + + .circle4{ + position: relative; + top: 470px; + right: 635px; + } + + .circle5{ + position: relative; + top: 400px; + right: 255px; + } + + .circle6{ + width: 100px; + background-color: #c03d58; + position: relative; + top: 87px; + right: 150px; + } + + } + + } + + button{ + margin-left: 5px; + width: 48px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #001e48; + background-image: linear-gradient(to bottom, #1756ad, #002680); + } + } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less index 07a8cc55..7dc7a3b9 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less +++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less @@ -57,19 +57,6 @@ .input-circles{ - span{ - object-fit: contain; - font-size: 22px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: white; - background-color: #979797; - } - .circle{ width: 147px; height: 60px; @@ -187,13 +174,13 @@ .circle-stampo-10{ position: relative; - bottom: 557px; + bottom: 560px; right: 769px; } .circle-stampo-11{ position: relative; - top: 38px; + top: 35px; right: 781px; } diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index 8bb94f45..039de21d 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -76,6 +76,19 @@ display: flex; flex-direction: column; + span{ + object-fit: contain; + font-size: 22px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + background-color: #979797; + } + .circle { width: 141px; height: 60px; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index c26d7bc4..c7db5ca9 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -3674,59 +3674,56 @@ width: 1820px; height: 980px; } -.modal.pirometro-info section .specific { +.modal.pirometro-info section.body section .specific { width: 470px; margin-left: 37%; } -.modal.pirometro-info section .termospecific { +.modal.pirometro-info section.body section .termospecific { margin-left: 0%; } -.modal.pirometro-info section .termospecific .svg-area { +.modal.pirometro-info section.body section .termospecific .svg-area { padding-left: 90px; width: 1270px; height: 800px; } -.modal.pirometro-info section .termospecific .svg-area .disegnoTermoSuperiore { +.modal.pirometro-info section.body section .termospecific .svg-area .disegnoTermoSuperiore { flex-shrink: 0; width: 1100px; height: 750px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle1 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle1 { position: relative; top: 135px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle2 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle2 { position: relative; top: 355px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle3 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle3 { position: relative; top: 425px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle4 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle4 { position: relative; top: 470px; right: 635px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle5 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle5 { position: relative; top: 400px; right: 255px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle6 { - width: 64px; - height: 20px; - color: white; - object-fit: contain; +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle6 { + width: 100px; background-color: #c03d58; position: relative; - top: 95px; - right: 125px; + top: 87px; + right: 150px; } -.modal.pirometro-info section .termospecific button { +.modal.pirometro-info section.body section .termospecific button { margin-left: 5px; width: 48px; height: 48px; @@ -4142,6 +4139,18 @@ display: flex; flex-direction: column; } +.setup .modal section.body section .specific .svg-area .input-circles span { + object-fit: contain; + font-size: 22px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + background-color: #979797; +} .setup .modal section.body section .specific .svg-area .input-circles .circle { width: 141px; height: 60px; @@ -4460,23 +4469,24 @@ } .modal.ciclo-info section .specific .svg-area .input-circles .circle1 { position: relative; - top: 130px; + top: 200px; right: 25px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle2 { position: relative; - top: 180px; + top: 400px; right: 25px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle3 { + width: 135px; position: relative; - top: 175px; + top: 545px; right: 410px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle4 { position: relative; - top: 60px; - right: 180px; + top: 585px; + right: 200px; } .modal.ciclo-info section .specific .box { margin-bottom: 10px; @@ -4765,18 +4775,6 @@ width: 1156px; height: 800px; } -.modal.quote-velocita-info section .specific .svg-area .input-circles span { - object-fit: contain; - font-size: 22px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: white; - background-color: #979797; -} .modal.quote-velocita-info section .specific .svg-area .input-circles .circle { width: 147px; height: 60px; @@ -4874,12 +4872,12 @@ } .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-10 { position: relative; - bottom: 557px; + bottom: 560px; right: 769px; } .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-11 { position: relative; - top: 38px; + top: 35px; right: 781px; } .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-1 { @@ -5002,10 +5000,12 @@ width: 1820px; height: 785px; } -.modal.estrazione-info .specific { +.modal.estrazione-info section.body section .specific { justify-content: flex-end; + padding-left: 10px; } -.modal.estrazione-info .specific .box { +.modal.estrazione-info section.body section .specific .box { + margin: 0; background-color: #e5f3ff; } .scheda .body { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts index 52cac898..7d90dad4 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts @@ -6,11 +6,11 @@ import {Prop} from 'vue-property-decorator'; export default class SVGCaricatore extends Vue{ @Prop({default:1600}) dxalto:number; - @Prop({default:0}) + @Prop({default:610}) dxbasso:number; - @Prop({default:0}) + @Prop({default:1030}) basso:number; - @Prop({default:0}) + @Prop({default:1360}) volante:number; minoreuguale:string="<="; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue index 6d2957e1..746e216d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue @@ -2,10 +2,10 @@