fix: Fix icons in `top map sightbar

This commit is contained in:
2025-10-29 14:19:00 +03:00
parent 349c7009c6
commit b0fdf03cc6
5 changed files with 21 additions and 49 deletions

View File

@@ -1,5 +1,6 @@
@import "tailwindcss"; @import "tailwindcss";
@plugin "@tailwindcss/typography"; @plugin "@tailwindcss/typography";
button { button {
cursor: pointer; cursor: pointer;
} }

View File

@@ -1,13 +0,0 @@
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z"
/>
</svg>

Before

Width:  |  Height:  |  Size: 301 B

View File

@@ -57,10 +57,6 @@ import Source from "ol/source/Source";
import { FeatureLike } from "ol/Feature"; import { FeatureLike } from "ol/Feature";
import { createEmpty, extend, getCenter } from "ol/extent"; import { createEmpty, extend, getCenter } from "ol/extent";
// Icons
import EditIcon from './edit_icon.svg';
import LineIcon from './line_icon.svg';
// --- CUSTOM SCROLLBAR STYLES --- // --- CUSTOM SCROLLBAR STYLES ---
const scrollbarStyles = ` const scrollbarStyles = `
.scrollbar-hide { .scrollbar-hide {
@@ -645,7 +641,6 @@ const saveActiveSection = (section: string | null): void => {
} }
}; };
// --- TYPE DEFINITIONS --- // --- TYPE DEFINITIONS ---
interface MapServiceConfig { interface MapServiceConfig {
target: HTMLElement; target: HTMLElement;
@@ -2102,7 +2097,7 @@ const MapControls: React.FC<MapControlsProps> = ({
mode: "edit", mode: "edit",
title: "Редактировать", title: "Редактировать",
longTitle: "Редактирование", longTitle: "Редактирование",
icon: <img src={EditIcon} alt="Редактировать" className="h-4 w-4 mr-1 sm:mr-2" />, icon: <Pencil size={16} className="mr-1 sm:mr-2" />,
action: () => mapService.activateEditMode(), action: () => mapService.activateEditMode(),
}, },
{ {
@@ -2123,7 +2118,7 @@ const MapControls: React.FC<MapControlsProps> = ({
mode: "drawing-route", mode: "drawing-route",
title: "Маршрут", title: "Маршрут",
longTitle: "Добавить маршрут (Правый клик для завершения)", longTitle: "Добавить маршрут (Правый клик для завершения)",
icon: <img src={LineIcon} alt="Маршрут" className="h-4 w-4 mr-1 sm:mr-2" />, icon: <RouteIcon size={16} className="mr-1 sm:mr-2" />,
action: () => mapService.startDrawing("LineString", "route"), action: () => mapService.startDrawing("LineString", "route"),
}, },

View File

@@ -1,14 +0,0 @@
<svg
xmlns="http://www.w3.org/2000/svg"
className="h-4 w-4 mr-1 sm:mr-2"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M3.055 11H5a2 2 0 012 2v1a2 2 0 002 2h10a2 2 0 002-2v-1a2 2 0 012-2h1.945M7.732 4.064A2.5 2.5 0 105.23 6.24m13.54 0a2.5 2.5 0 10-2.502-2.176M12 16.05V21m0-17.948V3"
/>
</svg>

Before

Width:  |  Height:  |  Size: 429 B

View File

@@ -48,21 +48,24 @@ export const Layout: React.FC<LayoutProps> = observer(({ children }) => {
<Box sx={{ display: "flex" }}> <Box sx={{ display: "flex" }}>
<AppBar position="fixed" open={open}> <AppBar position="fixed" open={open}>
<Toolbar className="flex justify-between"> <Toolbar className="flex justify-between">
<IconButton <div className="flex items-center">
color="inherit" <IconButton
aria-label="open drawer" color="inherit"
onClick={handleDrawerOpen} aria-label="open drawer"
edge="start" onClick={handleDrawerOpen}
sx={[ edge="start"
{ sx={[
marginRight: 5, {
}, marginRight: 5,
open && { display: "none" }, },
]} open && { display: "none" },
> ]}
<Menu /> >
</IconButton> <Menu />
<CitySelector /> </IconButton>
<CitySelector />
</div>
<div className="flex gap-2 items-center"> <div className="flex gap-2 items-center">
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
{(() => { {(() => {