diff options
Diffstat (limited to 'src/views')
9 files changed, 57 insertions, 73 deletions
diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue index f8dbcca2..b597db8a 100644 --- a/src/views/_sila/Fans/Dynamic/FanSpeed.vue +++ b/src/views/_sila/Fans/Dynamic/FanSpeed.vue @@ -1,13 +1,10 @@ <template> - <div class="custom-divider" style="margin-top: 0"> - <b-button - variant="collapse" - class="d-flex flex-nowrap justify-content-start" - > + <div> + <b-col class="d-flex flex-nowrap align-items-center page-divider"> <img src="@/assets/images/_sila/collapsed/fan.svg" /> {{ $t('pageFans.speed') }} - </b-button> - <b-row class="align-items-end p-4"> + </b-col> + <b-row class="align-items-end limit-container"> <b-col xs="12" md="4" class="pt-2"> <b-form-group :label="$t('pageFans.labels.warning')"> <b-form-input v-model="warning" type="number" :min="0" :max="3150"> @@ -30,51 +27,49 @@ </b-button> </b-col> </b-row> - <b-col class="pl-4 pr-4"> - <chart - type="fans" - :colors="colors" - :time-scale="timeScale" - :data="filteredSensors" - :warning="warning" - :shutdown="shutdown" - ></chart> + <chart + type="fans" + :colors="colors" + :time-scale="timeScale" + :data="filteredSensors" + :warning="warning" + :shutdown="shutdown" + ></chart> - <b-table - v-if="items && items.length > 0" - responsive="md" - show-empty - table-variant="accessory" - hover - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(name)="{ value, index }"> - <div - class="item-color" - :style="`background-color: ${colors[index]}`" - ></div> - {{ value }} - </template> - <template #cell(minDate)="{ value }"> - <span style="color: rgb(12, 28, 41)"> - {{ value.time }} - </span> - <span> - {{ value.date }} - </span> - </template> - <template #cell(maxDate)="{ value }"> - <span style="color: rgb(12, 28, 41)"> - {{ value.time }} - </span> - <span> - {{ value.date }} - </span> - </template> - </b-table> - </b-col> + <b-table + v-if="items && items.length > 0" + responsive="md" + show-empty + table-variant="accessory" + hover + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(name)="{ value, index }"> + <div + class="item-color" + :style="`background-color: ${colors[index]}`" + ></div> + {{ value }} + </template> + <template #cell(minDate)="{ value }"> + <span style="color: rgb(12, 28, 41)"> + {{ value.time }} + </span> + <span> + {{ value.date }} + </span> + </template> + <template #cell(maxDate)="{ value }"> + <span style="color: rgb(12, 28, 41)"> + {{ value.time }} + </span> + <span> + {{ value.date }} + </span> + </template> + </b-table> </div> </template> <script> diff --git a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue index 4e128089..8be848d5 100644 --- a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue +++ b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue @@ -4,7 +4,6 @@ <table-date-picker :switch-time-scale="switchTimeScale" :time-scale="timeScale" - style="margin: -2rem -2rem 0 -2rem" /> <fan-speed :time-scale="timeScale"></fan-speed> </b-container> diff --git a/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue index a38d1a48..b9360024 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue @@ -4,7 +4,6 @@ <table-date-picker :switch-time-scale="switchTimeScale" :time-scale="timeScale" - style="margin: -2rem -2rem 0 -2rem" /> <memory-temp :time-scale="timeScale"></memory-temp> </b-container> diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue index 4c6f2c0a..2f550ebd 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue @@ -1,13 +1,10 @@ <template> - <div class="custom-divider" style="margin-top: 0"> - <b-button - variant="collapse" - class="d-flex flex-nowrap justify-content-start" - > + <div> + <b-col class="d-flex flex-nowrap align-items-center page-divider"> <img src="@/assets/images/_sila/collapsed/temperature.svg" /> {{ $t('pageMemory.temperature') }} - </b-button> - <b-row class="align-items-end p-4"> + </b-col> + <b-row class="align-items-end limit-container"> <b-col xs="12" md="6" lg="3" class="pt-2"> <b-form-group :label="$t('pageMemory.labels.notNormal')"> <b-form-input diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue index 45dbca9e..15768432 100644 --- a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue +++ b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue @@ -4,7 +4,6 @@ <table-date-picker :switch-time-scale="switchTimeScale" :time-scale="timeScale" - style="margin: -2rem -2rem 0 -2rem" /> <motherboard-temp :time-scale="timeScale"></motherboard-temp> </b-container> diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue index c16149d9..f0dd97e7 100644 --- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue +++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue @@ -1,14 +1,12 @@ <template> - <div class="custom-divider" style="margin-top: 0"> - <b-button - variant="collapse" - class="d-flex flex-nowrap justify-content-start" - > + <div> + <b-col class="d-flex flex-nowrap align-items-center page-divider"> <img src="@/assets/images/_sila/collapsed/temperature.svg" /> {{ $t('pageMotherboard.temperature') }} - </b-button> - <b-row class="align-items-end p-2"> - <b-col xs="12" md="3" class="pt-4"> + </b-col> + + <b-row class="align-items-end limit-container"> + <b-col xs="12" sm="3" class="pt-4"> <b-form-group :label="$t('pageMotherboard.labels.warning')"> <b-form-input v-model="warning" @@ -18,7 +16,7 @@ ></b-form-input> </b-form-group> </b-col> - <b-col xs="12" md="6" class="pt-2"> + <b-col xs="12" sm="6" class="pt-2"> <b-button variant="primary" style="height: 35px"> {{ 'Сохранить' }} </b-button> diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue index a4fb753f..8e03b3d7 100644 --- a/src/views/_sila/Processors/Dynamic/CpuPower.vue +++ b/src/views/_sila/Processors/Dynamic/CpuPower.vue @@ -2,7 +2,6 @@ <collapse id="collapse_power" :title="$t('pageProcessors.power')" - style="margin-top: 0" @opened="onOpened" > <template #image> diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue index 00cc5998..2f69a5a5 100644 --- a/src/views/_sila/Processors/Dynamic/CpuTemp.vue +++ b/src/views/_sila/Processors/Dynamic/CpuTemp.vue @@ -2,7 +2,6 @@ <collapse id="collapse_temp" :title="$t('pageProcessors.temperature')" - style="margin-top: 0" @opened="onOpened" > <template #image> diff --git a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue index e2e1505c..eef6fd0b 100644 --- a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue +++ b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue @@ -4,7 +4,6 @@ <table-date-picker :switch-time-scale="switchTimeScale" :time-scale="timeScale" - style="margin: -2rem -2rem 0 -2rem" /> <cpu-temp :time-scale="timeScale"></cpu-temp> <cpu-power :time-scale="timeScale"></cpu-power> |