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

animation fix

Browse Source
This commit is contained in:
Paolo Possanzini
2018-02-09 15:07:32 +01:00
parent 5947e5a8bb
commit 5540cf74ea
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/alarms.less
+6 -2
View File
@@ -37,7 +37,9 @@
padding-right: 24px;
padding-left: 24px;
min-width: calc(~"100% - 48px");
transition: margin-left 200ms ease-in-out 200ms;
// transition: margin-left 200ms ease-in-out 200ms;
transition: margin-left 200ms ease-in-out;
&.collapsed {
margin-left: -100%;
}
@@ -50,7 +52,9 @@
height: 50px;
margin-bottom: 12px;
width: calc(~"100% - 72px");
transition: margin-left 200ms ease-in-out 200ms;
transition: margin-left 200ms ease-in-out;
// transition: margin-left 200ms ease-in-out 200ms;
&.collapsed {
margin-left: -100%;
}
Step/wwwroot/assets/styles/style.css
+2 -2
View File
@@ -907,7 +907,7 @@ footer .container button:not([disabled]).big:before {
padding-right: 24px;
padding-left: 24px;
min-width: calc(100% - 48px);
transition: margin-left 200ms ease-in-out 200ms;
transition: margin-left 200ms ease-in-out;
}
#alarm-list > .content.collapsed,
#service-list > .content.collapsed {
@@ -923,7 +923,7 @@ footer .container button:not([disabled]).big:before {
height: 50px;
margin-bottom: 12px;
width: calc(100% - 72px);
transition: margin-left 200ms ease-in-out 200ms;
transition: margin-left 200ms ease-in-out;
}
#alarm-list > .content > .general-buttons.collapsed,
#service-list > .content > .general-buttons.collapsed {
Step/wwwroot/dist/build.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Step/wwwroot/src/store/machineStatus.store.ts
+12 -10
View File
@@ -25,7 +25,7 @@ export interface MachineStatusModel {
areasConfiguration: Array<AreaModel>
}
export interface buttonStatus{
export interface buttonStatus {
Active: boolean,
Clickable: boolean,
Id: number
@@ -50,19 +50,21 @@ export interface MachineStatusActions {
export const machineStatusStore = {
state: {
powerOnAlarm: { Active: false, Clickable: false, Id:null },
airPressureAlarm: { Active: false, Clickable: false, Id:null },
protectionsAlarm: { Active: false, Clickable: false, Id:null },
emergencyAlarm: { Active: false, Clickable: false, Id:null },
settingsModeAlarm: { Active: false, Clickable: false, Id:null },
keyReadyAlarm: { Active: false, Clickable: false, Id:null },
powerOnAlarm: { Active: false, Clickable: false, Id: null },
airPressureAlarm: { Active: false, Clickable: false, Id: null },
protectionsAlarm: { Active: false, Clickable: false, Id: null },
emergencyAlarm: { Active: false, Clickable: false, Id: null },
settingsModeAlarm: { Active: false, Clickable: false, Id: null },
keyReadyAlarm: { Active: false, Clickable: false, Id: null },
resetAxesAlarm: { Active: false, Clickable: false, Id:null },
waterJet1Alarm: { Active: false, Clickable: false, Id:null },
waterJet2Alarm: { Active: false, Clickable: false, Id:null },
resetAxesAlarm: { Active: false, Clickable: false, Id: null },
waterJet1Alarm: { Active: false, Clickable: false, Id: null },
waterJet2Alarm: { Active: false, Clickable: false, Id: null },
ncReady: false,
_functions: new Map<number, signalr_process.ProcessData>(),
functions: [],
areasConfiguration: []
} as MachineStatusModel,