From 894765881b88a5698eeb1637d4fd9c6dddbc5cac Mon Sep 17 00:00:00 2001 From: Paolo Possanzini Date: Thu, 5 Apr 2018 10:14:21 +0200 Subject: [PATCH] fix backdrop --- Step.Config/Config/userSoftKeyConfig.xml | 323 +++++++++++++++++- .../assets/styles/base/plc-softkeys.less | 54 +-- Step/wwwroot/assets/styles/style.css | 27 -- 3 files changed, 332 insertions(+), 72 deletions(-) diff --git a/Step.Config/Config/userSoftKeyConfig.xml b/Step.Config/Config/userSoftKeyConfig.xml index 3090fb10..7789f8eb 100644 --- a/Step.Config/Config/userSoftKeyConfig.xml +++ b/Step.Config/Config/userSoftKeyConfig.xml @@ -3,7 +3,7 @@ true 1 - false + true 1 Test @@ -23,7 +23,7 @@ true 1 - false + true Test Ita @@ -95,14 +95,16 @@ 1 - 1 - 1 - 1 + 2 + 3 + 4 + 5 + 6 true - 2 + 3 false Test @@ -110,32 +112,32 @@ 1 - 1 - 1 - 1 - 1 + 2 + 3 + 4 + 5 true - 2 + 3 false Test Ita - 1 - 1 - 1 - 1 - 1 - 1 + A + B + C + D + E + V true - 1 + 3 true 1 @@ -143,4 +145,289 @@ Ita + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + false + + Test + Ita + + + A + B + C + D + E + V + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + true + 1 + + Test + Ita + + + + true + 3 + false + + Test + Ita + + + A + B + C + D + E + V + + + \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/base/plc-softkeys.less b/Step/wwwroot/assets/styles/base/plc-softkeys.less index e5f9dbfe..dbcb442f 100644 --- a/Step/wwwroot/assets/styles/base/plc-softkeys.less +++ b/Step/wwwroot/assets/styles/base/plc-softkeys.less @@ -31,30 +31,30 @@ right: 0; bottom: 0; } - .softkeys-backdrop-top { - top: 0; - left: 0; - width: 100%; - height: 108px; - } - .softkeys-backdrop-left { - top: 108px; - left: 0; - bottom: 16px; - width: 4px; - } - .softkeys-backdrop-right { - top: 108px; - right: 0; - bottom: 16px; - width: 24px; - } - .softkeys-backdrop-bottom { - bottom: 0; - left: 0; - width: 100%; - height: 16px; - } + // .softkeys-backdrop-top { + // top: 0; + // left: 0; + // width: 100%; + // height: 108px; + // } + // .softkeys-backdrop-left { + // top: 108px; + // left: 0; + // bottom: 16px; + // width: 4px; + // } + // .softkeys-backdrop-right { + // top: 108px; + // right: 0; + // bottom: 16px; + // width: 24px; + // } + // .softkeys-backdrop-bottom { + // bottom: 0; + // left: 0; + // width: 100%; + // height: 16px; + // } &>div.waiting::after { content: ""; display: block; @@ -148,7 +148,7 @@ overflow: hidden; overflow-y: scroll; margin-right: 8px; // position: relative; - transform: translateZ(0); + // transform: translateZ(0); } } @@ -315,7 +315,7 @@ margin-top: -1px; height: 46px; overflow-x: visible; - transform: translateZ(0); + // transform: translateZ(0); &.description { cursor: pointer; margin-top: 0; @@ -462,7 +462,7 @@ display: flex; justify-content: center; z-index: 100; - transform: translateZ(0); + // transform: translateZ(0); .menu { background-color: #4b4b4b; padding: 7px; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index a6a2ecb7..bd537ad3 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -1508,30 +1508,6 @@ footer .container button.big:before { right: 0; bottom: 0; } -#plc-softkeys-container .softkeys-backdrop-top { - top: 0; - left: 0; - width: 100%; - height: 108px; -} -#plc-softkeys-container .softkeys-backdrop-left { - top: 108px; - left: 0; - bottom: 16px; - width: 4px; -} -#plc-softkeys-container .softkeys-backdrop-right { - top: 108px; - right: 0; - bottom: 16px; - width: 24px; -} -#plc-softkeys-container .softkeys-backdrop-bottom { - bottom: 0; - left: 0; - width: 100%; - height: 16px; -} #plc-softkeys-container > div.waiting::after { content: ""; display: block; @@ -1625,7 +1601,6 @@ footer .container button.big:before { overflow: hidden; overflow-y: scroll; margin-right: 8px; - transform: translateZ(0); } .soft-key { position: relative; @@ -1785,7 +1760,6 @@ footer .container button.big:before { margin-top: -1px; height: 46px; overflow-x: visible; - transform: translateZ(0); } .soft-key .detail section.description { cursor: pointer; @@ -1937,7 +1911,6 @@ footer .container button.big:before { display: flex; justify-content: center; z-index: 100; - transform: translateZ(0); } .jog-menu .axes-menu-container .menu, .auto-menu .axes-menu-container .menu,