Skip to content

Commit

Permalink
🔀 Merge pull request #88 from AyakaLab/nekomeowww/dev
Browse files Browse the repository at this point in the history
📱 Optimize responsive design
  • Loading branch information
nekomeowww authored Sep 17, 2020
2 parents 3167bf7 + 2ba3238 commit 75d26e4
Show file tree
Hide file tree
Showing 13 changed files with 381 additions and 35 deletions.
2 changes: 1 addition & 1 deletion src/components/Album/AlbumInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export default {
.content();
.word-limit();
height: 30px;
background: #F9C1D7;
background-color: #FAE5ED;
border-radius: 2px;
display: inline-block;
color: #E56D9B;
Expand Down
137 changes: 133 additions & 4 deletions src/components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="header" :class="frosted && 'frosted'">
<div class="link-container">
<router-link :to="{ name: 'Landing' }" class="link">
<img src="../assets/logo.png" style="height: 3rem">
<img src="../assets/logo.png">
</router-link>
<router-link :to="{ name: 'Landing' }" class="link text-link">
ArcLight
Expand All @@ -14,8 +14,16 @@
About
</router-link>
</div>
<div class="mobile-nav mobile-search-bar">
<v-btn icon color="white">
<v-icon>mdi-magnify</v-icon>
</v-btn>
</div>
<Search class="search-bar"/>
<v-btn v-if="!isLoggedIn" depressed large color="#E56D9B" class="sign" @click="show = true" :outlined="loginBtnLoading" :loading="loginBtnLoading">Login</v-btn>
<v-btn v-if="isLoggedIn" class="mobile-nav mobile-upload" fab dark x-small color="#E56D9B" @click="uploadMusic">
<v-icon dark>mdi-upload</v-icon>
</v-btn>
<v-btn
v-if="isLoggedIn"
class="upload"
Expand All @@ -30,8 +38,24 @@
</v-avatar>
Upload Music
</v-btn>
<v-menu v-if="isLoggedIn" offset-y>

<v-menu v-if="isLoggedIn" offset-y dark class="user-menu">
<template v-slot:activator="{ on, attrs }">
<v-btn
class="mobile-nav mobile-user"
dark
fab
x-small
color="#FFF"
v-bind="attrs"
v-on="on"
>
<miniAvatar
:size="30"
v-if="userAvatar"
:src="userAvatar"
/>
</v-btn>
<v-btn
depressed
class="user"
Expand Down Expand Up @@ -63,11 +87,26 @@
</v-list-item>
</v-list>
</v-menu>

<v-btn
v-if="!isLoggedIn"
fab
dark
x-small
color="#E56D9B"
class="mobile-nav mobile-sign"
@click="show = true"
:outlined="loginBtnLoading"
:loading="loginBtnLoading"
>
<v-icon dark>mdi-login</v-icon>
</v-btn>

<v-dialog
v-model="show"
max-width="290"
>
<v-card>
<v-card style="width: 50vw">
<v-card-title class="headline">Upload your key</v-card-title>
<v-file-input
v-model="file"
Expand All @@ -81,6 +120,7 @@
color="#E56D9B"
v-model="writeCookie"
label="Save Key for this Session for 7 days"
style="padding:0 20px;"
>
</v-checkbox>
<v-card-actions>
Expand Down Expand Up @@ -148,12 +188,14 @@
import { mapActions, mapState } from 'vuex'
import Search from './Search.vue'
import miniAvatar from '@/components/User/MiniAvatar'
import { clearCookie, getCookie, setCookie } from '../util/cookie'
export default {
components: {
Search
Search,
miniAvatar
},
data () {
return {
Expand Down Expand Up @@ -262,6 +304,10 @@ export default {

<style lang="less" scoped>
.mobile-nav {
display: none;
}
.header {
padding: 20px 0 0;
display: flex;
Expand Down Expand Up @@ -303,6 +349,9 @@ export default {
.link {
margin-left: .75rem;
font-size: 1.2rem;
img {
height: 3rem;
}
}
.text-link {
Expand Down Expand Up @@ -391,4 +440,84 @@ export default {
}
}
}
@media screen and (max-width: 1200px) {
.link {
font-size: 20px;
img {
height: 2rem;
}
}
.upload {
padding: 0 10px !important;
height: 38px !important;
font-size: 12px;
/deep/ i {
font-size: 18px !important;
}
}
.user {
padding: 0 10px !important;
height: 38px !important;
font-size: 12px;
}
.search-bar {
display: none;
}
.mobile-search-bar {
display: block;
margin-right: 10px;
}
}
@media screen and (max-width: 768px) {
.link {
font-size: 16px;
}
.upload {
display: none;
}
.mobile-upload {
display: block;
margin-right: 16px;
}
.user {
display: none;
}
.mobile-user {
display: block;
margin-right: .75rem;
}
.sign {
display: none;
}
.mobile-sign {
display: block;
margin-right: .75rem;
}
}
@media screen and (max-width: 640px) {
}
@media screen and (max-width: 480px) {
.link {
font-size: 15px;
img {
height: 1.8rem;
}
}
.link-container {
margin-left: 8px;
margin-top: 5px;
}
}
</style>

<style lang="less">
/deep/ .theme--light .v-list {
background-color: #333;
}
</style>
20 changes: 20 additions & 0 deletions src/components/Song/AlbumCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,24 @@ a {
}
}
}
@media screen and (max-width: 1200px) {
.card-img {
height: 128px;
}
}
@media screen and (max-width: 992px) {
.card-img {
height: 100px !important;
width: 100px !important;
}
.record {
min-width: 100px !important;
min-height: 100px !important;
height: 100px !important;
width: 100px !important;
margin-left: -80px !important;
margin-top: 0px !important;
}
}
</style>
18 changes: 18 additions & 0 deletions src/components/Song/SingleCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,22 @@ a {
.word-limit();
}
}
@media screen and (max-width: 1200px) {
.card-img {
height: 128px;
}
}
@media screen and (max-width: 992px) {
.card-img {
height: 100px;
width: 100px;
}
}
@media screen and (max-width: 768px) {
}
@media screen and (max-width: 640px) {
}
@media screen and (max-width: 480px) {
}
</style>
32 changes: 32 additions & 0 deletions src/pages/About.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<template>
<div>
<spaceLayout>
<div class="about-container">
<div class="about-title">
Why <span class="pink-text">ArcLight</span> ?
</div>
<div class="about-subtitle">
about Project <span class="pink-text">ArcLight</span>
</div>
</div>
</spaceLayout>
</div>
</template>
Expand All @@ -17,3 +25,27 @@ export default {
}
}
</script>

<style lang="less" scoped>
.about-container {
margin: 80px auto 20px;
max-width: 840px;
width: 100%;
padding: 0 20px;
text-align: start;
}
.about-title {
font-size: 32px;
color: white;
}
.about-subtitle {
font-size: 20px;
color: white;
}
.pink-text {
color: #EA6290;
}
</style>
14 changes: 12 additions & 2 deletions src/pages/Landing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -193,20 +193,30 @@ export default {
}
}
@media screen and (max-width: 600px) {
@media screen and (max-width: 640px) {
#title {
font-size: 4rem;
letter-spacing: 1rem;
}
}
@media screen and (max-width: 400px) {
@media screen and (max-width: 480px) {
#title {
font-size: 2rem;
letter-spacing: 0.5rem;
}
#subtitle span {
font-size: 16px;
}
.start-btn {
height: 28px !important;
padding: 2 5px !important;
font-size: 10px;
}
.about-btn {
height: 28px !important;
padding: 2 5px !important;
font-size: 10px;
}
}
</style>
Loading

0 comments on commit 75d26e4

Please sign in to comment.