diff --git a/cfg_locale b/cfg_locale deleted file mode 120000 index 73cc88f..0000000 --- a/cfg_locale +++ /dev/null @@ -1 +0,0 @@ -cfg_freeplanet.app/ \ No newline at end of file diff --git a/src/App.scss b/src/App.scss index 1e94840..11310ea 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,3 +1,44 @@ +body { + font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + color: #a7a7a7; + line-height: 1.5; + //font-size: 1rem; +} + +html { + font-size: 100%; // default font size (browser 16) -> (10 62.5%) +} + +p { + font-size: 125%; // default font size (browser 16) -> (10 62.5%) + margin: 0 0 8px; +} + +$grayshadow: #555; + +$graytext: #555; + +$textcol: blue; +$textcol_scuro: darkblue; +$heightBtn: 100%; + +.flex-item { + // background-color: #d5e2eb; + display: flex; + padding: 2px; + margin: 2px; + margin-left: 3px; + margin-right: 3px; + color: #000; + font-size: 1rem; + height: $heightBtn; + line-height: $heightBtn; + vertical-align: middle; + //flex: 0 0 100%; +} + .fade-enter-active, .fade-leave-active { transition: opacity .2s; } @@ -40,7 +81,8 @@ } } -.my-notif-class { + +.my-notif-class{ font-weight: bold; } @@ -53,15 +95,14 @@ .lowperc { color: red; } - .medperc { color: blue; } - .highperc { color: green; } + .hide-if-small { @media (max-width: 600px) { display: none; @@ -74,24 +115,200 @@ } } -.tothebottomfixed { - left: 0; - right: 0; - position: fixed; - z-index: 9999; - box-sizing: border-box; - overflow: hidden; - margin: 0 auto; - bottom: 10px; +.links, .links a { + text-shadow: 1px 1px 1px #555 !important; + // font-weight: bold; + color: cornflowerblue !important; +} +.links:hover { + color: white !important; } -.tothetop { - left: 0; - right: 0; - position: fixed; - z-index: 9999; - box-sizing: border-box; - overflow: hidden; - margin: 0 auto; - top: 20px; +.text-subtitle1 { + font-size: 1.35rem; + font-weight: 400; + line-height: 1.75rem; + text-shadow: .25 .25rem .5rem $grayshadow; + letter-spacing: .00937em; + &.big { + font-size: 1.5rem; + } +} + +.text-subtitle2 { + font-size: 1.15rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; + text-shadow: .25rem .25rem .5rem $grayshadow; +} + +.text-subtitle3 { + font-size: 1rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; +} + + +@media (max-width: 718px) { + // PER VERSIONE MOBILE + + p { + font-size: 100%; // default font size (browser 16) -> (10 62.5%) + font-family: "Abyssinica SIL", serif; + text-justify: auto; + margin: 0 0 4px; + } + + .text-subtitle1 { + font-size: 1.25rem; + } + .text-subtitle2 { + font-size: 1rem; + } + .text-subtitle3 { + font-size: 0.75rem; + } + + .cltexth3 { + font-size: 1.25rem; + } + + .text-big{ + font-size: 1.25rem; + } + +} + +.my-card { + width: 100%; + max-width: 350px; + min-width: 300px; + padding: 1rem 1rem; + + box-shadow: none; +} + +.text-trans { + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); +} + +.text-spacetrans { + padding: 0 !important; + background: rgba(0,0,0,0.3) !important; + border-radius: 30px !important; +} + +.text-shadow { + text-shadow: .15rem .15rem .15rem $grayshadow; +} + +.citazione{ + font-size: 0.75rem; + font-family: "Lucida Calligraphy", serif; +} + +.cltexth3, .cltexth2, .cltexth4 { + font-size: 1.25rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .01em; + text-align: center !important; +} + +.cltexth4 { + font-size: 1rem; +} + +.cltexth2 { + font-size: 1.5rem; +} + +.boldhigh, .boldop, .text-big{ + font-weight: 500; + text-shadow: .05rem .05rem .05rem $grayshadow; +} +.boldop{ + color: darkblue; +} + +.text-big{ + font-size: 1.5rem; +} + + + +.center_to_image{ + position: absolute; + left: 0; + top: 50%; + transform: translateY(-50%); + width: 100%; + text-align: center; +} + + +.center_img { + display: block; + margin-left: auto; + margin-right: auto; +} + +.padding_cell { + padding: 0.75rem 0.5rem; +} + +@media (max-width: 3000px) { + .q-parallax__media > img { + max-height: 550px !important; + min-width:inherit !important; + min-height: inherit !important; + } +} + +@media (max-width: 1000px) { + .q-parallax__media > img { + max-height: 500px !important; + min-width:inherit !important; + min-height: inherit !important; + } +} + +@media (max-width: 800px) { + .q-parallax__media > img { + max-height: 450px !important; + min-width:inherit !important; + min-height: inherit !important; + } +} + + +@media (max-width: 718px) { + .q-parallax__media > img { + max-height: 450px !important; + min-height: inherit !important; + min-width:100% !important; + } +} + +// preloading images: +@media screen { + div#preloader { + position: absolute; + left: -9999px; + top: -9999px; + } + div#preloader img { + display: block; + } +} +@media print { + div#preloader, + div#preloader img { + visibility: hidden; + display: none; + } } diff --git a/src/App.ts b/src/App.ts index 6602178..479254e 100644 --- a/src/App.ts +++ b/src/App.ts @@ -7,10 +7,14 @@ import { Header } from './components/Header' import globalroutines from './globalroutines/index' import { GlobalStore } from './store/Modules' +import { toolsext } from '@src/store/Modules/toolsext' +import { BannerCookies, CPreloadImages } from '@components' +import { static_data } from '@src/db/static_data' @Component({ components: { - appHeader: Header + appHeader: Header, + BannerCookies, CPreloadImages }, router }) @@ -47,7 +51,7 @@ export default class App extends Vue { // console.log('window.location.href', window.location.href) let chiamaautologin = true - this.listaRoutingNoLogin.forEach(mystr => { + this.listaRoutingNoLogin.forEach((mystr) => { if (window.location.href.includes(mystr)) { chiamaautologin = false } @@ -59,9 +63,9 @@ export default class App extends Vue { .then((loadstorage) => { if (loadstorage) { - if (UserStore.state.lang !== '') { + if (toolsext.getLocale() !== '') { // console.log('SETLOCALE :', this.$i18n.locale) - this.$i18n.locale = UserStore.state.lang // Set Lang + this.$i18n.locale = toolsext.getLocale() // Set Lang } else { UserStore.mutations.setlang(this.$i18n.locale) } @@ -81,5 +85,7 @@ export default class App extends Vue { } - + get static_data() { + return static_data + } } diff --git a/src/components/CImgText/CImgText.ts b/src/components/CImgText/CImgText.ts index cc7dd65..81926c6 100644 --- a/src/components/CImgText/CImgText.ts +++ b/src/components/CImgText/CImgText.ts @@ -25,6 +25,7 @@ import { Screen } from 'quasar' }) export default class CImgText extends Vue { @Prop({ required: false, default: '' }) public src: string + @Prop({ required: false, default: '' }) public src2: string @Prop({ required: false, default: 'myclimg' }) public class1: string @Prop({ required: false, default: '' }) public style1: string } diff --git a/src/components/CImgText/CImgText.vue b/src/components/CImgText/CImgText.vue index bffb077..5d81384 100644 --- a/src/components/CImgText/CImgText.vue +++ b/src/components/CImgText/CImgText.vue @@ -4,6 +4,7 @@
-