surya/freeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Booking

Browse Source
This commit is contained in:
Paolo Arena
2019-10-10 16:02:47 +02:00
committed by GitHub
parent 105d01904b e2bb31dbce
commit 19eadc3117
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/Header/Header.ts
View File

@@ -320,7 +320,6 @@ export default class Header extends Vue {
get mySurname() {
return UserStore.state.surname
}
get Verificato() {
return UserStore.state.verified_email
}

6
src/components/Header/Header.vue
View File

@@ -125,12 +125,12 @@
<div id="profile">
<q-img class="absolute-top" src="../../statics/images/landing_first_section.png"
style="height: 150px">
<div class="absolute-bottom bg-transparent text-black">
<div class="absolute-bottom bg-transparent text-black center_img">
<q-avatar class="q-mb-sm">
<q-avatar class="q-mb-sm center_img">
<img src="../../statics/images/avatar-1.svg">
</q-avatar>
<div v-if="Username" class="text-weight-bold">{{ Username }}</div>
<div v-if="Username" class="text-weight-bold text-user">{{ Username }} - {{ Name }}</div>
<div v-else class="text-italic">{{ $t('user.loggati') }}</div>
<!--<span class="text-white" v-if="Verificato"> {{$t('reg.verificato')}} </span>-->

6
src/db/static_data.ts
View File

@@ -256,8 +256,6 @@ const lang_available: ILang[] = [
// { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' },
]
const preLoadImages: IPreloadImages[] = []
const functionality: IFunctionality = {
SHOW_USER_MENU: true,
SHOW_IF_IS_SERVER_CONNECTION: false,
@@ -265,12 +263,10 @@ const functionality: IFunctionality = {
ENABLE_PROJECTS_LOADING: true,
SHOW_NEWSLETTER: false,
SHOW_ONLY_POLICY: false,
BOOKING_EVENTS: false
EVENTS_CAN_BOOKING: false
}
export const static_data = {
routes,
functionality,
ds_operatori,
lang_available,

8
src/root/home/home.scss
View File

@@ -27,7 +27,7 @@ h4 {
}
.landing_background {
background: #000 url(../../statics/images/cover.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
background-size: cover
}
@@ -281,17 +281,17 @@ body.mobile .landing:before {
}
.homep-cover-img-1 {
background: #000 url(../../statics/images/cover.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}
.homep-cover-img-2 {
background: #000 url(../../statics/images/hand_people.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto2.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}
.homep-cover-img-3 {
background: #000 url(../../statics/images/cibo_sano.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto3.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}