Skip to content

fix(SWRDataLabDark): Make city labels brighter at medium zoom #179

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

Merged
awesomephant merged 4 commits into from
Sep 25, 2025
Merged

fix(SWRDataLabDark): Make city labels brighter at medium zoom #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
660cd70
Tweak city label colours
awesomephant Sep 25, 2025
71175d6
Tweak colours
awesomephant Sep 25, 2025
0f3c5bc
Merge branch 'main' into 173-swrdatalabdark-city-labels-should-be-bri…
awesomephant Sep 25, 2025
d594eca
Merge branch 'main' into 173-swrdatalabdark-city-labels-should-be-bri…
awesomephant Sep 25, 2025
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
2 changes: 1 addition & 1 deletion components/src/maplibre/GeocoderControl/GeocoderControl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
font-family: var(--swr-sans);
font-size: var(--fs-small-1);
border-radius: var(--br-small);
border: 1px solid var(--color-surfaceBorder);
border: 1px solid var(--color-textSecondary);
box-shadow: 2px 2px 1px rgba(0, 0, 0, 0.075);

button {
Expand Down
2 changes: 1 addition & 1 deletion components/src/maplibre/Map/Map.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@

.maplibregl-ctrl-group {
background: var(--color-surfaceFill);
border: 1px solid var(--color-surfaceBorder);
border: 1px solid var(--color-textSecondary);
box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.075);
border-radius: var(--br-small);
overflow: hidden;
Expand Down
13 changes: 13 additions & 0 deletions components/src/maplibre/MapStyle/SWRDataLabDark.stories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@
</DesignTokens>
</Story>

<Story asChild name="fix/173">
<DesignTokens theme="dark">
<div class="grid">
<div class="container">
<Map showDebug style={SWRDataLabDark()} initialLocation={{ ...locations.berlin, zoom: 11 }}>
<AttributionControl position="bottom-left" />
</Map>
</div>
</div>
</DesignTokens>
</Story>

<Story asChild name="Bodensee z9">
<DesignTokens theme="dark">
<div class="grid">
Expand All @@ -41,6 +53,7 @@
</div>
</DesignTokens>
</Story>

<Story asChild name="Frankfurt z11">
<DesignTokens theme="dark">
<div class="grid">
Expand Down
4 changes: 2 additions & 2 deletions components/src/maplibre/MapStyle/SWRDataLabDark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const tokens = {
},
water: 'hsl(210, 12%, 8%)',
water_light: 'hsl(210, 12%, 8%)',
water_ocean: 'hsl(210, 12%, 8%)',
water_ocean: 'hsl(214, 17%, 8%)',
marsh: 'hsl(180, 3%, 35%)',
grass: 'hsl(170, 20%, 14%)',
grass_dark: 'hsl(170, 16%, 12%)',
Expand All @@ -30,7 +30,7 @@ const tokens = {
street_secondary_case: 'hsl(0, 0%, 0%)',
street_tertiary: 'hsl(0, 0%, 20%)',
street_tertiary_case: 'hsl(0, 0%, 14%)',
label_primary: 'hsl(240, 5%, 82%)',
label_primary: 'hsl(240, 5%, 80%)',
label_secondary: 'hsl(0, 2%, 72%)',
label_tertiary: 'hsl(0, 1%, 55%)',
boundary_country: '#6e6f71',
Expand Down
6 changes: 3 additions & 3 deletions components/src/maplibre/MapStyle/SWRDataLabLight.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ const tokens = {
[10, 'white']
]
},
water: 'hsl(210, 71%, 83%)',
water_light: 'hsl(210, 41%, 90%)',
water_ocean: 'hsl(209, 57%, 84%)',
water: 'hsl(212, 71%, 83%)',
water_light: 'hsl(212, 41%, 90%)',
water_ocean: 'hsl(212, 60%, 83%)',
marsh: 'hsl(200, 14%, 97%)',
grass: 'hsl(133, 36%, 95%)',
grass_dark: 'hsl(127, 49%, 93%)',
Expand Down
18 changes: 14 additions & 4 deletions components/src/maplibre/MapStyle/components/PlaceLabels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function makePlaceLabels(tokens) {
layout: {
'text-size': {
stops: [
[7, 12],
[7, 13],
[13, 17]
]
}
Expand All @@ -122,13 +122,18 @@ export default function makePlaceLabels(tokens) {
layout: {
'text-size': {
stops: [
[7, 16],
[7, 14],
[15, 20]
]
}
},
paint: {
'text-color': tokens.label_secondary
'text-color': {
stops: [
[7, tokens.label_tertiary],
[9, tokens.label_secondary]
]
}
}
},
{
Expand All @@ -145,7 +150,12 @@ export default function makePlaceLabels(tokens) {
}
},
paint: {
'text-color': tokens.label_tertiary
'text-color': {
stops: [
[7, tokens.label_tertiary],
[9, tokens.label_secondary]
]
}
}
}
].map((el) => {
Expand Down