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

Fix --font-text CSS var usage and add more leaflet font overrides #4674

Merged
merged 3 commits into from
Aug 7, 2023
Merged

Fix --font-text CSS var usage and add more leaflet font overrides #4674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e78e8f
Add missing quotes to --font-text CSS vars
joshuarrrr Aug 3, 2023
d83e5a8
Fix usage of --font-text CSS var
joshuarrrr Aug 4, 2023
e413436
Merge branch 'main' into fix/add-missing-css-var-quotes
joshuarrrr Aug 4, 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
2 changes: 1 addition & 1 deletion packages/osd-ui-framework/src/global_styling/variables/_font.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Font

$kuiFontFamily: "var(--font-text)";
$kuiFontFamily: var(--font-text);
$kuiFontSize: $euiFontSize;
$kuiLineHeight: $euiLineHeight;
$kuiSubTextFontSize: $euiFontSizeS;
Expand Down
8 changes: 8 additions & 0 deletions src/plugins/maps_legacy/public/map/_custom_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.mapButton {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome, sans-serif;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
5 changes: 5 additions & 0 deletions src/plugins/maps_legacy/public/map/_leaflet_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ $visMapLeafletSprite: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s

.leaflet-container {
background: $euiColorEmptyShade;
font-family: var(--font-text);

// the heatmap layer plugin logs an error to the console when the map is in a 0-sized container
min-width: 1px !important;
Expand Down Expand Up @@ -48,6 +49,10 @@ $visMapLeafletSprite: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s
}
}

.leaflet-draw-actions a {
font-family: var(--font-text);
}

.leaflet-touch .leaflet-bar a:first-child {
border-top-left-radius: $euiBorderRadius;
border-top-right-radius: $euiBorderRadius;
Expand Down
9 changes: 0 additions & 9 deletions src/plugins/maps_legacy/public/map/_legend.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,3 @@
left: $euiSizeXXL;
white-space: nowrap;
}

.mapButton {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome, sans-serif;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
1 change: 1 addition & 0 deletions src/plugins/maps_legacy/public/map/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@import "./custom_button";
@import "./leaflet_overrides";
@import "./legend";
Loading