From b40503b28db90f4e7603f4b705af7ff139d9fb07 Mon Sep 17 00:00:00 2001 From: Nicola Carminati Date: Thu, 12 Apr 2018 12:41:26 +0200 Subject: [PATCH] Fix ui Styles --- Step.Utils/languages/IT.xml | 2 +- Step.Utils/languages/en.xml | 2 +- Step/wwwroot/assets/styles/base/header.less | 3 +++ Step/wwwroot/assets/styles/base/ribbons.less | 1 + Step/wwwroot/assets/styles/style.css | 4 ++++ Step/wwwroot/src/modules/app-header.vue | 16 ++++++++-------- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index a779dc09..07baf0d1 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -22,7 +22,7 @@ Warning Ci sono %d warning attivi Stato - Procedura guidata + Procedura ripristino Risoluzione dell'allarme Avvia Vedi Manuale diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index 9b466e1a..561a5ab9 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -22,7 +22,7 @@ Warning There are %d active warnings Status - Wizard + Restore procedure Alarm resolution Start Show Manual diff --git a/Step/wwwroot/assets/styles/base/header.less b/Step/wwwroot/assets/styles/base/header.less index c407fde0..03953402 100644 --- a/Step/wwwroot/assets/styles/base/header.less +++ b/Step/wwwroot/assets/styles/base/header.less @@ -74,6 +74,9 @@ width: @header-button-size; // background-image: url(../profile.png); // background-size: cover; } + button.unclickable { + cursor: default; + } &.turn-up .user-info time { color: #fff; } diff --git a/Step/wwwroot/assets/styles/base/ribbons.less b/Step/wwwroot/assets/styles/base/ribbons.less index 85042e8c..e4569bca 100644 --- a/Step/wwwroot/assets/styles/base/ribbons.less +++ b/Step/wwwroot/assets/styles/base/ribbons.less @@ -48,6 +48,7 @@ height: 100%; width: 100%; margin: 0px; + white-space: nowrap; .content { display: flex; flex-flow: column; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index bdd8f572..5cbd2bcb 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -661,6 +661,9 @@ fieldset[disabled] .form-group.is-focused .togglebutton label { #app > header button.profile { width: 44px; } +#app > header button.unclickable { + cursor: default; +} #app > header.turn-up .user-info time { color: #fff; } @@ -780,6 +783,7 @@ fieldset[disabled] .form-group.is-focused .togglebutton label { height: 100%; width: 100%; margin: 0px; + white-space: nowrap; } .ribbon-container .app-ribbon .status-content .content { display: flex; diff --git a/Step/wwwroot/src/modules/app-header.vue b/Step/wwwroot/src/modules/app-header.vue index bd90f699..c72c1e3e 100644 --- a/Step/wwwroot/src/modules/app-header.vue +++ b/Step/wwwroot/src/modules/app-header.vue @@ -25,28 +25,28 @@ - - - - - - - -