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

Jump to bottom

UI new changes #343

Merged
merged 59 commits into from
Aug 28, 2023
Merged

UI new changes #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
d4ffdd8
hiding zipcode from start screen
hsjoshi28 May 17, 2023
a8b4a9e
code changes
hsjoshi28 May 17, 2023
a501bbe
code changes
hsjoshi28 May 19, 2023
f6e6ab4
code changes
hsjoshi28 May 22, 2023
4c5a213
code changes
hsjoshi28 May 23, 2023
af05511
code cleanup
hsjoshi28 May 23, 2023
01ab275
code cleanup
hsjoshi28 May 23, 2023
964163b
code cleanup
hsjoshi28 May 23, 2023
cf9c6b5
WIP: Home page
hsjoshi28 Jun 2, 2023
5ac8097
Merge branch 'main' of https://github.com/cns-iu/xmacroscope into ui-…
hsjoshi28 Jun 6, 2023
b6f5ea3
added styles
hsjoshi28 Jun 6, 2023
1877043
added components
hsjoshi28 Jun 6, 2023
87b3370
added components
hsjoshi28 Jun 7, 2023
48d9f37
styles fixes for media tags
hsjoshi28 Jun 7, 2023
d6a1c88
added media tags
hsjoshi28 Jun 8, 2023
500ad42
added styles and modules
hsjoshi28 Jun 12, 2023
4681435
Media Page and styles
hsjoshi28 Jun 13, 2023
a16a49b
code changes and styling fixes
hsjoshi28 Jun 13, 2023
720d23b
code changes
hsjoshi28 Jun 13, 2023
7743dcc
code changes
hsjoshi28 Jun 14, 2023
68e56ff
style changes
hsjoshi28 Jun 16, 2023
8511249
Home page
hsjoshi28 Jun 18, 2023
e3f8089
research page styles
hsjoshi28 Jun 18, 2023
47db691
Media Page
hsjoshi28 Jun 18, 2023
ac3c3b9
Resource Page
hsjoshi28 Jun 18, 2023
bfa7462
styling changes for resources
hsjoshi28 Jun 18, 2023
d2d926c
Added links to home page
hsjoshi28 Jun 18, 2023
1348730
fixed format
hsjoshi28 Jun 18, 2023
09b413f
added links to media page and fixed format
hsjoshi28 Jun 18, 2023
3304bc0
added links to research page and fixed format
hsjoshi28 Jun 18, 2023
48a5c2b
added link resources page,fixed format,added files
hsjoshi28 Jun 18, 2023
8860844
updated links of home page
hsjoshi28 Jun 21, 2023
a76b479
in-screen video player
hsjoshi28 Jun 21, 2023
c0f818b
background image sizing
hsjoshi28 Jun 21, 2023
dcb4af9
url changes
hsjoshi28 Jun 23, 2023
6dfdf53
url changes
hsjoshi28 Jun 23, 2023
4693163
hash strategy changes for site visualization
hsjoshi28 Jun 23, 2023
03f0378
URL Changes for visualizations
hsjoshi28 Jun 23, 2023
0b72189
URL changes for site visualizations
hsjoshi28 Jun 23, 2023
ce1e265
URL changes for site-vis
hsjoshi28 Jun 23, 2023
7dc24f1
Re-enable output hashing
bherr2 Jun 23, 2023
40033b7
Merge branch 'ui-changes' of https://github.com/cns-iu/xmacroscope in…
hsjoshi28 Jun 23, 2023
9d36b2d
Katy Last name fix, deleted media video thumbnails
hsjoshi28 Jun 30, 2023
90b764e
Merge branch 'main' of https://github.com/cns-iu/xmacroscope into ui-…
hsjoshi28 Jul 3, 2023
d29cb85
meta charset tag
hsjoshi28 Jul 3, 2023
df2d313
deleted thumbnails of videos
hsjoshi28 Jul 3, 2023
5e5d314
downwards arrow
hsjoshi28 Aug 8, 2023
b59c6fe
code changes
hsjoshi28 Aug 9, 2023
83c8a4c
styling changes
hsjoshi28 Aug 10, 2023
92b1a51
stying changes
hsjoshi28 Aug 13, 2023
c592c9b
styling changes
hsjoshi28 Aug 14, 2023
ef183b6
page center, more styles
hsjoshi28 Aug 15, 2023
53e1a00
removed blue box, stylings
hsjoshi28 Aug 15, 2023
94a56e7
changed font, issue #2
hsjoshi28 Aug 16, 2023
62ea02d
updated svg, added back button to home
hsjoshi28 Aug 16, 2023
0cdd9f4
home page url changed
hsjoshi28 Aug 16, 2023
27838f1
visualization improved, button font fix
hsjoshi28 Aug 17, 2023
1095c49
button fixes
hsjoshi28 Aug 17, 2023
09888fc
padding changes for home page
hsjoshi28 Aug 28, 2023
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
5 changes: 4 additions & 1 deletion packages/client-mav/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
routerLinkActive #rla="routerLinkActive" [active]="rla.isActive">
{{routeLink.label}}
</a>
<a mat-tab-link href="https://xmacroscope.org/" target="_blank">
xMacroscope
</a>
</nav>
</div>

<router-outlet></router-outlet>
<router-outlet></router-outlet>
10 changes: 1 addition & 9 deletions packages/website-static/assets/age-time-heatmap.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions packages/website-static/assets/arrow_downward.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions packages/website-static/assets/height-time-heatmap.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions packages/website-static/assets/scatterplot-matrix.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions packages/website-static/assets/scatterplot.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 30 additions & 28 deletions packages/website-static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

<head>
<meta charset="utf-8">
<link href="https://fonts.googleapis.com/css2?family=Lexend&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Lexend:wght@400;900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Inter&display=swap" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
<link rel="stylesheet" href="styles.css">
Expand All @@ -24,18 +22,22 @@
</ul>

<!-- The main home page -->

<div class="home-page">
<div class="home-page-contents">
<div class="title">
xMacroscope
</div>
<div class="text-below-title">
A design, build, and research project to study how visitors at science centers understand data visualization
techniques.
<section class="main-page-wrapper">
<div class="home-page">
<div class="home-page-contents">
<div class="title">
xMacroscope
</div>
<div class="text-below-title">
A design, build, and research project to study how visitors at science centers understand data visualization
techniques.
</div>
<div>
<img class="downward-arrow" src="../assets/arrow_downward.svg" alt="Downward arrow">
</div>
</div>
</div>
</div>
</section>

<!-- The About page (below home page)-->

Expand All @@ -45,25 +47,25 @@
About the <br> xMacroscope Platform
</div>

<div class="blue-box"></div>

<div class="text-below-about">
The xMacroscope is an open-source software and technology platform. It will allow us to build science center
exhibit experiences that let visitors construct visualizations using their own experiences.
</div>

<div class="about-button">
<a class="default-button" href="/demo/" target="_blank">
<img class="new-tab-logo" src="../assets/open_in_new.svg" alt="New Tab">
xMacroscope Demo
</a>

<div class="filler"></div>
<div class="about-buttons">
<div class="about-button">
<a class="default-button" href="/demo/" target="_blank">
<img class="new-tab-logo" src="../assets/open_in_new.svg" alt="New Tab">
xMacroscope Demo
</a>
</div>

<a class="default-button" href="https://github.com/cns-iu/xmacroscope" target="_blank">
<img class="new-tab-logo" src="../assets/open_in_new.svg" alt="New Tab">
xMacroscope GitHub
</a>
<div class="about-button">
<a class="default-button" href="https://github.com/cns-iu/xmacroscope" target="_blank">
<img class="new-tab-logo" src="../assets/open_in_new.svg" alt="New Tab">
xMacroscope GitHub
</a>
</div>
</div>

<img class="about-image" src="../assets/scatter-plot.svg" alt="Scatter Plot">
Expand Down Expand Up @@ -147,9 +149,9 @@

<!-- Partnership Section -->

<div class="xM-partnership-page">
<div class="xM-partnership-page-content">
<div class="xM-partnership-page-title">
<div class="partnership-page">
<div class="partnership-page-content">
<div class="partnership-page-title">
xMacroscope is a <br> partnership between:
</div>

Expand Down
Loading
Loading