Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/form page section design #130

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Fix/form page section design #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8ab6a0
fix: box-shadow custom property name and value
totocalcio Apr 29, 2024
8dd3c7f
fix: form section background design
totocalcio Apr 29, 2024
f6bd2eb
Merge remote-tracking branch 'origin/main' into fix/contact-form-design
totocalcio Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions apps/web/app/components/FormPageSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,22 @@ const updateDetail = (e: any) => {
@import url("~/assets/media.css");

section {
position: relative;
padding: 120px 20px 120px;
background: linear-gradient(rgba(255, 255, 255, 0.8), rgba(235, 240, 245, 0.8));
background-blend-mode: soft-light;
background-color: #fff;
&::before {
content: "";
position: absolute;
display: block;
inset: 0;
width: 100%;
height: 100%;
background-image: url('/form-bg.png'), linear-gradient(#fff, #ebf0f5);
background-size: auto;
background-repeat: repeat;
background-position: top left;
background-blend-mode: soft-light;
}
}

.form-root {
Expand All @@ -112,6 +125,7 @@ section {
margin: 0 auto;
width: 100%;
grid-template-columns: minmax(0, 1fr);
isolation: isolate;
}

.title {
Expand Down
4 changes: 2 additions & 2 deletions packages/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
--color-vue-blue-gradation: linear-gradient(to right, #35495e 0%, #353b5e 100%);

/* box-shadow */
--box-shadow: 0 2px 10px rgb(53, 73, 95, 0.14);
--box-shadow-input: 0 1px 10px 0 rgb(53, 73, 94, 0.12);
--box-shadow-button: 0 2px 10px color-mix(in srgb, var(--color-vue-blue), transparent calc(100% - 14%));
--box-shadow-card: 0 6px 6px 0 color-mix(in srgb, var(--color-vue-blue), transparent calc(100% - 18%));

/* font */
--font-size-heading800: 5.625rem;
Expand Down
11 changes: 5 additions & 6 deletions packages/ui/components/Button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<script setup lang="ts">

Check warning on line 1 in packages/ui/components/Button.vue

View workflow job for this annotation

GitHub Actions / lint (18.19.0) 

Component name "Button" should always be multi-word
import { computed } from 'vue'
import { NuxtLink } from '#components'

Expand Down Expand Up @@ -107,7 +107,6 @@
--color-vue-green: #42b983;
--color-vue-blue: #35495e;
--color-disabled: #c6cacf;
--box-shadow: 0 2px 10px rgb(53, 73, 95, 0.14);

display: inline-flex;
justify-content: center;
Expand All @@ -122,7 +121,7 @@
border: none;
box-sizing: border-box;
text-decoration: none;
box-shadow: var(--box-shadow);
box-shadow: var(--box-shadow-button);
font-family: 'din-2014', 'Yu Gothic Medium', '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
sans-serif;
}
Expand All @@ -131,7 +130,7 @@
background: white;
color: var(--color-vue-green);
box-shadow:
var(--box-shadow),
var(--box-shadow-button),
inset 0px 0px 0px 2px var(--color-vue-green);
}

Expand All @@ -144,7 +143,7 @@
.button.-secondary {
background: white;
box-shadow:
var(--box-shadow),
var(--box-shadow-button),
inset 0px 0px 0px 2px var(--color-vue-blue);
color: var(--color-vue-blue);

Expand All @@ -158,14 +157,14 @@
.button[disabled] {
pointer-events: none;
background: var(--color-disabled);
box-shadow: var(--box-shadow);
box-shadow: var(--box-shadow-button);
color: white;
}

.button.-secondary[disabled] {
color: var(--color-disabled);
box-shadow:
var(--box-shadow),
var(--box-shadow-button),
inset 0px 0px 0px 2px var(--color-disabled);
background: white;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/forms/InputField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const { fontWeight, fontSize } = useTypography()
.form-input {
padding: 22px 24px;
border-radius: 6px;
box-shadow: var(--box-shadow-input);
box-shadow: var(--box-shadow-button);
border: var(--border);
outline: none;
color: var(--color-vue-blue);
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/forms/TextAreaField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const { fontWeight, fontSize } = useTypography()
.form-textarea {
padding: 22px 24px;
border-radius: 6px;
box-shadow: var(--box-shadow-input);
box-shadow: var(--box-shadow-button);
border: var(--border);
outline: none;
color: var(--color-vue-blue);
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/link/LinkButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const iconColor = computed(() => {
border-radius: var(--height-button);
text-decoration: none;
cursor: pointer;
box-shadow: 0 2px 10px rgb(53, 73, 95, 0.14);
box-shadow: var(--box-shadow-button);
}
.link-button:hover {
transition: 0.2s;
Expand Down
Loading