Skip to content
This repository has been archived by the owner on Oct 13, 2022. It is now read-only.

#25-構造化タグをちゃんとした #27

Merged
merged 6 commits into from Feb 13, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="ja">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand Down
64 changes: 36 additions & 28 deletions src/App.vue
@@ -1,27 +1,29 @@
<template>
<div id="app" v-touch:swipe.right="show" v-touch:swipe.left="hide">
<div class="header">
<div class="top">
<header>
<div id="top">
<font-awesome-icon
icon="bars"
size="2x"
class="hamburger fa-fw"
id="hamburger"
class="fa-fw"
@click="toggle_sidebar"
/>
<font-awesome-icon
icon="times"
size="2x"
class="hamburger-closer fa-fw"
id="hamburger-closer"
class="fa-fw"
:class="{ open: sidebar_shown }"
@click="toggle_sidebar"
/>
<h2>73rd afes</h2>
<div class="icons">
<img src="/img/Twitter_Logo_Blue.svg" />
<img src="/img/instagram.png" />
<img src="/img/azabu_icon.svg" />
<b-link id="brand" href="/">73rd afes</b-link>
<div id="icons">
<img src="/img/Twitter_Logo_Blue.svg" alt="Twitter" />
<img src="/img/instagram.png" alt="Instagram" />
<img src="/img/azabu_icon.svg" alt="school website" />
</div>
<nav class="menu" :class="{ shown: sidebar_shown }">
<nav id="menu" :class="{ shown: sidebar_shown }">
<ul>
<li>
<b-link to="about">ごあいさつ</b-link>
Expand Down Expand Up @@ -49,13 +51,13 @@
</ul>
</nav>
<div
class="menu-fade"
id="menu-fade"
:class="{ shown: sidebar_shown }"
@click="hide"
></div>
</div>
</div>
<div class="main-wrapper">
</header>
<div id="main-wrapper">
<main>
<router-view></router-view>
</main>
Expand Down Expand Up @@ -85,7 +87,7 @@ body,
display: flex;
}

.header {
header {
width: 16rem;
padding: 2rem 0 0 2rem;
height: 100vh;
Expand All @@ -94,13 +96,19 @@ body,
justify-content: center;
align-items: stretch;
z-index: 1000000007;
.top {
#top {
flex-grow: 1;
.hamburger,
.hamburger-closer {
#hamburger,
#hamburger-closer {
display: none;
}
.menu {
#brand {
font-size: 2rem;
font-weight: 600;
color: inherit;
}

#menu {
pointer-events: auto;
background: $site-theme;
color: #fff;
Expand Down Expand Up @@ -133,7 +141,7 @@ body,
}
}
}
.icons {
#icons {
img {
margin: 8px 16px 16px 0;
width: 32px;
Expand All @@ -143,7 +151,7 @@ body,
}
}

.main-wrapper {
#main-wrapper {
flex-grow: 1;
height: 100vh;
overflow-y: auto;
Expand Down Expand Up @@ -192,26 +200,26 @@ body,
height: auto;
display: block;
}
.header {
header {
display: block;
padding: 0;
height: auto;
position: fixed;
top: 0;
.top {
#top {
height: 4rem;
width: 100vw;
border-bottom: 1px solid $site-theme;
background-color: #fff;
display: flex;
align-items: center;
padding: 0.5rem;
.hamburger {
#hamburger {
display: inline-block;
color: $site-theme;
margin: 0.7rem;
}
.hamburger-closer {
#hamburger-closer {
display: block;
color: #fff;
transition: opacity 0.3s;
Expand All @@ -224,11 +232,11 @@ body,
opacity: 1;
}
}
h2 {
#brand {
margin-bottom: 0;
line-height: 1;
}
.icons {
#icons {
display: flex;
flex-grow: 1;
justify-content: flex-end;
Expand All @@ -239,7 +247,7 @@ body,
margin-bottom: 8px;
}
}
.menu {
#menu {
&,
&-fade {
transition: opacity, left 0.3s;
Expand Down Expand Up @@ -279,7 +287,7 @@ body,
}
}
}
.main-wrapper {
#main-wrapper {
margin-top: 4rem;
padding-top: 0;
overflow-y: visible;
Expand Down
13 changes: 8 additions & 5 deletions src/views/Home.vue
Expand Up @@ -2,7 +2,7 @@
<div id="home">
<div id="top-image" />
<div id="first-view">
<div class="buttons">
<div id="buttons">
<top-page-button
icon-name="map-marker-alt"
button-name="アクセス"
Expand All @@ -29,7 +29,7 @@
<p>第73回麻布学園文化祭公式ウェブサイトです。</p>
<p>当日の展示に関する情報や、日々の活動の様子などを発信しています。</p>
<div id="lower-right">
<p class="date">2020/5/1(Fri)~5/3(Sun)</p>
<p id="date">2020/5/1(Fri)~5/3(Sun)</p>
<!-- TODO: logo -->
<img src="https://placehold.jp/400x100.png" alt="logo" />
</div>
Expand Down Expand Up @@ -73,19 +73,22 @@
font-weight: 400;
margin-bottom: 1.5rem;
}

p {
font-size: 1.2rem;
margin-bottom: 0.5rem;
}

.buttons {
#buttons {
display: none;
}

#lower-right {
position: absolute;
bottom: 4rem;
right: 4rem;
.date {

#date {
text-align: right;
font-size: 2.3rem;
}
Expand Down Expand Up @@ -113,7 +116,7 @@
}
#first-view {
height: unset;
.buttons {
#buttons {
display: flex;
flex-wrap: wrap;
$margin: 0.25rem;
Expand Down