summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Lysak <v.lysak@dunice.net>2022-08-29 17:45:35 +0300
committerVitalii Lysak <v.lysak@dunice.net>2022-08-29 17:45:35 +0300
commit7bbec9daea219689c6c86d041eb20e7101a43519 (patch)
tree34c1c05cfdfd4035a9cc28d3fc39d0e096ced497
parent214d4d58742478b1e9ad3d0549568a92114179b8 (diff)
parentb721c462f29fc7d607c17ae8467092ef073345c4 (diff)
downloadwebui-vue-7bbec9daea219689c6c86d041eb20e7101a43519.tar.xz
Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila
-rw-r--r--src/assets/styles/bmc/_sila/_forms.scss3
-rw-r--r--src/components/_sila/Global/Chart.vue1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss
index 18236593..f993804f 100644
--- a/src/assets/styles/bmc/_sila/_forms.scss
+++ b/src/assets/styles/bmc/_sila/_forms.scss
@@ -92,6 +92,9 @@ div:not(.search-global) > .form-group {
}
}
}
+.b-form-datepicker label {
+ margin-left: 0px !important;
+}
.custom-select,
.form-control,
diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue
index f6c389f8..f09d676f 100644
--- a/src/components/_sila/Global/Chart.vue
+++ b/src/components/_sila/Global/Chart.vue
@@ -131,6 +131,7 @@ export default {
margin: [52, 50, 32, 60],
height: '360px',
zoomType: 'xy',
+ animation: true,
resetZoomButton: {
position: {
x: 0,