summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Zakharov <m.zakharov@IBS.RU>2022-07-22 14:44:47 +0300
committerMaksim Zakharov <m.zakharov@IBS.RU>2022-07-22 14:44:47 +0300
commitb9aa6bae1deeb200791fab52760b70eedfcb04f5 (patch)
treeaded5d1c3278ecf5feb5475bc6607e4023a4a96d
parent72522a38bc5125cb8eef41636237ef55ad842bf4 (diff)
downloadwebui-vue-processor-chart.tar.xz
-rw-r--r--src/assets/styles/bmc/_sila/_section-divider.scss17
-rw-r--r--src/components/_sila/Global/Collapse.vue6
-rw-r--r--src/components/_sila/Global/PageTitle.vue2
-rw-r--r--src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue14
4 files changed, 27 insertions, 12 deletions
diff --git a/src/assets/styles/bmc/_sila/_section-divider.scss b/src/assets/styles/bmc/_sila/_section-divider.scss
index bca2d77e..3c5ce71f 100644
--- a/src/assets/styles/bmc/_sila/_section-divider.scss
+++ b/src/assets/styles/bmc/_sila/_section-divider.scss
@@ -1,3 +1,20 @@
.section-divider {
border-bottom: 1px solid gray('400');
}
+
+.custom-collapse {
+ margin: 0 -1.95rem 0 -2rem;
+ @include media-breakpoint-down(md) {
+ margin-left: -0.95rem;
+ }
+ .page-section {
+ margin-left: 2rem;
+ margin-right: 2rem;
+ @include media-breakpoint-down(md) {
+ margin-left: 2rem;
+ }
+ }
+ .form-group {
+ margin-bottom: 0;
+ }
+}
diff --git a/src/components/_sila/Global/Collapse.vue b/src/components/_sila/Global/Collapse.vue
index ac7eb467..141da639 100644
--- a/src/components/_sila/Global/Collapse.vue
+++ b/src/components/_sila/Global/Collapse.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div class="custom-collapse">
<b-button
v-b-toggle="id"
variant="collapse"
@@ -10,9 +10,7 @@
<component :is="iconChevronUp" class="icon-expand" />
</b-button>
<b-collapse :id="id" class="nav-item__nav">
- <slot
- style="margin-top 2rem; margin-left: 2rem; margin-right: 2 rem;"
- ></slot>
+ <slot></slot>
</b-collapse>
</div>
</template>
diff --git a/src/components/_sila/Global/PageTitle.vue b/src/components/_sila/Global/PageTitle.vue
index 8dddc748..6f02ed8d 100644
--- a/src/components/_sila/Global/PageTitle.vue
+++ b/src/components/_sila/Global/PageTitle.vue
@@ -33,6 +33,6 @@ p {
}
.line {
border-bottom: 1px solid $gray-10;
- margin: $spacer (-$spacer * 2) 0 (-$spacer * 2);
+ margin: $spacer (-$spacer * 1.95) 0 (-$spacer * 2);
}
</style>
diff --git a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue
index 2a0f5ee5..6f30576a 100644
--- a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue
+++ b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue
@@ -1,28 +1,28 @@
<template>
<b-container fluid="xl">
<page-title :description="$t('appPageTitle.dynamicInformation')" />
- <collapse id="collapse_1" title="Температра">
+ <collapse id="collapse_1" title="Температра" style="margin-top: -2rem">
<template #image>
<img src="@/assets/images/_sila/collapsed/temperature.svg" />
</template>
- <page-section section-title="Заголовок секции" style="">
- <b-row>
- <b-col sm="6" md="3">
+ <page-section>
+ <b-row class="align-items-end pt-2">
+ <b-col sm="12" md="6" lg="3">
<b-form-group label="Не штатный режим">
<b-form-input> </b-form-input>
</b-form-group>
</b-col>
- <b-col sm="6" md="3">
+ <b-col sm="12" md="6" lg="3">
<b-form-group label="Критический режим">
<b-form-input> </b-form-input>
</b-form-group>
</b-col>
- <b-col sm="6" md="3">
+ <b-col sm="12" md="6" lg="3">
<b-form-group label="Значение предупреждения">
<b-form-input> </b-form-input>
</b-form-group>
</b-col>
- <b-col sm="6" md="3">
+ <b-col sm="12" md="6" lg="3">
<b-button variant="primary">
{{ 'Сохранить' }}
</b-button>