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.

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

Index83 #90

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open
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
11 changes: 11 additions & 0 deletions components/detail/Events.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,15 @@ export default {
th {
text-align: center;
}
@media screen and (max-width: 1024px) {
.p-Events {
margin-left: 20px;
}
}
@media screen and (max-width: 768px) {
.p-Events {
width: auto;
margin-left: 0;
}
}
</style>
2 changes: 1 addition & 1 deletion components/detail/FacultyPieChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default {
</script>
<style scoped>
.p-faculty-constitution {
margin: 20px;
margin: 20px 0;
text-align: center;
padding: 30px;
}
Expand Down
4 changes: 2 additions & 2 deletions components/home/Thumbnail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ export default {
return this.options.people === '2' && this.data.basicInfo[0].members <= 80
},
gradeJudgement() {
if (this.options.grade === '' || this.options.grade === 2) {
if (this.options.grade === '') {
return true
}
return this.options.grade === String(this.data.basicInfo[0].canJoinGrade)
return true
},
},
async mounted() {
Expand Down
31 changes: 24 additions & 7 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,40 @@ export default {
** See https://nuxtjs.org/api/configuration-head
*/
head: {
title: process.env.npm_package_name || '',
title: '【DTL NAVI】同志社大学 テニスサークル',
titleTemplate: '%s - DTL NAVI',
meta: [
{ charset: 'utf-8' },
{ name: 'viewport', content: 'width=device-width, initial-scale=1' },
{
hid: 'description',
name: 'description',
content: process.env.npm_package_description || '',
content:
'同志社大学のテニスサークルの一覧を掲載しています。活動日程から、ビラのダウンロードまで様々な用途でご利用いただけます。',
},
],
link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }],
script: [
{
src:
'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.bundle.js',
hid: 'keywords',
name: 'keywords',
content: '同志社 テニスサークル テニス サークル 新歓',
},
{ hid: 'og:site_name', property: 'og:site_name', content: 'DTL NAVI' },
{ hid: 'og:type', property: 'og:type', content: 'website' },
{ hid: 'og:url', property: 'og:url', content: 'https://dtlnavi.com' },
{ hid: 'og:title', property: 'og:title', content: 'DTL NAVI' },
{
hid: 'og:description',
property: 'og:description',
content:
'同志社大学のテニスサークルの一覧を掲載しています。活動日程から、ビラのダウンロードまで様々な用途でご利用いただけます。',
},
{
hid: 'og:image',
property: 'og:image',
content: 'https://dtlnavi.com/img/headerImage.png',
},
],
link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }],
script: [],
},
/*
** Global CSS
Expand Down
2 changes: 1 addition & 1 deletion pages/detail/_group/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
</div>
<div class="p-gform">
<a
:href="data.contactForm"
id="#"
:href="data.contactForm"
target="_blank"
class="link-bt text_button"
>お問い合わせ</a
Expand Down
12 changes: 6 additions & 6 deletions pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
<option value="2">いつでも</option>
</select>
</div>
<div class="p-search" v-if="isDisplay">
<div v-if="isDisplay" class="p-search">
<a class="link-bt text_button">上記の条件で検索</a>
</div>
</div>
Expand Down Expand Up @@ -258,6 +258,8 @@ export default {
<style lang="scss" scoped>
.p-top {
padding: 0 70px;
margin: auto;
max-width: 1200px;
}
.p-title {
display: flex;
Expand All @@ -278,16 +280,14 @@ export default {
margin: 4% 0 2% 0;
}
.p-menu {
margin-top: 30px;
padding: 10px 40px;
}
ul {
list-style: none;
}
.p-menu-list_button ul {
display: flex;
margin-top: 3%;
margin-bottom: 7%;
margin: 1% 0;
}
.p-menu-list_button ul li {
margin: auto 5% auto 0;
Expand Down Expand Up @@ -336,13 +336,13 @@ img {
text-align: center;
}
/*レスポンシブ*/
@media screen and (max-width: 1024px) {
@media screen and (max-width: 1300px) {
.p-menu-list_button ul li h2 {
margin-bottom: 10px;
width: 144px;
}
}
@media screen and (max-width: 768px) {
@media screen and (max-width: 900px) {
.p-sp-menu {
padding-top: 1px;
margin-bottom: 20px;
Expand Down