chore: merge conflict resolve (028cb8a7) · Commits · minerva / frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- External wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

028cb8a7

Commit 028cb8a7 authored 3 weeks ago by Miłosz Grocholewski

Downloads
- Plain Diff

chore: merge conflict resolve

parents f6e504ec 4547586a

No related branches found

No related tags found

1 merge request!398feat(layer-text): Add editing text notes, font size, color alignment etc.

Pipeline #101707 passed 3 weeks ago

Changes 5
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Map/Drawer/LayersDrawer/LayersDrawerObjectsList.component.tsx 1 addition, 1 deletion

...Drawer/LayersDrawer/LayersDrawerObjectsList.component.tsx
src/components/Map/Map.component.tsx 2 additions, 2 deletions

src/components/Map/Map.component.tsx
src/components/Map/MapBackgroundSwitch/MapBackgroundSwitch.component.tsx 33 additions, 0 deletions

...Map/MapBackgroundSwitch/MapBackgroundSwitch.component.tsx
src/components/Map/MapBackgroundSwitch/MapBackgroundSwitch.styles.css 39 additions, 0 deletions

...ts/Map/MapBackgroundSwitch/MapBackgroundSwitch.styles.css
tailwind.config.ts 2 additions, 0 deletions

tailwind.config.ts

with 77 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment