bx-1316-refactoring #14

Merged
ksenia_mikhailova merged 46 commits from bx-1316-refactoring into dev 2024-08-28 15:06:52 +03:00
3 changed files with 17 additions and 12 deletions
Showing only changes of commit 2a6862a78c - Show all commits

View File

@ -10,6 +10,11 @@ $primary: #E75B12;
transition: right 300ms linear;
&.main {
right: auto;
left: 2rem;
}
a {
background-color: $bg;
color: $textColor;
@ -52,12 +57,12 @@ $primary: #E75B12;
}
&-inner {
max-height: calc(100vh - 38rem);
// max-height: calc(100vh - 38rem);
overflow: auto;
}
&-content {
max-height: 100%;
max-height: 50vh;
overflow: auto;
background-color: $bg;
@ -70,9 +75,7 @@ $primary: #E75B12;
font-family: 'main';
}
&-list {
}
&-list {}
&-list-item {
font-size: 1.875rem;
@ -83,7 +86,7 @@ $primary: #E75B12;
input {
margin-right: 2rem;
&.checked + label {
&.checked+label {
color: $primary;
}
}
@ -98,10 +101,7 @@ $primary: #E75B12;
p {
font-size: 1rem;
&:not(:last-child) {
margin-bottom: 1rem;
}
margin-bottom: 1rem;
}
a {

View File

@ -81,6 +81,11 @@ const sidebarFunc = () => {
<i-mdi-chevron-left />
</a>
</div>
<div class="homelink main" v-if="route.params.item">
<RouterLink :to="`/${route.params.item.toString()}`" @click.prevent="sidebarFunc">
<i-mdi-home />
</RouterLink>
</div>
</div>
<Sidebar />
</div>

View File

@ -40,7 +40,7 @@ watch(() => sidebar.$state.is_open, () => {
<div class="sidebar-content" v-if="sidebar.title">
<h2>{{ sidebar.title }}</h2>
<div class="sidebar-inner" v-if="sidebar.description">
<template v-for="p in sidebar.description.split('\n')">
<template v-for="p in sidebar.description.replace(/(\n|\r)+/g, '\n').split('\n')">
<p>{{ p }}</p>
</template>
</div>