Skip to content

Commit 67162db

Browse files
authored
Merge pull request #11 from AseWhy/claude/improve-website-design-SKuze
2 parents bbd220a + dd10153 commit 67162db

6 files changed

Lines changed: 28 additions & 17 deletions

File tree

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<link rel="manifest" href="data:application/json;base64,ewogICJzaG9ydF9uYW1lIjogIkFzZVdoeSIsCiAgIm5hbWUiOiAiQXNlV2h5L0FzdGVjb20iLAogICJpY29ucyI6IFsKICAgIHsKICAgICAgInNyYyI6ICJmYXZpY29uLmljbyIsCiAgICAgICJzaXplcyI6ICI2NHg2NCAzMngzMiAyNHgyNCAxNngxNiIsCiAgICAgICJ0eXBlIjogImltYWdlL3gtaWNvbiIKICAgIH0sCiAgICB7CiAgICAgICJzcmMiOiAibG9nbzE5Mi5wbmciLAogICAgICAidHlwZSI6ICJpbWFnZS9wbmciLAogICAgICAic2l6ZXMiOiAiMTkyeDE5MiIKICAgIH0sCiAgICB7CiAgICAgICJzcmMiOiAibG9nbzUxMi5wbmciLAogICAgICAidHlwZSI6ICJpbWFnZS9wbmciLAogICAgICAic2l6ZXMiOiAiNTEyeDUxMiIKICAgIH0KICBdLAogICJzdGFydF91cmwiOiAiLiIsCiAgImRpc3BsYXkiOiAic3RhbmRhbG9uZSIsCiAgInRoZW1lX2NvbG9yIjogIiMwYjBkMTIiLAogICJiYWNrZ3JvdW5kX2NvbG9yIjogIiMwYjBkMTIiCn0K" />
1818

1919
<title>AseWhy/Astecom</title>
20-
<script type="module" crossorigin src="/assets/index-d7c8747b.js"></script>
21-
<link rel="stylesheet" href="/assets/index-575788e2.css">
20+
<script type="module" crossorigin src="/assets/index-17767092.js"></script>
21+
<link rel="stylesheet" href="/assets/index-c9b8e487.css">
2222
</head>
2323
<body>
2424
<noscript>You need to enable JavaScript to run this app.</noscript>

src/components/content/work/WorkContent.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { WorkPlace } from "./WorkPlace";
1+
import { WorkPlace, type IWorkPlaceProps } from "./WorkPlace";
22
import { Experiance } from "./data";
33
import { formatDuration, intervalToDuration } from "date-fns";
44
import { ru } from "date-fns/locale";
@@ -33,6 +33,7 @@ export function WorkContent() {
3333
{...e}
3434
key={e.name}
3535
last={i === Experiance.length - 1}
36+
nextColor={(Experiance[i + 1] as IWorkPlaceProps | undefined)?.color}
3637
/>)
3738
}
3839
</div>

src/components/content/work/WorkPlace.module.scss

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,22 @@
8282
font-weight: 600;
8383
font-size: var(--fs-small);
8484

85-
// connector that bridges the gap to the next card so the timeline is unbroken
85+
// connector that bridges the gap to the next card, fading this job's
86+
// colour into the next one around the centre of the gap
8687
&::after {
8788
content: '';
8889
position: absolute;
8990
right: -3px;
9091
top: 100%;
9192
width: 3px;
92-
height: calc(var(--space-6) * 3 + var(--space-5));
93-
background: var(--job-accent);
93+
height: calc(var(--space-6) * 3 + var(--space-2));
94+
background: linear-gradient(
95+
to bottom,
96+
var(--job-accent) 0%,
97+
var(--job-accent) 30%,
98+
var(--job-accent-next, var(--job-accent)) 70%,
99+
var(--job-accent-next, var(--job-accent)) 100%
100+
);
94101
}
95102

96103
span {

src/components/content/work/WorkPlace.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export interface IWorkPlaceProps {
1313
sphere: string,
1414
site: string,
1515
color?: string;
16+
nextColor?: string;
1617
last?: boolean;
1718
logo: any,
1819
dateStart: Date,
@@ -34,20 +35,22 @@ export function WorkPlace({
3435
dateEnd,
3536
site,
3637
color = 'red',
38+
nextColor,
3739
last = false,
3840
sphere,
3941
location,
4042
project,
4143
responsibilities
4244
}: IWorkPlaceProps) {
4345
const accent = ACCENT_BY_COLOR[color] ?? color;
46+
const nextAccent = nextColor ? (ACCENT_BY_COLOR[nextColor] ?? nextColor) : accent;
4447

4548
return <Parallax
4649
opacity={ [ 0.25, 2 ] }
4750
>
4851
<div
4952
className={WorkPlaceModule.WorkPlace}
50-
style={{ ['--job-accent' as any]: accent }}
53+
style={{ ['--job-accent' as any]: accent, ['--job-accent-next' as any]: nextAccent }}
5154
data-last={last}
5255
>
5356
<div

0 commit comments

Comments
 (0)