diff --git a/Thermo.Active/wwwroot/assets/styles/style.less b/Thermo.Active/wwwroot/assets/styles/style.less index fd4c25e8..a4c2ca3f 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.less +++ b/Thermo.Active/wwwroot/assets/styles/style.less @@ -1,10 +1,11 @@ +// math: always @import url(../../libs/font-awesome/css/font-awesome.css); @import url(../../libs/glyphicons/styles/glyphicons.css); @import "base/layout.less"; @import "iziToast.min.css"; body { - font-family: 'Work Sans', sans-serif; + font-family: "Work Sans", sans-serif; } .t-loading { @@ -21,7 +22,6 @@ body { top: 80px; } - .iziToast { background-color: @color-white2; border-color: @color-white2; @@ -44,7 +44,7 @@ body { background-color: @color-scarlet; } -.iziToast>.iziToast-progressbar { +.iziToast > .iziToast-progressbar { background-color: rgba(255, 255, 255, 0.6); } @@ -59,7 +59,6 @@ body { margin-top: 60px; } - .login-form .login-avatar { height: 88px; width: 88px; @@ -75,4 +74,4 @@ body { font-family: Arial, sans-serif; font-weight: bold; text-transform: uppercase; -} \ No newline at end of file +} diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index 75f97ae3..58460cb5 100644 --- a/Thermo.Active/wwwroot/config.development.json +++ b/Thermo.Active/wwwroot/config.development.json @@ -2,7 +2,7 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://95.236.130.105:9000/" + "apiServerUrl": "http://seriate.steamware.net:9000/" }, "allUIVisible": false } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html index 6966f3ba..f018a3b8 100644 --- a/Thermo.Active/wwwroot/index.html +++ b/Thermo.Active/wwwroot/index.html @@ -13,7 +13,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/App.vue b/Thermo.Active/wwwroot/src/App.vue index 054a780b..9166aec2 100644 --- a/Thermo.Active/wwwroot/src/App.vue +++ b/Thermo.Active/wwwroot/src/App.vue @@ -23,17 +23,14 @@ -
- - +
+ +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less index b172d8df..8dd0121b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less @@ -1,9 +1,5 @@ @import "../../../../variable.less"; -span { - display: inline-block; -} - .log-assi-table { width: 1384px; height: 886px; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less index 2e1f861e..ea8d48d5 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.less @@ -1,7 +1,5 @@ @import "../../../variable.less"; -span { - display: inline-block; -} + .column-page-header { width: 672px; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts index 7afce795..893e02e3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts @@ -23,4 +23,8 @@ export default class IO extends Vue { return store.state.underTheHood.ioChannelsConfig; } + scrollto(key) { + document.getElementById(key).scrollIntoView(); + } + } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue index e90fdb5d..3c39ae32 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue @@ -6,6 +6,7 @@ Pinned