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

dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
Conversation 0 Commits 141 Files Changed 62 +23 -13
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c3b7d621f - Show all commits

22
assets/main.scss
View File

@ -301,7 +301,7 @@ button {
@apply col-span-full grid grid-cols-12 gap-4; @apply col-span-full grid grid-cols-12 gap-4;
&-row { &-row {
@apply col-span-full flex flex-row flex-wrap gap-4; @apply col-span-full flex flex-row flex-wrap gap-2;
} }
&-item { &-item {
@ -320,7 +320,15 @@ button {
} }
&_checkbox { &_checkbox {
@apply w-full xl:w-auto flex-row xl:flex-initial flex-nowrap gap-4; @apply w-full xl:w-auto flex-row xl:flex-initial flex-nowrap gap-2 items-center;
label {
@apply leading-none;
}
svg {
@apply text-slate-500;
}
} }
&_range { &_range {
@ -335,13 +343,13 @@ button {
} }
} }
&_color { &_picker {
@apply w-full; @apply w-full;
}
// input[type=range] { svg {
// @apply min-w-[calc(100%-8rem)] xl:min-w-min py-0 -translate-y-1/2; @apply text-slate-500;
// } }
}
} }
} }

2
components/calc/models.vue
View File

@ -25,7 +25,7 @@ const cameraStat = reactive({
</template> </template>
<Loader /> <Loader />
<Stats /> <Stats />
<TresCanvas clear-color="#ccc"> <TresCanvas clear-color="#e2e8f0">
<TresPerspectiveCamera v-bind="cameraStat" ref="camera" /> <TresPerspectiveCamera v-bind="cameraStat" ref="camera" />
<OrbitControls v-bind="controlsState" make-default /> <OrbitControls v-bind="controlsState" make-default />
<Suspense> <Suspense>

12
components/calc/values.vue
View File

@ -184,7 +184,7 @@ const calc_table = computed(() => {
<template> <template>
<div class="form"> <div class="form">
<div class="form-row"> <div class="form-row">
<div class="form-item form-item_color"> <div class="form-item form-item_picker">
<label for="lamelle_color">Цвет ламелей</label> <label for="lamelle_color">Цвет ламелей</label>
<DropdownPicker type="color" :cb="setLamelleColor" name="lamelle_color" <DropdownPicker type="color" :cb="setLamelleColor" name="lamelle_color"
:goto_target="new Vector3(0, lamelles_count * lamelle_height * 0.75, 0)" :goto_target="new Vector3(0, lamelles_count * lamelle_height * 0.75, 0)"
@ -197,7 +197,7 @@ const calc_table = computed(() => {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-item form-item_color"> <div class="form-item form-item_picker">
<label for="pillar_color">Цвет столба</label> <label for="pillar_color">Цвет столба</label>
<DropdownPicker type="color" :cb="setPillarColor" name="pillar_color" <DropdownPicker type="color" :cb="setPillarColor" name="pillar_color"
:goto_target="new Vector3(-fence_section * 0.5, lamelles_count * lamelle_height, 0)" :goto_target="new Vector3(-fence_section * 0.5, lamelles_count * lamelle_height, 0)"
@ -210,7 +210,7 @@ const calc_table = computed(() => {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-item form-item_color"> <div class="form-item form-item_picker">
<label for="pillar_pattern">Узор столба</label> <label for="pillar_pattern">Узор столба</label>
<DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern" :disabled="remove_pillar" <DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern" :disabled="remove_pillar"
:goto_target="new Vector3(fence_section * 0.5, lamelles_count * lamelle_height, 0)" :goto_target="new Vector3(fence_section * 0.5, lamelles_count * lamelle_height, 0)"
@ -260,7 +260,8 @@ const calc_table = computed(() => {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-item form-item_checkbox"> <div class="form-item form-item_checkbox">
<input id="auto_length" type="checkbox" v-model="form_state.auto_length" /> <input id="auto_length" type="checkbox" v-model="form_state.auto_length" hidden />
<Icon :name="`mdi:check-box-outline${!form_state.auto_length ? '-blank' : ''}`" />
<label for="auto_length">Автоматический подбор секции</label> <label for="auto_length">Автоматический подбор секции</label>
</div> </div>
<p v-if="!form_state.auto_length" class="text-ioprim text-sm"> <p v-if="!form_state.auto_length" class="text-ioprim text-sm">
@ -269,7 +270,8 @@ const calc_table = computed(() => {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-item form-item_checkbox"> <div class="form-item form-item_checkbox">
<input id="remove_pillar" type="checkbox" v-model="form_state.remove_pillar" /> <input id="remove_pillar" type="checkbox" v-model="form_state.remove_pillar" hidden />
<Icon :name="`mdi:check-box-outline${!form_state.remove_pillar ? '-blank' : ''}`" />
<label for="remove_pillar">Без столбов</label> <label for="remove_pillar">Без столбов</label>
</div> </div>
</div> </div>