diff --git a/assets/main.scss b/assets/main.scss index cc27691..ab426e4 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -3,7 +3,9 @@ @tailwind utilities; @layer components {} + @import 'fonts.scss'; + html { // @apply text-[15px] } @@ -129,23 +131,23 @@ a[href^="#"] { } label { - @apply inline-block text-sm font-medium text-gray-900 dark:text-white min-w-36; + @apply inline-block text-sm font-medium text-gray-900 min-w-36; } input { - @apply bg-gray-50 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 disabled:bg-neutral disabled:cursor-not-allowed invalid:border-pink-500 invalid:text-pink-600 focus:invalid:border-pink-500 focus:invalid:ring-pink-500; + @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed invalid:border-pink-500 invalid:text-pink-600 focus:invalid:border-pink-500 focus:invalid:ring-pink-500; } textarea { - @apply block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 max-w-full min-h-10 max-h-40; + @apply block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 max-w-full min-h-10 max-h-40; } button { - @apply rounded bg-primary hover:bg-primary-400 transition-colors px-10 py-3 inline-block text-lg font-bold cursor-pointer disabled:opacity-50 disabled:hover:bg-primary; + @apply rounded bg-primary hover:bg-primary-300 transition-colors p-4 inline-block text-2xl font-bold cursor-pointer disabled:opacity-50 disabled:hover:bg-primary leading-4; &.neutral, &[type="reset"] { - @apply bg-neutral hover:bg-neutral-400 + @apply bg-neutral-200 hover:bg-neutral-400 } } diff --git a/components/calcModels.vue b/components/calcModels.vue index e5f15ab..d43fc08 100644 --- a/components/calcModels.vue +++ b/components/calcModels.vue @@ -65,7 +65,7 @@ const point = reactive({ diff --git a/components/calcValues.vue b/components/calcValues.vue index 505fc14..210f7f5 100644 --- a/components/calcValues.vue +++ b/components/calcValues.vue @@ -30,7 +30,7 @@ const form_state = reactive({ length: fence_section.value * 1000, fence_length: 100, height: 100 + lamelles_count.value * parametric.height.step, - total_length: fence_section.value, + total_length: fence_section.value * 2, total_length_mm: fence_section.value * 1000, full_sections: 1, extra_section: 0 @@ -61,11 +61,6 @@ const changeParametres = () => { form_state[key_s] = parametric[key_p].max } } - if (parametric[key_p].min) { - if (form_state[key_s] < parametric[key_p].min) { - form_state[key_s] = parametric[key_p].min - } - } } form_state.total_length_mm = form_state.total_length * 1000 @@ -103,25 +98,6 @@ const setLamelleColor = (color: ralTypes) => { const setPillarColor = (color: ralTypes) => { pillar_color.value = color } -const increment = (field: keyof typeof form_state, value: number) => { - if (form_state.hasOwnProperty(field)) { - const key_p = field as keyof typeof parametric - let v = (form_state[field] + value * parametric[key_p].step ?? 1) - if (parametric.hasOwnProperty(field)) { - if (parametric[key_p].max) { - if (v > parametric[key_p].max) { - v = parametric[key_p].max - } - } - if (parametric[key_p].min) { - if (v < parametric[key_p].min) { - v = parametric[key_p].min - } - } - } - form_state[field] = parseFloat(v.toFixed(2)) - } -} const autoSectionWidth = () => { auto_section_width.value = !auto_section_width.value } @@ -152,26 +128,23 @@ const toggleModal = () => {
- - + -
- - + -
- +