Skip to content

Commit 3a7f2c0

Browse files
committed
accepted changes
2 parents eaa10fe + 39385a7 commit 3a7f2c0

File tree

4 files changed

+11948
-56
lines changed

4 files changed

+11948
-56
lines changed

Diff for: assets/css/main.css

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
.page-enter-active, .page-leave-active {
22
transition: all .45s ease-in-out;
33
transition: all .45s cubic-bezier(.55,0,.1,1);
4-
5-
// transform: translate(30px, 0);
4+
/* transform: translate(30px, 0); */
65
}
76
.page-enter, .page-leave-active {
87
opacity: 0;

Diff for: layouts/default.vue

+40-42
Original file line numberDiff line numberDiff line change
@@ -33,44 +33,42 @@
3333
<v-toolbar-title v-text="title"></v-toolbar-title>
3434
<v-spacer></v-spacer>
3535
<div v-if="user" id="user" class="text-xs-center">
36-
<v-menu
37-
offset-x
38-
:close-on-content-click="false"
39-
:nudge-top="200"
40-
v-model="menu">
41-
<v-btn icon slot="activator"><v-icon medium>settings</v-icon></v-btn>
42-
<v-card>
43-
<v-list>
44-
<v-list-tile avatar>
45-
<v-list-tile-avatar>
46-
<img :src="$store.state.user.photoURL" alt="John">
47-
</v-list-tile-avatar>
48-
<v-list-tile-content>
49-
<v-list-tile-title v-if="user.displayName">{{user.displayName}}</v-list-tile-title>
50-
</v-list-tile-content>
51-
</v-list-tile>
52-
<v-divider></v-divider>
53-
54-
<v-list-tile>
55-
<v-spacer></v-spacer>
56-
<v-list-tile-action>
57-
<v-btn primary class="mt-2" color="primary" @click.native="logout">
58-
Logout
59-
</v-btn>
60-
</v-list-tile-action>
61-
</v-list-tile>
62-
</v-list>
63-
</v-card>
64-
</v-menu>
36+
<v-menu
37+
offset-x
38+
:close-on-content-click="false"
39+
:nudge-top="200"
40+
v-model="menu">
41+
<v-btn icon slot="activator"><v-icon medium>settings</v-icon></v-btn>
42+
<v-card>
43+
<v-list>
44+
<v-list-tile avatar>
45+
<v-list-tile-avatar>
46+
<img :src="$store.state.user.photoURL" alt="John">
47+
</v-list-tile-avatar>
48+
<v-list-tile-content>
49+
<v-list-tile-title v-if="user.displayName">{{user.displayName}}</v-list-tile-title>
50+
</v-list-tile-content>
51+
</v-list-tile>
52+
<v-divider></v-divider>
6553

54+
<v-list-tile>
55+
<v-spacer></v-spacer>
56+
<v-list-tile-action>
57+
<v-btn primary class="mt-2" color="primary" @click.native="logout">
58+
Logout
59+
</v-btn>
60+
</v-list-tile-action>
61+
</v-list-tile>
62+
</v-list>
63+
</v-card>
64+
</v-menu>
6665
</div>
67-
6866
</v-toolbar>
6967
<v-content>
70-
<v-container>
71-
<nuxt />
72-
</v-container>
73-
</v-content>
68+
<v-container fluid>
69+
<nuxt />
70+
</v-container>
71+
</v-content>
7472
<v-footer :fixed="fixed" app>
7573
<span>&copy; 2017</span>
7674
</v-footer>
@@ -86,7 +84,7 @@ export default {
8684
items: [
8785
{ icon: 'home', title: 'Welcome', to: '/' },
8886
{ icon: 'info', title: 'About', to: '/about' },
89-
{ icon: 'person', title: 'Admin', to: '/admin' },
87+
{ icon: 'person', title: 'Admin', to: '/admin' }
9088
// { icon: 'store', title: 'FireStore', to: '/firestore' }
9189
],
9290
title: 'Nuxt Firebase Auth',
@@ -106,31 +104,31 @@ export default {
106104
})
107105
}
108106
}
109-
}
107+
}
110108
</script>
111109

112110
<style>
113-
.navigation-drawer>.list:not(.list--dense) .list__tile {
111+
.v-navigation-drawer>.list:not(.list--dense) .list__tile {
114112
font-size: 17px;
115113
}
116114
.avatar {
117115
max-width: 75px;
118116
}
119117
120-
.list__tile--active.list__tile.list__tile--link {
118+
/* .list__tile--active.list__tile.list__tile--link {
119+
120+
} */
121121
122-
}
123122
a.nuxt-link-exact-active.list__tile--active.list__tile.list__tile--link {
124123
font-weight: 900 !important;
125124
color: #3f51b5 !important;
126125
}
127-
.list__tile--link {
126+
.v-list__tile--link {
128127
border-left: 10px solid transparent;
129128
}
130-
.list__tile--link.list__tile--active {
129+
.v-list__tile--link.v-list__tile--active {
131130
color: rgba(0,0,0,.87);
132131
border-left: 10px solid gray;
133132
}
134133
135-
136134
</style>

0 commit comments

Comments
 (0)