Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ui Styles

Browse Source
This commit is contained in:
Nicola Carminati
2018-04-12 12:41:26 +02:00
parent de2ec2da7d
commit b40503b28d
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Utils/languages/IT.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<warning_ribbon_title_1_item>Warning</warning_ribbon_title_1_item>
<warning_ribbon_title_more_items>Ci sono %d warning attivi</warning_ribbon_title_more_items>
<alarm_detail_lbl_status>Stato</alarm_detail_lbl_status>
<alarm_manual_lbl_title>Procedura guidata</alarm_manual_lbl_title>
<alarm_manual_lbl_title>Procedura ripristino</alarm_manual_lbl_title>
<alarm_manual_lbl_description>Risoluzione dell'allarme</alarm_manual_lbl_description>
<alarm_manual_btn_start>Avvia</alarm_manual_btn_start>
<alarm_detail_btn_show_manual>Vedi Manuale</alarm_detail_btn_show_manual>
Step.Utils/languages/en.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<warning_ribbon_title_1_item>Warning</warning_ribbon_title_1_item>
<warning_ribbon_title_more_items>There are %d active warnings</warning_ribbon_title_more_items>
<alarm_detail_lbl_status>Status</alarm_detail_lbl_status>
<alarm_manual_lbl_title>Wizard</alarm_manual_lbl_title>
<alarm_manual_lbl_title>Restore procedure</alarm_manual_lbl_title>
<alarm_manual_lbl_description>Alarm resolution</alarm_manual_lbl_description>
<alarm_manual_btn_start>Start</alarm_manual_btn_start>
<alarm_detail_btn_show_manual>Show Manual</alarm_detail_btn_show_manual>
Step/wwwroot/assets/styles/base/header.less
+3
View File
@@ -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;
}
Step/wwwroot/assets/styles/base/ribbons.less
+1
View File
@@ -48,6 +48,7 @@
height: 100%;
width: 100%;
margin: 0px;
white-space: nowrap;
.content {
display: flex;
flex-flow: column;
Step/wwwroot/assets/styles/style.css
+4
View File
@@ -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;
Step/wwwroot/src/modules/app-header.vue
+8 -8
View File
@@ -25,28 +25,28 @@
</div>
</app-ribbon>
<button :class="{ red: mainStatus, blue: !mainStatus }">
<button class="unclickable" :class="{ red: mainStatus, blue: !mainStatus }">
<img class="h-24" src="assets/icons/png/switch-icon@2x.png">
</button>
<button class="power-on" :disabled="!state.powerOnAlarm.clickable || checkSecurityDisabled('startupIcons')"
<button class="power-on unclickable" :disabled="!state.powerOnAlarm.clickable || checkSecurityDisabled('startupIcons')"
v-if="state.powerOnAlarm && state.powerOnAlarm.active" @click="manageClick(state.powerOnAlarm)"><img src="assets/icons/png/control-icon-error@2x.png"></button>
<button class="airflow" :disabled="!state.airPressureAlarm.clickable || checkSecurityDisabled('startupIcons')"
<button class="airflow unclickable" :disabled="!state.airPressureAlarm.clickable || checkSecurityDisabled('startupIcons')"
v-if="state.airPressureAlarm && state.airPressureAlarm.active" @click="manageClick(state.airPressureAlarm)"><img src="assets/icons/png/air-icon@2x.png"></button>
<button class="protections" :disabled="!state.protectionsAlarm.clickable || checkSecurityDisabled('startupIcons')"
<button class="protections unclickable" :disabled="!state.protectionsAlarm.clickable || checkSecurityDisabled('startupIcons')"
v-if="state.protectionsAlarm && state.protectionsAlarm.active" @click="manageClick(state.protectionsAlarm)"><img src="assets/icons/png/lock-icon-error@2x.png"></button>
<button class="emergency" :disabled="!state.emergencyAlarm.clickable || checkSecurityDisabled('startupIcons')"
<button class="emergency unclickable" :disabled="!state.emergencyAlarm.clickable || checkSecurityDisabled('startupIcons')"
v-if="state.emergencyAlarm && state.emergencyAlarm.active" @click="manageClick(state.emergencyAlarm)"><img src="assets/icons/png/refresh-icon-error@2x.png"></button>
<button class="settings-mode" :disabled="!state.settingsModeAlarm.clickable || checkSecurityDisabled('startupIcons')"
<button class="settings-mode unclickable" :disabled="!state.settingsModeAlarm.clickable || checkSecurityDisabled('startupIcons')"
v-if="state.settingsModeAlarm && state.settingsModeAlarm.active" @click="manageClick(state.settingsModeAlarm)"><img src="assets/icons/png/no-settings@2x.png"></button>
<button class="key" :disabled="!state.keyReadyAlarm.clickable || checkSecurityDisabled('startupIcons')"
<button class="key unclickable" :disabled="!state.keyReadyAlarm.clickable || checkSecurityDisabled('startupIcons')"
v-if="state.keyReadyAlarm && state.keyReadyAlarm.active" @click="manageClick(state.keyReadyAlarm)"><img src="assets/icons/png/key-icon-error@2x.png"></button>
<button :class="{ red: powerOnStatus, blue: !powerOnStatus }">
<button class="unclickable" :class="{ red: powerOnStatus, blue: !powerOnStatus }">
<img src="assets/icons/png/ok-white.png" class="h-20" v-if="!powerOnStatus">
<img src="assets/icons/png/not-ok-white.png" class="h-20" v-if="powerOnStatus">
</button>