Skip to content

Commit f184ae7

Browse files
authored
Merge pull request #266 from neural-loop/main
Various updates
2 parents f31bd4f + 8ecc0e3 commit f184ae7

23 files changed

+704
-1198
lines changed

assets/scss/_mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
text-decoration-line: underline !important;
33
text-decoration-thickness: 0.115em !important;
44
text-underline-offset: 2.6px !important;
5-
transition: text-decoration-color 0.3s ease-in-out;
5+
transition: text-decoration-color 0.3s ease-in-out, color 0.3s ease-in-out;
66
text-decoration-color: $base-color !important;
77

88
&:hover {

assets/scss/_typography-custom.scss

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
// assets/scss/_typography-custom.scss
22

3+
// Define link colors as variables
4+
$link-underline-color: #d7c7e3;
5+
$link-underline-hover-color: #200435;
6+
$dark-link-underline-color: #288b8c;
7+
$dark-link-underline-hover-color: #bcfbff;
8+
39
// Gradient text class
410
.gradient-text {
511
background: linear-gradient(135deg, var(--color-primary-new) 0%, var(--color-secondary-new) 100%);
@@ -111,15 +117,23 @@ a {
111117
overflow-wrap: break-word;
112118
}
113119

120+
// REFACTORED: Centralized Link Styling
114121
.styled-link,
115122
.content :is(:where(a):not(:where([class~="not-prose"], [class~="not-prose"] *, .btn))),
116-
section a:not(.breadcrumb-link-parent, .social-link-container, .btn, .hardware-card-wide-link, .social-icon) {
123+
section a:not(.breadcrumb-link-parent, .social-link-container, .btn, .hardware-card-wide-link, .social-icon, .no-style),
124+
section a.social-link-container .social-link-text,
125+
.breadcrumb-link-text,
126+
.author-card-compact h4 a,
127+
.hardware-card-wide-link h3 {
117128
font-weight: inherit;
118129
color: inherit !important;
119-
@include styled-link(#d7c7e3, #200435, #288b8c, #bcfbff);
120-
&.social-link-container { text-decoration-line: none !important; }
130+
@include styled-link($link-underline-color, $link-underline-hover-color, $dark-link-underline-color, $dark-link-underline-hover-color);
121131
}
122132

133+
// Container for hardware card link, which contains the h3 we want styled
134+
.hardware-card-wide-link {
135+
text-decoration: none !important;
136+
}
123137

124138
h1 a, h2 a, h3 a, h4 a, h5 a {
125139
text-decoration: none !important;
@@ -135,19 +149,6 @@ h1 a, h2 a, h3 a, h4 a, h5 a {
135149
color: #FFF;
136150
}
137151

138-
.dark .content :is(:where(a):not(:where([class~="not-prose"], [class~="btn"], [class~="not-prose"] *))),
139-
.dark section a:not(.breadcrumb-link-parent, .social-link-container, .btn, .hardware-card-wide-link, .social-icon) {
140-
color: inherit !important;
141-
}
142-
143-
// --- Social Link Text (within a container) ---
144-
section a.social-link-container .social-link-text {
145-
@include styled-link(#d7c7e3, #200435, #288b8c, #bcfbff);
146-
}
147-
.dark section a.social-link-container {
148-
color: #bcfbff !important;
149-
}
150-
151152
h1 a, h2 a, h3 a, h4 a, h5 a {
152153
color: #ffffff !important;
153154
}
@@ -163,14 +164,9 @@ section a.social-link-container .social-link-text {
163164
color: #000 !important;
164165
}
165166

166-
// --- Author Card Compact Links ---
167-
.author-card-compact h4 a {
168-
@include styled-link(#d7c7e3, #200435, #288b8c, #bcfbff);
169-
color: #200435 !important;
170-
.dark & {
171-
color: #bcfbff !important;
167+
.author-card-compact h4 a {
168+
color: #bcfbff !important;
172169
}
173-
}
174170

175171
.role-compact {
176172
@apply text-sm text-text dark:text-darkmode-text mt-1;
@@ -196,9 +192,6 @@ section a.social-link-container .social-link-text {
196192
a.breadcrumb-link-parent {
197193
text-decoration-line: none !important;
198194
}
199-
.breadcrumb-link-text {
200-
@include styled-link(#d7c7e3, #200435, #288b8c, #bcfbff);
201-
}
202195

203196
.image-attribution-caption {
204197
// Positioning for the container div

assets/scss/buttons.scss

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,12 @@
5656
border-color: color-mix(in srgb, var(--color-primary-new) 85%, black);
5757
}
5858
}
59-
// No specific dark mode override for .btn-primary if var(--color-primary-new) and white text
60-
// provide sufficient contrast on dark backgrounds. If a different dark mode appearance
61-
// for this specific button is needed, it can be added like:
62-
// .dark .btn-primary {
63-
// background-color: var(--some-dark-mode-primary-variant);
64-
// color: var(--some-dark-mode-text-for-primary-button);
65-
// }
6659

6760
// Standard .btn-outline-primary (redefined to match .btn-new-outline for consistency)
6861
// Used by some components like event-card's "Learn More".
6962
.btn-outline-primary {
70-
@apply border-2 font-semibold py-3 px-6 rounded-lg transition-all duration-300 ease-in-out inline-block text-center;
71-
color: var(--color-primary-new);
72-
border-color: var(--color-primary-new);
73-
background-color: transparent;
74-
&:hover {
75-
background-color: var(--color-primary-new);
76-
@apply text-white;
77-
}
63+
@extend .btn-new-outline;
7864
}
79-
// Dark mode for .btn-outline-primary can also be specified here if needed,
80-
// similar to .btn-primary. For now, relies on var(--color-primary-new).
8165

8266
// Utility button style
8367
.btn-details-mini {
Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,8 @@
11
// Breadcrumb specific styling
2-
// Remove underline from the <a> tag itself in breadcrumbs
2+
// This file can now be simplified as the core styling is handled by the main stylesheet.
3+
// We just need to ensure the parent <a> doesn't get an underline itself.
34
a.breadcrumb-link-parent {
4-
text-decoration-line: none !important; // Remove general underline from the <a> container
5+
text-decoration-line: none !important;
56
}
67

7-
// Apply underline only to the inner span
8-
.breadcrumb-link-text {
9-
text-decoration-line: underline;
10-
text-decoration-color: #d7c7e3; // Match general link style
11-
text-decoration-thickness: 0.115em; // Match general link style
12-
text-underline-offset: 2.6px; // Match general link style
13-
transition: text-decoration-color 0.3s ease-in-out;
14-
}
15-
16-
// Hover effect for the inner span, triggered by hovering the parent <a>
17-
a.breadcrumb-link-parent:hover .breadcrumb-link-text {
18-
text-decoration-color: #200435; // Match general link hover style
19-
}
20-
21-
// Dark mode for breadcrumb link text span
22-
.dark .breadcrumb-link-text {
23-
text-decoration-color: #288b8c; // Match dark mode general link style
24-
}
25-
26-
.dark a.breadcrumb-link-parent:hover .breadcrumb-link-text {
27-
text-decoration-color: #bcfbff !important; // Match dark mode general link hover style
28-
}
29-
// End of Breadcrumb specific styling
8+
// The .breadcrumb-link-text will be automatically styled by the rules in _typography-custom.scss
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// assets/scss/components/_contributor-timeline.scss
2+
3+
.contributor-timeline {
4+
@apply relative pl-8;
5+
6+
// The vertical timeline bar
7+
&::before {
8+
content: '';
9+
@apply absolute top-0 left-[0.3rem] w-0.5 h-full bg-border dark:bg-darkmode-border;
10+
}
11+
}
12+
13+
// New style for the year marker
14+
.timeline-year {
15+
@apply relative h-12; // Height to space out the years
16+
17+
span {
18+
@apply absolute bg-body dark:bg-darkmode-body px-3 py-0.5 text-xs font-bold uppercase tracking-wider text-gray-500 dark:text-gray-400 rounded-full z-10;
19+
// Center on the timeline bar (left: 0.3rem; width: w-0.5 which is 0.125rem). Center = 0.3 + (0.125/2) = 0.3625rem
20+
left: calc(0.3rem + (0.125rem / 2));
21+
top: 50%;
22+
transform: translate(-50%, -50%);
23+
}
24+
}
25+
26+
27+
.timeline-item {
28+
@apply relative mb-8;
29+
30+
// The dot on the timeline
31+
&::before {
32+
content: '';
33+
@apply absolute -left-[2.1rem] top-1.5 w-4 h-4 rounded-full border-4 border-body dark:border-darkmode-body;
34+
background-color: var(--color-primary-new);
35+
}
36+
37+
// Remove bottom margin on the last item for a clean finish
38+
&:last-child {
39+
@apply mb-0;
40+
}
41+
}
42+
43+
.timeline-item-content {
44+
@apply p-5 rounded-lg bg-theme-light dark:bg-darkmode-theme-light shadow-md hover:shadow-lg transition-shadow duration-300 ease-in-out;
45+
}
46+
47+
.timeline-item-badge {
48+
// Removed mb-2 as layout is now controlled by flexbox
49+
@apply inline-block bg-indigo-100 dark:bg-indigo-900 text-indigo-700 dark:text-indigo-200 text-xs font-semibold px-2 py-0.5 rounded-full;
50+
}

assets/scss/components/_hardware-card-wide.scss

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,12 @@
44
text-decoration: none !important;
55

66
// Apply a subtle transition to the card for transform and shadow changes.
7-
// This addresses the "gradual and subtle" hover effect.
87
@apply transition-all duration-300 ease-in-out;
98

109
// On hover, lift the card slightly and increase its shadow for a modern feel.
1110
&:hover {
1211
@apply transform shadow-lg;
1312
}
1413

15-
// Target the h3 title specifically.
16-
h3 {
17-
// Apply the site's default underline style.
18-
text-decoration-line: underline;
19-
text-decoration-color: #d7c7e3; // Initial underline color
20-
text-decoration-thickness: 0.115em;
21-
text-underline-offset: 2.6px;
22-
23-
// Animate ONLY the underline color for a smooth transition.
24-
transition: text-decoration-color 0.3s ease-in-out;
25-
}
26-
27-
// When the card is hovered, change the h3's underline color.
28-
&:hover h3 {
29-
text-decoration-color: #200435; // Hover underline color
30-
}
31-
}
32-
33-
// Dark mode styles for the card's hover state.
34-
.dark .hardware-card-wide-link {
35-
// On hover in dark mode...
36-
&:hover h3 {
37-
text-decoration-color: #bcfbff !important; // Dark mode hover underline color
38-
}
39-
40-
// Define the base underline color for the title in dark mode.
41-
h3 {
42-
text-decoration-color: #288b8c;
43-
}
14+
// The h3 title inside will be styled automatically by the rules in _typography-custom.scss
4415
}

assets/scss/components/_session-card.scss

Lines changed: 0 additions & 45 deletions
This file was deleted.

assets/scss/main.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
@import "utilities";
2121
}
2222

23-
@import "social-share";
2423
@import "images";
2524

2625

@@ -42,6 +41,7 @@
4241
@import "components/hardware-card-wide"; // Add this line
4342

4443
@import "components/og-preview";
44+
@import "components/contributor-timeline";
4545
// Import new custom typography and buttons
46-
@import "components/mega-menu"; // Add this line
46+
@import "components/mega-menu";
4747
@import "typography-custom";

0 commit comments

Comments
 (0)