From 2cb752123d15916496e872c9fbd423c788c86c64 Mon Sep 17 00:00:00 2001 From: Joris Date: Sat, 8 Aug 2020 21:11:57 +0200 Subject: Remove unused color modal --- public/main.css | 5 ++++- src/View/Colors.ml | 4 ---- src/View/Map.ml | 3 --- src/View/Map/Marker.ml | 7 ++++++- 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 src/View/Colors.ml diff --git a/public/main.css b/public/main.css index ae0e74e..9b94186 100644 --- a/public/main.css +++ b/public/main.css @@ -18,7 +18,6 @@ body { .g-Layout__Header { display: flex; - justify-content: space-between; align-items: center; width: 100%; background-color: var(--color-header); @@ -248,6 +247,10 @@ body { border: 1px solid #EEEEEE; } +.g-MarkerForm__IconEntry { + margin-right: 0.5rem; +} + /* Marker icon */ :root { diff --git a/src/View/Colors.ml b/src/View/Colors.ml deleted file mode 100644 index 380a01c..0000000 --- a/src/View/Colors.ml +++ /dev/null @@ -1,4 +0,0 @@ -let content () = - H.div - [| |] - [| H.text "Colors" |] diff --git a/src/View/Map.ml b/src/View/Map.ml index 678f5ae..eda934c 100644 --- a/src/View/Map.ml +++ b/src/View/Map.ml @@ -8,9 +8,6 @@ let mapView = ; HA.href "#" |] [| H.text "Map" |] - ; Button.text - [| HE.on_click (fun _ -> Modal.show (Colors.content ())) |] - [| H.text "Colors" |] |] ; H.div [| HA.class_ "g-Map" |] diff --git a/src/View/Map/Marker.ml b/src/View/Map/Marker.ml index 80072af..c628c3a 100644 --- a/src/View/Map/Marker.ml +++ b/src/View/Map/Marker.ml @@ -36,7 +36,12 @@ let form on_validate colors init_name init_color init_icon = [| HA.value init_icon |] "g-MarkerForm__IconInput" FontAwesome.icons - (fun icon -> [| H.div [| HA.class_ ("fa fa-" ^ icon) |] [| |] ; H.text icon |]) + (fun icon -> + [| H.div + [| HA.class_ ("g-MarkerForm__IconEntry fa fa-" ^ icon) |] + [| |] + ; H.text icon + |]) (fun newIcon -> let () = icon := newIcon in Element.set_class_name dom_icon ("fa fa-" ^ newIcon)) -- cgit v1.2.3