Skip to content

Commit

Permalink
Merge branch 'main' into feature/message-page-section
Browse files Browse the repository at this point in the history
  • Loading branch information
yamageji committed Mar 24, 2024
2 parents 8e938a7 + 5282501 commit f8b8ea3
Show file tree
Hide file tree
Showing 56 changed files with 1,884 additions and 105 deletions.
27 changes: 25 additions & 2 deletions apps/web/app/assets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,31 @@
--unit: 8px;

/* color */
--color-white: #fff;
--color-vue-blue: #35495e;
--color-vue-green: #42b983;
--color-vue-green-gradation: linear-gradient(to right, #42b883, #41b8aa);

/* font */
--font-size-heading700: 2.813rem;
--font-size-heading400: 1.75rem;
--font-size-heading300: 1.5rem;
--font-size-heading200: 1.25rem;
--font-size-body400: 1.125rem;
--font-size-body300: 1rem;
--line-height-heading700: 3.376rem; /* 2.813 * 1.2 */
--line-height-heading400: 3.15rem; /* 1.75 * 1.8 */
--line-height-heading300: 2.7rem; /* 1.5 * 1.8 */
--line-height-heading200: 2.25rem; /* 1.25 * 1.8 */
--line-height-body400: 2.025rem; /* 1.125 * 1.8 */
--line-height-body300: 1.8rem; /* 1 * 1.8 */

/* markdown font */
--markdown-font-size-h2: var(--font-size-heading300);
--markdown-font-size-body: var(--font-size-body400);

--markdown-line-height-h2: var(--line-height-heading300);
--markdown-line-height-body: var(--line-height-body400);

/* zindex */
}
Expand All @@ -22,6 +45,6 @@ ol[role='list'] {
}

html {
font-family: 'din-2014', 'Yu Gothic Medium', '游ゴシック体', YuGothic,
'游ゴシック', 'Yu Gothic', sans-serif;
font-family: 'din-2014', 'Yu Gothic Medium', '游ゴシック体', YuGothic, '游ゴシック', 'Yu Gothic',
sans-serif;
}
4 changes: 2 additions & 2 deletions apps/web/app/assets/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dl,
dd {
margin: 0;
}
ul[role='list'],
ol[role='list'] {
ul,
ol {
list-style: none;
}
html:focus-within {
Expand Down
196 changes: 195 additions & 1 deletion apps/web/app/components/FooterPageSection.vue
Original file line number Diff line number Diff line change
@@ -1 +1,195 @@
<template>Footer</template>
<script setup lang="ts">
import { useColor, useTypography } from '@vuejs-jp/composable'
//#region types
type LinkList = {
href: string
text: string
}
//#endregion
//#region composable
const { color } = useColor()
const { fontSize } = useTypography()
//#endregion
//#region private variables
const snsLinkList: LinkList[] = [
{
href: 'https://twitter.com/vuefes',
text: 'x',
},
{
href: 'https://note.com/vuejs_jp/',
text: 'note',
},
{
href: 'https://www.youtube.com/channel/UC6KPwA1kZJtQYdlh8_2hxCA',
text: 'YouTube',
},
{
href: 'https://github.com/vuejs-jp',
text: 'GitHub',
},
]
const internalLinkList: LinkList[] = [
{
href: '/privacy',
text: 'プライバシーポリシー',
},
{
href: '/code-of-conduct',
text: '行動規範',
},
]
const vueFesLinkList: LinkList[] = [
{
href: 'https://vuefes.jp/2023/',
text: 'Vue Fes Japan 2023',
},
{
href: 'https://vuefes.jp/2022/',
text: 'Vue Fes Japan Online 2022',
},
{
href: 'https://vuefes.jp/2020/',
text: 'Vue Fes Japan 2020',
},
{
href: 'https://vuefes.jp/2019/',
text: 'Vue Fes Japan 2019',
},
{
href: 'https://vuefes.jp/2018/',
text: 'Vue Fes Japan 2018',
},
]
//#endregion
</script>

<template>
<footer id="footer">
<div class="footer-container footer-main">
<div class="footer-information">
<VFLogo color="white" />
<ul class="footer-list footer-sns-list">
<li v-for="(link, index) in snsLinkList" :key="index">
<VFIconButton :href="link.href" color="white" :name="link.text" can-hover />
</li>
</ul>
</div>
<div class="footer-link">
<ul class="footer-list">
<li v-for="(link, index) in internalLinkList" :key="index">
<VFTextLink :href="link.href" color="white">
{{ link.text }}
</VFTextLink>
</li>
</ul>
<ul class="footer-list">
<li v-for="(link, index) in vueFesLinkList" :key="index">
<VFTextLink :href="link.href" target="_blank" color="white">
{{ link.text }}
</VFTextLink>
</li>
</ul>
</div>
</div>
<div class="footer-container footer-copyrights">
<small
:style="{
fontSize: fontSize('body/100'),
color: color('white'),
}"
>
© 2018-2024 Vue.js Japan Users Group some rights reserved.<br />
Vue.js artworks by Evan You is licensed under a Creative Commons Attribution 4.0
International License.
</small>
</div>
</footer>
</template>

<style scoped>
@import url('../assets/media.css');
#footer {
--padding-block-footer: 5rem;
--gap-link-item: 0.875rem;
--size-sns-icon: 1.75rem;
@media (--mobile) {
--padding-block-footer: 3.75rem;
--gap-link-item: 0.25rem;
--size-sns-icon: 2.5rem;
}
background-color: var(--color-vue-blue);
color: var(--color-white);
line-height: 1.2;
}
.footer-container {
margin-inline: auto;
max-width: 74.5rem;
padding-inline: 1.25rem;
&:first-of-type {
padding-top: var(--padding-block-footer);
}
&:last-of-type {
padding-bottom: var(--padding-block-footer);
}
& + & {
margin-top: 1.25rem;
}
@media (--mobile) {
& + & {
margin-top: 2.5rem;
}
}
}
.footer-list {
margin: 0;
padding: 0;
}
.footer-main {
display: grid;
grid-template-columns: 1fr auto;
@media (--mobile) {
display: block;
}
}
.footer-sns-list {
margin-top: 1.25rem;
display: grid;
gap: 1rem;
grid-template-columns: repeat(4, var(--size-sns-icon));
a {
aspect-ratio: 1;
display: grid;
place-items: center;
}
@media (--mobile) {
:deep(svg) {
scale: 1.4;
}
}
}
.footer-link {
display: grid;
gap: 3.75rem;
grid-template-columns: repeat(2, auto);
li + li {
margin-top: var(--gap-link-item);
}
@media (--tablet) {
grid-template-columns: 1fr;
gap: var(--gap-link-item);
}
@media (--mobile) {
margin-top: 1.25rem;
li {
display: flex;
height: 2.5rem;
align-items: center;
}
}
}
</style>
14 changes: 14 additions & 0 deletions apps/web/app/components/FormPageSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@ section {
display: grid;
place-items: center;
gap: 40px;
&::v-deep a {
color: var(--color-vue-green);
text-decoration: underline;
}
&::v-deep a:hover {
opacity: 0.4;
transition: .2s;
}
}
form {
display: grid;
Expand All @@ -127,4 +135,10 @@ form {
margin: 0 auto;
width: 260px;
}
@supports (-webkit-touch-callout: none) {
section {
background: -webkit-linear-gradient(rgba(255, 255, 255, 0.8), rgba(235, 240, 245, 0.8)), url(/form-bg.png); /* for iOS */
background-size: 200%; /* for iOS */
}
}
</style>
Loading

0 comments on commit f8b8ea3

Please sign in to comment.