mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #43

Merged
ksenia_mikhailova merged 41 commits from dev into main 2024-07-24 14:22:29 +03:00
Conversation 0 Commits 41 Files Changed 8 +17 -13
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33353475ac - Show all commits

12
assets/main.scss
View File

@ -31,7 +31,7 @@ body {
}
.logo {
@apply w-full py-4 col-span-4 xl:col-span-2;
@apply w-full py-4 col-span-8 xl:col-span-2;
a {
@apply flex items-center gap-2;
@ -86,7 +86,7 @@ body {
}
&-toggle {
@apply flex xl:hidden col-span-8 justify-end;
@apply flex xl:hidden col-span-4 justify-end;
>span {
@apply cursor-pointer text-zinc-600 hover:text-ioprim-900 transition-colors;
@ -208,11 +208,15 @@ a[href^="#"] {
@apply col-span-12 md:col-span-6 xl:col-span-4 grid grid-cols-4 items-center px-4;
&-image {
@apply rounded-full size-20 bg-slate-300 overflow-hidden col-span-1;
@apply max-w-full max-h-full aspect-square overflow-hidden col-span-1 pr-4;
img{
@apply rounded-full bg-slate-300
}
}
&-content {
@apply col-span-3 text-end italic;
@apply col-span-3 text-end italic text-sm lg:text-base;
}
&-title {

18
components/calcValues.vue
View File

@ -208,30 +208,30 @@ const goal = (target: string, params: object) => {
<div class="grid grid-cols-6">
<div class="col-span-4 calc_table-maincell">Секции</div>
<div class="col-span-2 calc_table-maincell">{{ section_count }}</div>
<div class="col-span-6 xl:col-span-4">
<div class="col-span-6 sm:col-span-4">
Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }}
</div>
<div class="col-span-3 xl:col-span-1">{{ section_count * lamelles_count }}</div>
<div class="col-span-3 xl:col-span-1">
<div class="col-span-3 sm:col-span-1">{{ section_count * lamelles_count }}</div>
<div class="col-span-3 sm:col-span-1">
{{ `${parseFloat(form_state.length.toString()).toFixed(2)}\xa0мм` }}</div>
<template v-if="!form_state.remove_pillar">
<div class="col-span-6 xl:col-span-4">Столбы, RAL {{ pillar_color }}, {{
<div class="col-span-6 sm:col-span-4">Столбы, RAL {{ pillar_color }}, {{
getColorNameFromRal(pillar_color)?.toLowerCase() }}</div>
<div class="col-span-3 xl:col-span-1">
<div class="col-span-3 sm:col-span-1">
{{ section_count + ~~(!!form_state.extra_section) + 1 }}
</div>
<div class="col-span-3 xl:col-span-1">
<div class="col-span-3 sm:col-span-1">
{{ `${parseFloat(form_state.fence_length.toString()).toFixed(2)}\xa0мм` }}
</div>
</template>
<template v-if="form_state.extra_section">
<div class="col-span-4 calc_table-maincell">Секции</div>
<div class="col-span-2 calc_table-maincell">1</div>
<div class="col-span-6 xl:col-span-4">
<div class="col-span-6 sm:col-span-4">
Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }}
</div>
<div class="col-span-3 xl:col-span-1">{{ 1 * lamelles_count }}</div>
<div class="col-span-3 xl:col-span-1">{{
<div class="col-span-3 sm:col-span-1">{{ 1 * lamelles_count }}</div>
<div class="col-span-3 sm:col-span-1">{{
`${parseFloat(form_state.extra_section.toString()).toFixed(2)}\xa0мм` }}</div>
</template>
</div>