Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
61 changes: 33 additions & 28 deletions components/Contact.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<section class="second-section" id="contact">

Check warning on line 2 in components/Contact.vue

View workflow job for this annotation

GitHub Actions / lint

Attribute "id" should go before "class"
<div class="section-content">
<div class="row">
<div class="one-half column">
Expand Down Expand Up @@ -33,8 +33,8 @@
</section>
</template>

<style lang="scss">
@import "~/assets/css/util";
<style>
@import "~/assets/css/util.css";

@media screen and (min-width: 480px) {
section {
Expand All @@ -46,38 +46,43 @@

.second-section {
background: #bbffff;
}

.contact-list,
.person-list {
list-style: none;
.second-section .contact-list,
.second-section .person-list {
list-style: none;
}

li:before {
font-family: "Font Awesome 6 Free";
font-weight: 900;
margin-right: 0.5em;
}
.second-section .contact-list li:before,
.second-section .person-list li:before {
font-family: "Font Awesome 6 Free";
font-weight: 900;
margin-right: 0.5em;
}

.twitter:before {
font-family: "Font Awesome 6 Brands";
content: "\f099";
}
.second-section .contact-list .twitter:before,
.second-section .person-list .twitter:before {
font-family: "Font Awesome 6 Brands";
content: "\f099";
}

.email:before {
content: "\f0e0";
}
.second-section .contact-list .email:before,
.second-section .person-list .email:before {
content: "\f0e0";
}

.person:before {
content: "\f007";
}
.second-section .contact-list .person:before,
.second-section .person-list .person:before {
content: "\f007";
}

li a {
text-decoration: none;
}
}
.second-section .contact-list li a,
.second-section .person-list li a {
text-decoration: none;
}

.wf-roundedmplus1c,
.wf-roundedmplus1c * {
font-family: "Rounded Mplus 1c";
}
.second-section .wf-roundedmplus1c,
.second-section .wf-roundedmplus1c * {
font-family: "Rounded Mplus 1c";
}
</style>
106 changes: 55 additions & 51 deletions components/Home.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<section class="first-section" id="home">

Check warning on line 2 in components/Home.vue

View workflow job for this annotation

GitHub Actions / lint

Attribute "id" should go before "class"
<div class="section-content">
<div class="row">
<div id="nav" class="fourteen columns text-center">
Expand All @@ -25,7 +25,7 @@
<div class="text-container">
<span>
プリパラを技術の面から支えていきたい,
<br />そんな思いから生まれたハッカソン.

Check warning on line 28 in components/Home.vue

View workflow job for this annotation

GitHub Actions / lint

Disallow self-closing on HTML void elements (<br/>)
</span>
</div>
</div>
Expand All @@ -34,7 +34,7 @@
<div class="text-container">
<span>
プリパラと自分の技術を組み合わせて,
<br />面白いことをしていきましょう!

Check warning on line 37 in components/Home.vue

View workflow job for this annotation

GitHub Actions / lint

Disallow self-closing on HTML void elements (<br/>)
</span>
</div>
</div>
Expand All @@ -43,7 +43,7 @@
<div class="text-container">
<span>
み~んなともだち、み~んなハッカー!
<br />創作はじめる時間だよ!

Check warning on line 46 in components/Home.vue

View workflow job for this annotation

GitHub Actions / lint

Disallow self-closing on HTML void elements (<br/>)
</span>
</div>
</div>
Expand All @@ -64,8 +64,8 @@
</section>
</template>

<style lang="scss">
@import "~/assets/css/util";
<style>
@import "~/assets/css/util.css";

@media screen and (min-width: 480px) {
section {
Expand All @@ -82,59 +82,63 @@

.first-section {
background: #ffffbb;
.hero-image {
border-radius: 100%;
display: block;
margin-top: 3em;
margin-left: auto;
margin-right: auto;
width: 60%;
height: 60%;
}
}

.button {
span {
color: white;
}
border: none;
}
.first-section .hero-image {
border-radius: 100%;
display: block;
margin-top: 3em;
margin-left: auto;
margin-right: auto;
width: 60%;
height: 60%;
}

.text-center {
text-align: center;
}
.first-section .button {
border: none;
}

#nav {
margin: 13px 0 0 0;
ul li {
display: inline;
margin: 0 20px 0 0;
}
a {
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
}
.first-section .button span {
color: white;
}

.row {
.mini-image {
width: 20%;
height: 20%;
vertical-align: middle;
display: inline-block;
margin-left: 0.2em;
}
.text-container {
width: 70%;
font-size: 0.65em;
display: inline-block;
vertical-align: middle;
}
}
.first-section .text-center {
text-align: center;
}

.pretty-row {
margin-bottom: 1em;
}
.first-section #nav {
margin: 13px 0 0 0;
}

.first-section #nav ul li {
display: inline;
margin: 0 20px 0 0;
}

.first-section #nav a {
text-decoration: none;
}

.first-section #nav a:hover {
text-decoration: underline;
}

.first-section .row .mini-image {
width: 20%;
height: 20%;
vertical-align: middle;
display: inline-block;
margin-left: 0.2em;
}

.first-section .row .text-container {
width: 70%;
font-size: 0.65em;
display: inline-block;
vertical-align: middle;
}

.first-section .pretty-row {
margin-bottom: 1em;
}
</style>
67 changes: 37 additions & 30 deletions components/Works.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<section class="works-section" id="works">

Check warning on line 2 in components/Works.vue

View workflow job for this annotation

GitHub Actions / lint

Attribute "id" should go before "class"
<div class="section-content wf-roundedmplus1c">
<h1 class="section-heading">成果物</h1>
<ul :class="['events', isOpen ? 'is-open' : '']">
Expand Down Expand Up @@ -48,8 +48,8 @@
})
</script>

<style lang="scss">
@import "~/assets/css/util";
<style>
@import "~/assets/css/util.css";

@media screen and (min-width: 480px) {
section {
Expand All @@ -66,12 +66,14 @@
.events {
overflow-y: hidden;
max-height: 55vh;
.event-title {
font-size: 2em;
}
&.is-open {
max-height: none;
}
}

.events .event-title {
font-size: 2em;
}

.events.is-open {
max-height: none;
}

.works {
Expand All @@ -98,39 +100,44 @@
overflow: hidden;
width: 100%;
height: auto;
.work-thumbnail-img {
max-width: 100%;
}
}

.work-thumbnail .work-thumbnail-img {
max-width: 100%;
}

.work-text-content {
padding: 16px;
background-color: #eee;
.work-name {
margin: 0 0 12px 0;
font-size: 20px;
color: #4cc48e;
font-weight: bold;
a {
color: inherit;
}
}
.work-description {
margin: 0 0 12px 0;
font-size: 14px;
color: #555;
font-weight: lighter;
}
}

.work-text-content .work-name {
margin: 0 0 12px 0;
font-size: 20px;
color: #4cc48e;
font-weight: bold;
}

.work-text-content .work-name a {
color: inherit;
}

.work-text-content .work-description {
margin: 0 0 12px 0;
font-size: 14px;
color: #555;
font-weight: lighter;
}

.work-meta {
overflow: hidden;
width: 100%;
font-size: 12px;
.work-authors {
float: left;
color: #aaa;
}
}

.work-meta .work-authors {
float: left;
color: #aaa;
}

.readmore {
Expand Down
16 changes: 4 additions & 12 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,8 @@ export default defineNuxtConfig({
modules: ['@nuxt/eslint'],

css: [
'@fortawesome/fontawesome-free/css/all.css'
],

vite: {
css: {
preprocessorOptions: {
scss: {
api: 'modern-compiler'
}
}
}
}
'@fortawesome/fontawesome-free/css/all.css',
'skeleton-css/css/normalize.css',
'skeleton-css/css/skeleton.css'
]
})
Loading