Skip to content

Commit

Permalink
stairway
Browse files Browse the repository at this point in the history
  • Loading branch information
fiji-flo committed Feb 19, 2024
1 parent 24ca190 commit 35c4ac6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 17 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions client/src/curriculum/landing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
}
}

.landing-ladder {
.landing-stairway {
background-color: var(--background-secondary);
margin: 0;
max-width: 100%;
Expand All @@ -274,7 +274,7 @@
grid-template-columns: 1fr 1.4fr;
}

> #lad1-container {
> #stairway1-container {
--fs: clamp(1rem, calc(3 * calc(100vw / 100)), 1.75rem);
@media screen and (min-width: $screen-lg) {
--fs: clamp(1rem, calc(2 * calc(100vw / 100)), 1.75rem);
Expand All @@ -289,7 +289,7 @@
width: 100%;
}

#lad1 {
#stairway1 {
font-size: var(--fs);
left: 32%;
position: absolute;
Expand All @@ -307,7 +307,7 @@
}
}

> #lad2-container {
> #stairway2-container {
--fs: clamp(0.825rem, calc(1.25 * calc(100vw / 100)), 1rem);
@media screen and (min-width: $screen-md) {
--fs: clamp(0.75rem, calc(100vw / 100), 0.825rem);
Expand All @@ -316,7 +316,7 @@
position: relative;
transform: translateX(-5vw);

#lad2 {
#stairway2 {
font-size: var(--fs);
height: 100%;
left: 0;
Expand Down
14 changes: 7 additions & 7 deletions client/src/curriculum/landing.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactComponent as LandingSVG } from "../../public/assets/curriculum/cur-landing-top.svg";
import { ReactComponent as LandingLadderSVG1 } from "../../public/assets/curriculum/cur-landing-ladder-1.svg";
import { ReactComponent as LandingLadderSVG2 } from "../../public/assets/curriculum/cur-landing-ladder-2.svg";
import { ReactComponent as LandingLadderSVG2Small } from "../../public/assets/curriculum/cur-landing-ladder-2-small.svg";
import { ReactComponent as LandingStairwaySVG1 } from "../../public/assets/curriculum/cur-landing-stairway-1.svg";
import { ReactComponent as LandingStairwaySVG2 } from "../../public/assets/curriculum/cur-landing-stairway-2.svg";
import { ReactComponent as LandingStairwaySVG2Small } from "../../public/assets/curriculum/cur-landing-stairway-2-small.svg";
import { HydrationData } from "../../../libs/types/hydration";
import { CurriculumDoc, CurriculumData } from "../../../libs/types/curriculum";
import { ModulesListList } from "./modules-list";
Expand Down Expand Up @@ -47,11 +47,11 @@ export function CurriculumLanding(appProps: HydrationData<any, CurriculumDoc>) {
</section>
<section
key={`${section.value.id}-2`}
className="landing-ladder"
className="landing-stairway"
>
<div>
<div id="lad1-container">
<LandingLadderSVG1 />
<LandingStairwaySVG1 />
<p id="lad1">
<span id="lad1_how_can">How can you</span>
<span id="lad1_boost" className="color">
Expand All @@ -62,8 +62,8 @@ export function CurriculumLanding(appProps: HydrationData<any, CurriculumDoc>) {
</p>
</div>
<div id="lad2-container">
<LandingLadderSVG2 />
<LandingLadderSVG2Small />
<LandingStairwaySVG2 />
<LandingStairwaySVG2Small />
<p id="lad2">
<span id="stair-1">
Learn about research collaboration and other essential
Expand Down
2 changes: 0 additions & 2 deletions client/src/document/preloading.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { Link, LinkProps } from "react-router-dom";

const prefetches = new Set<string>();

export function preload(url: string) {
Expand Down
4 changes: 2 additions & 2 deletions client/src/ui/base/_themes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
--cur-bg-color-landing: #fff;
--cur-bg-color-landing-about-ul: #fff;
--cur-bg-color-landing-top-icon: #fcefe2;
--cur-bg-color-landing-ladder-floor: #fcefe2;
--cur-bg-color-landing-stairway-floor: #fcefe2;
--cur-category-color: #e3642a;
--cur-color: #d47d55;
--cur-color-topic-standards: #{$mdn-color-light-theme-red-60};
Expand Down Expand Up @@ -496,7 +496,7 @@
--cur-bg-color-landing: #0e0b0a;
--cur-bg-color-landing-about-ul: #000;
--cur-bg-color-landing-top-icon: rgba(178, 92, 53, 0.3);
--cur-bg-color-landing-ladder-floor: rgba(137, 91, 51, 1);
--cur-bg-color-landing-stairway-floor: rgba(137, 91, 51, 1);
--cur-category-color: #e3642a;
--cur-bg-color-grey: #1f1c1a;
--cur-bg-color-orange: #b25c35;
Expand Down

0 comments on commit 35c4ac6

Please sign in to comment.