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

View File

@ -81,6 +81,11 @@ const sidebarFunc = () => {
<i-mdi-chevron-left /> <i-mdi-chevron-left />
</a> </a>
</div> </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> </div>
<Sidebar /> <Sidebar />
</div> </div>

View File

@ -40,7 +40,7 @@ watch(() => sidebar.$state.is_open, () => {
<div class="sidebar-content" v-if="sidebar.title"> <div class="sidebar-content" v-if="sidebar.title">
<h2>{{ sidebar.title }}</h2> <h2>{{ sidebar.title }}</h2>
<div class="sidebar-inner" v-if="sidebar.description"> <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> <p>{{ p }}</p>
</template> </template>
</div> </div>