Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

129 clarify welcome text block #134

Merged
merged 3 commits into from
Oct 10, 2024
Merged

129 clarify welcome text block #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1627b32
Switch top text icon
hminsky2002 Oct 10, 2024
c725835
add x button to collapse welcome text
hminsky2002 Oct 10, 2024
277746b
check-in latest front-end assets
hminsky2002 Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions archesdataviewer/static/vite_build/.vite/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"index.html": {
"file": "assets/index-wck9c7ec.js",
"file": "assets/index-Cg_bCt7v.js",
"name": "index",
"src": "index.html",
"isEntry": true,
"css": [
"assets/index-B4j-7wFH.css"
"assets/index-j6YdsBDG.css"
]
}
}
1 change: 0 additions & 1 deletion archesdataviewer/static/vite_build/assets/index-B4j-7wFH.css
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions ...tatic/vite_build/assets/index-wck9c7ec.js → ...tatic/vite_build/assets/index-Cg_bCt7v.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions archesdataviewer/static/vite_build/assets/index-j6YdsBDG.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions archesdataviewer/static/vite_build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Arches Data Viewer</title>
<script type="module" crossorigin src="/assets/index-wck9c7ec.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-B4j-7wFH.css">
<script type="module" crossorigin src="/assets/index-Cg_bCt7v.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-j6YdsBDG.css">
</head>
<body>
<div id="app"></div>
Expand Down
33 changes: 27 additions & 6 deletions front-end/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
<div class="toggle-top-text">
<button
type="button"
:class="showTopText ? 'expanded' : 'collapsed'"
:class="showTopText ? 'top-text-button expanded' : 'top-text-button collapsed'"
@click="toggleTopText"
>
<h1>Explore Chicago’s Wabash Arts Corridor</h1>
<ChevronRightIcon class="button-icon" />
<InformationCircleIcon class="button-icon" />
</button>
<button type="button" class="top-text-button x-button" @click="toggleTopText">
<XMarkIcon :class="showTopText ? 'button-icon shown' : 'button-icon hidden'" />
</button>
</div>
<p :class="showTopText ? 'top-text expanded' : 'top-text collapsed'">
Expand Down Expand Up @@ -80,7 +83,7 @@

<script setup lang="ts">
import { ref } from 'vue';
import { ChevronRightIcon } from '@heroicons/vue/24/solid';
import { InformationCircleIcon, XMarkIcon } from '@heroicons/vue/24/outline';
import LeafletMap from '@/components/LeafletMap.vue';
import type {
ImageTileData,
Expand Down Expand Up @@ -172,12 +175,12 @@ main {
max-height: 0;
overflow: hidden;
transition:
max-height 0.6s ease-in-out,
padding 0.3s ease;
max-height 500ms ease-in-out,
padding 300ms ease;
}

.top-text.expanded {
max-height: 400px;
max-height: 350px;
padding-top: 10px;
}

Expand All @@ -186,6 +189,24 @@ main {
padding-top: 0;
}

.top-text-button {
border: none;
}

.toggle-top-text {
display: flex;
flex-direction: row;
}

.x-button {
opacity: 1;
margin-left: auto;
}

.hidden {
opacity: 0;
}

@media screen and (min-width: 940px) {
.welcome {
font-size: var(--wac--font-size--xxl);
Expand Down
3 changes: 2 additions & 1 deletion front-end/src/assets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ button,
width: calc(var(--wac--line-height) * 1em);
height: calc(var(--wac--line-height) * 1em);
transition: transform 100ms ease;
transition: opacity 300ms ease-in-out;

.expanded & {
.chevron-expanded & {
transform: rotate(90deg);
}
}
Expand Down
2 changes: 1 addition & 1 deletion front-end/src/components/LeafletMap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div :class="expandMap ? 'map-container expanded' : 'map-container collapsed'">
<div :class="expandMap ? 'map-container expanded chevron-expanded' : 'map-container collapsed'">
<div class="toggle-map-container">
<button type="button" class="toggle-map" @click="expandMap = !expandMap">
<span>Explore the artwork geographically</span>
Expand Down
4 changes: 3 additions & 1 deletion front-end/src/components/ResourceDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<div>
<button
type="button"
:class="showMetadata ? 'toggle-metadata expanded' : 'toggle-metadata collapsed'"
:class="
showMetadata ? 'toggle-metadata expanded chevron-expanded' : 'toggle-metadata collapsed'
"
@click="toggleMetadata"
>
<span>{{ showMetadata ? 'Hide arches metadata' : 'Show arches metadata' }}</span>
Expand Down