Skip to content

Commit

Permalink
Merge pull request #144 from Kyutech-C3/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Simo-C3 authored Jul 15, 2023
2 parents 79113c7 + 9d8a0b6 commit 78a59e2
Show file tree
Hide file tree
Showing 16 changed files with 519 additions and 245 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 2,
"editor.formatOnSave": true
"editor.formatOnSave": true,
"cSpell.words": ["brainfuck", "haml", "nasm", "prismjs", "templating"]
}
8 changes: 8 additions & 0 deletions assets/stylesheets/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ $through-light-blue: #489fd4e0;
$white: #ffffff;
$black: #000000;

$bg-hover-color: #efefef;

//Variable for default ui

// Common variable for text
Expand All @@ -23,6 +25,12 @@ $font-family-title: 'Inter', sans-serif;
$font-family-contens: '游ゴシック体', YuGothic, '游ゴシック Medium',
'Yu Gothic Medium', '游ゴシック', 'Yu Gothic', sans-serif;

$h1-font-size: $base_font_size * 4;
$h2-font-size: $base_font_size * 3.25;
$h3-font-size: $base_font_size * 2.5;
$h4-font-size: $base_font_size * 2;
$h5-font-size: $base_font_size * 1.75;

// Variable for top page text
$font-size-top-title: $base_font_size * 10;
$font-size-contents-title: $base_font_size * 8;
Expand Down
53 changes: 32 additions & 21 deletions components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
:icon="isShowContents ? 'times' : 'bars'"
@click="showContents()"
/>
<img
type="image/webp"
src="@/assets/image/s_logo.webp"
class="logo"
alt="logo"
/>
<nuxt-link to="/">
<img
type="image/webp"
src="@/assets/image/s_logo.webp"
class="logo"
alt="logo"
/>
</nuxt-link>
</div>
<div v-if="!isMobile" class="header-container__right y-center">
<div class="contact">
Expand Down Expand Up @@ -140,16 +142,16 @@ export default {
link: '/',
icon: 'home',
},
{
text: 'お知らせ',
link: '/news',
icon: 'info-circle',
},
{
text: 'C3について',
link: '/about',
icon: 'users',
},
{
text: 'お知らせ',
link: '/news',
icon: 'info-circle',
},
{
text: 'ブログ',
link: '/blog',
Expand All @@ -163,7 +165,7 @@ export default {
icon: 'gamepad',
},
{
text: 'CG',
text: '3DCG',
link: '/community/5Ay58j7CHdYFqKShRbr5tD',
icon: 'cubes',
},
Expand All @@ -173,10 +175,15 @@ export default {
icon: 'laptop-code',
},
{
text: 'MEDIA_ART',
text: '2DCG',
link: '/community/1q0aXzj2r1O0pC5soNRQok',
icon: 'palette',
},
{
text: 'MUSIC',
link: '/community/mlIRfpRrISVzKc6K0l181',
icon: 'music',
},
],
[
{
Expand Down Expand Up @@ -263,6 +270,7 @@ export default {
left: 50%;
transform: translateX(-50%);
z-index: 99;
transition: transform 0.5s ease-in-out;
}
.header-wrapper {
position: relative;
Expand All @@ -286,10 +294,10 @@ export default {
&__left {
svg {
width: 40px;
max-height: calc(var(--header-max-height) * 0.6);
height: calc(var(--header-height) * 0.6);
min-height: calc(var(--header-min-height) * 0.6);
margin-right: min(5vw, 50px);
max-height: calc(var(--header-max-height) * 0.5);
height: calc(var(--header-height) * 0.5);
min-height: calc(var(--header-min-height) * 0.5);
margin-right: min(5vw, 30px);
cursor: pointer;
}
.logo {
Expand All @@ -301,11 +309,11 @@ export default {
}
&__right {
svg {
font-size: 28px;
font-size: 24px;
margin-right: 15px;
}
.contact {
font-size: 24px;
font-size: 20px;
margin-right: 30px;
div {
Expand All @@ -314,8 +322,8 @@ export default {
}
.language {
width: 132px;
height: 48px;
font-size: 24px;
height: 44px;
font-size: 20px;
justify-content: center;
box-shadow: 0px 2px 8px #00000033;
border-radius: 60px;
Expand All @@ -341,6 +349,8 @@ export default {
padding: 20px 50px 0 50px;
justify-content: space-around;
border-top: solid 1px $light-gray;
display: flex;
align-items: flex-start;
.contents {
height: 30px;
Expand All @@ -365,6 +375,7 @@ export default {
transform: scale(0, 1);
transform-origin: left top;
transition: transform 0.3s;
border-radius: 2px;
}
.contents:hover {
color: $black;
Expand Down
181 changes: 181 additions & 0 deletions components/WorkLink.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<template>
<div class="work-link">
<a href="https://toybox.compositecomputer.club" target="_blank">
<font-awesome-icon
:icon="['fas', 'arrow-up-right-from-square']"
class="outside-link-icon"
/>
<span>作品を見る</span>
</a>
<div class="work-link-bg">
<div class="work-link-bg-img-wrapper">
<img
v-for="(work, index) in [...works]"
:key="index"
:src="work.thumbnail"
:title="work.title"
lazy
/>
</div>
<div class="work-link-bg-img-wrapper">
<img
v-for="(work, index) in [...works]"
:key="index"
:src="work.thumbnail"
:title="work.title"
lazy
/>
</div>
</div>
</div>
</template>

<script>
export default {
props: {
works: {
type: Array,
required: true,
},
},
data() {
return {
title: 'C3について',
description: '',
areas_data: [
{
name: 'GAME',
link: '/community/21AY3pJOP214Gsw1d9u6cD',
icon: 'gamepad',
},
{
name: '3DCG',
link: '/community/5Ay58j7CHdYFqKShRbr5tD',
icon: 'cubes',
},
{
name: 'HACK',
link: '/community/39t5DaMrgq579LDvqWGKZK',
icon: 'laptop-code',
},
{
name: '2DCG',
link: '/community/1q0aXzj2r1O0pC5soNRQok',
icon: 'palette',
},
{
name: 'MUSIC',
link: '/community/1q0aXzj2r1O0pC5soNRQok',
icon: 'music',
},
],
}
},
created() {
this.description = this.c3_introduction_digest
},
}
</script>

<style lang="scss" scoped>
.work-link {
width: 100%;
min-height: 270px;
height: 55vw;
max-height: 470px;
display: flex;
justify-content: center;
align-items: center;
position: relative;
overflow: hidden;
border-radius: 20px;
&::after {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.3);
}
a {
font-size: 2.5rem;
color: $base-font-color;
text-decoration: none;
padding: 5px 10px;
border-radius: 100px;
z-index: 1;
color: white;
font-weight: bold;
text-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
transition: all 0.3s ease;
position: relative;
&::after {
position: absolute;
bottom: -2px;
left: 0;
content: '';
width: 100%;
height: 2px;
background: $white;
transform: scale(0, 1);
transform-origin: center top;
transition: transform 0.3s;
border-radius: 2px;
}
&:hover::after {
transform: scale(1, 1);
}
.outside-link-icon {
margin-right: 2px;
font-size: 1.5rem;
}
}
&-bg {
display: flex;
position: absolute;
top: 0;
left: 0;
height: 100%;
gap: 10px;
padding: 5px 0;
&-img-wrapper {
width: 2090px;
height: 100%;
gap: 10px;
z-index: 0;
display: flex;
flex-wrap: wrap;
flex-direction: column;
animation: bg-img-scroll 10s linear infinite;
justify-content: center;
margin-bottom: -5px;
overflow: hidden;
img {
flex-grow: 1;
object-fit: cover;
min-width: 135px;
width: 25vw;
max-width: 200px;
border-radius: 5px;
user-select: none;
pointer-events: none;
}
}
}
}
@keyframes bg-img-scroll {
100% {
transform: translateX(calc(-2100px));
}
}
</style>
32 changes: 16 additions & 16 deletions components/commons/BaseBreadcrumbs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@
import { mapGetters } from 'vuex'
export default {
head() {
const hid = `jsonld-${this._uid}`
return {
script: [
{
hid,
type: 'application/ld+json',
innerHTML: JSON.stringify(this.jsonld, null, 2),
},
],
__dangerouslyDisableSanitizers: ['script'],
__dangerouslyDisableSanitizersByTagID: {
[hid]: 'innerHTML',
},
}
},
computed: {
...mapGetters('breadcrumbs', ['breadcrumbs']),
jsonld() {
Expand All @@ -35,22 +51,6 @@ export default {
}
},
},
head() {
const hid = `jsonld-${this._uid}`
return {
script: [
{
hid,
type: 'application/ld+json',
innerHTML: JSON.stringify(this.jsonld, null, 2),
},
],
__dangerouslyDisableSanitizers: ['script'],
__dangerouslyDisableSanitizersByTagID: {
[hid]: 'innerHTML',
},
}
},
}
</script>

Expand Down
Loading

0 comments on commit 78a59e2

Please sign in to comment.