Skip to content

Commit

Permalink
Merge pull request #133 from earthrise-media/final-design-qa
Browse files Browse the repository at this point in the history
Make final style adjustments
  • Loading branch information
Martin Bernard authored Jan 19, 2024
2 parents 6d19f8c + 4f34f8b commit 6b75e4c
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 27 deletions.
1 change: 0 additions & 1 deletion vacs-map-app/src/LandingPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ a {

<style>
.overlay .disclaimer-wrapper {
justify-content: center;
background: var(--black-80);
}
</style>
9 changes: 7 additions & 2 deletions vacs-map-app/src/MapExplorer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@
<div class="map-overlay desktop">
<div class="overlay-left">
<ExploreSidebar class="interactive" ref="overlayLeftRef" />
<MapLegendCropGroups v-if="showCropGroupMap" class="interactive" :class="{ hidden: showSandAndSoil }"/>
<MapLegend v-else class="interactive" :class="{ hidden: showSandAndSoil }"/>
<MapLegendCropGroups
v-if="showCropGroupMap"
class="interactive"
:class="{ hidden: showSandAndSoil }"
/>
<MapLegend v-else class="interactive" :class="{ hidden: showSandAndSoil }" />
</div>

<div class="overlay-right">
Expand Down Expand Up @@ -222,6 +226,7 @@ button.active:hover {
.hidden {
pointer-events: none;
opacity: 10%;
filter: blur(8px);
}
@media only screen and (max-width: 720px) {
Expand Down
6 changes: 5 additions & 1 deletion vacs-map-app/src/assets/base.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Work+Sans:wght@400;500;600&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Work+Sans:wght@400;500;600;700&display=swap');

:root {
--black: #17191b;
Expand Down Expand Up @@ -43,6 +43,10 @@ body {
-moz-osx-font-smoothing: grayscale;
}

button {
font-family: var(--font-family-body);
}

@font-face {
font-family: PPEiko-thin;
src: url('./fonts/pp-eiko/PPEiko-Thin.otf');
Expand Down
3 changes: 3 additions & 0 deletions vacs-map-app/src/assets/img/checkmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions vacs-map-app/src/components/CardWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,11 @@ const useDarkIndicatorText = computed(() => {
.card-wrapper.dynamic {
height: var(--title-height);
box-shadow: 0 0 0 1px var(--dark-gray);
}
.card-wrapper.dynamic.active {
box-shadow: 0 0 0 1px var(--gray);
height: unset;
}
Expand Down Expand Up @@ -209,6 +211,7 @@ const useDarkIndicatorText = computed(() => {
}
.title-row img {
margin: auto 0;
margin-left: auto;
}
Expand Down
24 changes: 17 additions & 7 deletions vacs-map-app/src/components/ExploreSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,16 @@
<div class="sidebar-section">
<div class="scenario-switch">
<span class="scenarios-title"> emissions scenario </span>
<img
class="info"
src="@/assets/img/info.svg"
alt=""
@click="openScenarioModal(selectedModel)"
/>
<div class="scenario-title">
<span class="scenarios-title"> emissions scenario </span>
<img
class="info"
src="@/assets/img/info.svg"
alt=""
@click="openScenarioModal(selectedModel)"
/>
</div>
<RadioSwitch
v-model="selectedModel"
:options="scenarioOptions"
Expand Down Expand Up @@ -270,4 +273,11 @@ const openScenarioModal = (s) => {
gap: 1rem;
padding-top: 0.5rem;
}
.scenario-title {
display: flex;
flex-direction: row;
gap: 0.25rem;
align-items: center;
}
</style>
10 changes: 7 additions & 3 deletions vacs-map-app/src/components/OverviewTop.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<button @click="copyLink" @mouseleave="linkCopied = false" class="desktop">
<img src="@/assets/img/copy-link.svg" alt="copy-link" />
<span class="copy-link-message">
<img v-if="linkCopied" src="../assets/img/checkmark.svg" alt="" />
{{ linkCopied ? 'Link copied to clipboard' : 'Copy a link to your clipboard' }}
</span>
</button>
Expand Down Expand Up @@ -64,11 +65,11 @@ const copyLink = () => {
.overview-top {
display: flex;
flex-direction: column;
font-family: var(--font-family-h2);
font-family: var(--font-family-header);
font-size: 1.5rem;
gap: 0.5rem;
padding: 1rem var(--page-horizontal-margin) 0.375rem var(--page-horizontal-margin);
background: var(--black-90);
background: var(--black-70);
}
.header-question {
Expand All @@ -93,9 +94,10 @@ const copyLink = () => {
border-radius: 0.125rem;
cursor: default;
width: max-content;
max-width: 12rem;
z-index: 5000;
box-shadow: var(--shadow);
white-space: nowrap;
}
.row {
Expand Down Expand Up @@ -142,6 +144,8 @@ button:hover {
button:hover .copy-link-message,
button:hover .toggle-colormode-message {
display: flex;
gap: 0.5rem;
align-items: center;
}
.button-active {
Expand Down
2 changes: 1 addition & 1 deletion vacs-map-app/src/components/SandAndSoilOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const { soil: soilScheme, sand: sandScheme } = storeToRefs(colorStore)
width: 100%;
min-height: 100%;
backdrop-filter: blur(8px);
background: var(--black-90);
color: var(--white);
Expand All @@ -41,7 +42,6 @@ const { soil: soilScheme, sand: sandScheme } = storeToRefs(colorStore)
justify-content: center;
padding: 1.25rem;
}
h1 {
Expand Down
3 changes: 0 additions & 3 deletions vacs-map-app/src/components/pages/CropTypeOverview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ const showFilters = ref(false)
}
@media only screen and (max-width: 720px) {
.wrapper {
box-shadow: var(--shadow);
}
.desktop {
display: none;
}
Expand Down
18 changes: 9 additions & 9 deletions vacs-map-app/src/stores/mapExplore.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ export const useMapExploreStore = defineStore('mapExplore', () => {
const showCropGroupMap = ref(false)
const cropGroupMetric = ref('max')

return {
selectedMap,
mapPadding,
hoveredId,
hoveredCrop,
return {
selectedMap,
mapPadding,

hoveredId,
hoveredCrop,

showSandAndSoil,
showCropGroupMap,
cropGroupMetric
showCropGroupMap,
cropGroupMetric
}
})

0 comments on commit 6b75e4c

Please sign in to comment.