From cd20b0f1179237c6d737652312309e14f4150693 Mon Sep 17 00:00:00 2001 From: Alessio Date: Thu, 23 Apr 2020 08:53:04 +0200 Subject: [PATCH 01/50] fix css opzioni di lavorazione modal --- .../wwwroot/assets/styles/base/opzioni.less | 50 ++++++++++--------- .../wwwroot/assets/styles/base/setup.less | 1 + Thermo.Active/wwwroot/assets/styles/style.css | 19 +++---- .../components/sottosquadra-stampo.vue | 4 +- .../opzioni/components/termoregolatori.vue | 4 +- .../setup/opzioni/show-opzioni-info.vue | 6 +-- 6 files changed, 45 insertions(+), 39 deletions(-) diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less index 8259cb30..7eed4148 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less +++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less @@ -15,8 +15,10 @@ margin: 0; } - .section{ - display: flex; + section.body{ + + section{ + padding: 0px; .specific{ @@ -60,31 +62,33 @@ } - } - - aside{ + aside{ - button{ - display: block; - background-color: #bbbcbc; - color: #002680; - padding: 22px 16px; - margin: 2px 0; - width: 547px; - height: 70px; - border: none; - text-align: left; - cursor: pointer; - font-size: 17px; - } + button{ + display: block; + background-color: #bbbcbc; + color: #002680; + padding: 22px 16px; + margin: 2px 0; + width: 547px; + height: 70px; + border: none; + text-align: left; + cursor: pointer; + font-size: 17px; + } + + .active{ + background-color: #fff; + font-weight: bold; + border-top: 2px solid #002680; + } - .active{ - background-color: #fff; - font-weight: bold; - border-top: 2px solid #002680; } } -} + } + + } diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index 5ee37eb3..59037aef 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -41,6 +41,7 @@ .auto{ overflow-y: auto; + overflow-x: hidden; } aside { diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 9802d2cd..6af7709c 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4111,6 +4111,7 @@ } .setup .modal section.body section .auto { overflow-y: auto; + overflow-x: hidden; } .setup .modal section.body section aside { display: flex; @@ -4876,17 +4877,17 @@ background-color: #979797; margin: 0; } -.modal.opzioni-info .section { - display: flex; +.modal.opzioni-info section.body section { + padding: 0px; } -.modal.opzioni-info .section .specific:last-of-type { +.modal.opzioni-info section.body section .specific:last-of-type { margin-left: 100px; width: 471px; } -.modal.opzioni-info .section .specific:first-of-type .box-color { +.modal.opzioni-info section.body section .specific:first-of-type .box-color { background-color: #ffffff; } -.modal.opzioni-info .section .specific:first-of-type button { +.modal.opzioni-info section.body section .specific:first-of-type button { background-color: #dddddd; display: block; color: #000000; @@ -4898,17 +4899,17 @@ cursor: pointer; font-size: 17px; } -.modal.opzioni-info .section .specific:first-of-type .active { +.modal.opzioni-info section.body section .specific:first-of-type .active { background-color: rgba(23, 145, 255, 0.75); color: #ffffff; } -.modal.opzioni-info .section .specific:first-of-type label { +.modal.opzioni-info section.body section .specific:first-of-type label { font-size: 14px; width: 60px; margin-left: 5px; margin-right: 30px; } -.modal.opzioni-info aside button { +.modal.opzioni-info section.body section aside button { display: block; background-color: #bbbcbc; color: #002680; @@ -4921,7 +4922,7 @@ cursor: pointer; font-size: 17px; } -.modal.opzioni-info aside .active { +.modal.opzioni-info section.body section aside .active { background-color: #fff; font-weight: bold; border-top: 2px solid #002680; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue index ba56e914..88523abc 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue index 2c68e051..c3020ee0 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue index b37545b9..9ab47572 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue @@ -6,8 +6,8 @@ -
-
+