WSL/SLF GitLab Repository

Commit 3ca5fba6 authored by Dominik Haas's avatar Dominik Haas
Browse files

fix(global_fonts): font overwriting is done in the app.vue all in one place,...

fix(global_fonts): font overwriting is done in the app.vue all in one place, remove any other definitions of fonts
parent cbae2f18
Pipeline #1558 failed with stages
in 19 minutes and 28 seconds
{
"name": "envidat.ch",
"version": "0.7.43",
"version": "0.7.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "envidat.ch",
"version": "0.7.43",
"version": "0.7.5",
"dependencies": {
"@amcharts/amcharts5": "^5.2.2",
"@geoman-io/leaflet-geoman-free": "^2.13.0",
{
"name": "envidat.ch",
"version": "0.7.5",
"version": "0.7.51",
"private": true,
"description": "EnviDat frontend with vue",
"author": "Dominik Haas-Artho",
......
......@@ -694,12 +694,23 @@ export default {
$font-family: 'Raleway', sans-serif;
.envidat-font-overwrite {
.headline,
font-family: $font-family, sans-serif !important;
[class*='display-'],
[class*='text-'] {
font-family: $font-family, sans-serif !important;
}
font-family: $font-family, sans-serif !important;
[class*='headerTitle'] {
font-family: 'Baskervville', serif !important;
font-weight: 400;
opacity: 1;
text-shadow: 0 1px 2px rgba(255, 255, 255, 0.7);
}
[class*='envidatTitle'] {
font-family: 'Baskervville', serif !important;
}
}
</style>
......@@ -771,8 +782,7 @@ $font-family: 'Raleway', sans-serif;
}
.envidatTitle {
font-family: "Baskervville", serif !important;
letter-spacing: 0em !important;
letter-spacing: 0 !important;
}
.metadataInfoIcon,
......
......@@ -80,7 +80,5 @@ export default {
</script>
<style scoped>
.dataproducer_title {
font-family: 'Baskervville', serif !important;
}
</style>
......@@ -52,6 +52,7 @@
import dataCreatorImg from '@/modules/projects/assets/data_creator.jpg';
export default {
name: 'DataProducerCard',
props: {
titleText: String,
loginText: String,
......@@ -77,7 +78,5 @@ export default {
</script>
<style scoped>
.dataproducer_title {
font-family: 'Baskervville', serif !important;
}
</style>
......@@ -2,7 +2,7 @@
<v-col cols="12" class="pa-0" style="position: relative;">
<v-row class="text-container" align="center" justify="center">
<v-col
class="text-center text"
class="text-center text headerTitle"
cols="12"
:class="{
'display-3': $vuetify.breakpoint.mdAndUp,
......@@ -49,8 +49,7 @@ export default {
<style scoped>
.text {
font-family: 'Baskervville', serif !important;
letter-spacing: 0em !important;
letter-spacing: 0 !important;
text-shadow: 1px 1px 3px rgba(255, 255, 255, 0.7);
}
.text-container {
......
......@@ -78,7 +78,5 @@ export default {
</script>
<style scoped>
.dataproducer_title {
font-family: 'Baskervville', serif !important;
}
</style>
......@@ -18,7 +18,7 @@
/>
</v-col>
<v-col cols="7" class="text-h5 cardTitle px-4" align-self="center">
<v-col cols="7" class="text-h5 px-4" align-self="center">
{{ title }}
</v-col>
</v-row>
......@@ -98,14 +98,6 @@ export default {
</script>
<style scoped>
.cardTitle {
font-family: 'Baskervville', serif !important;
}
.compactTitle {
font-size: 15px !important;
line-height: 1.3em !important;
}
.v-card__media img {
width: inherit !important;
......
......@@ -640,9 +640,7 @@ export default {
</script>
<style scoped>
.envidatTitle {
font-family: 'Baskervville', serif !important;
}
</style>
<style>
......
......@@ -95,9 +95,6 @@ export default {
</script>
<style scoped>
.envidatTitle {
font-family: 'Baskervville', serif !important;
}
.mt-md-pct {
margin-top: 15%;
......
......@@ -464,13 +464,6 @@ export default {
<style scoped>
.headerTitle {
font-family: 'Baskervville', serif !important;
font-weight: 400;
opacity: 1;
text-shadow: 0 1px 2px rgba(255, 255, 255, 0.7);
}
.headerInfo {
font-weight: 400;
opacity: 0.85;
......
......@@ -139,10 +139,4 @@ export default {
<style scoped>
.headerTitle {
font-family: 'Baskervville', serif !important;
font-weight: 400;
opacity: 1;
}
</style>
......@@ -131,8 +131,5 @@ export default {
</script>
<style scoped>
.bodyTitle {
font-family: 'Baskervville', serif !important;
font-weight: 700 !important;
}
</style>
......@@ -59,8 +59,5 @@ export default {
</script>
<style scoped>
.bodyTitle {
font-family: 'Baskervville', serif !important;
font-weight: 700 !important;
}
</style>
// @import url("https://fonts.googleapis.com/css2?family=Libre+Baskerville:wght@400;700&family=Raleway:wght@400;500;700&display=swap")
@import url("https://fonts.googleapis.com/css2?family=Baskervville&family=Raleway:wght@400;500;700&display=swap")
$body-font-family: 'Raleway', sans-serif
// @import url("https://fonts.googleapis.com/css2?family=Baskervville&family=Raleway:wght@400;500;700&display=swap")
@import "vuetify/src/styles/styles.sass"
@import "~vuetify/src/styles/styles.sass"
$body-font-family: 'Raleway', sans-serif
@import "vuetify/src/components/VDialog/_variables.scss"
@import "~vuetify/src/components/VDialog/_variables.scss"
$dialog-max-height: 97.5% !important
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment