aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2020-08-08 21:11:57 +0200
committerJoris2020-08-08 21:11:57 +0200
commit2cb752123d15916496e872c9fbd423c788c86c64 (patch)
treea9db0b21d963f0f12ce0cfb6dc446a77ea964741
parent38e42723a916b7d5c2a15e514b3f3e6dcab398dd (diff)
downloadmap-2cb752123d15916496e872c9fbd423c788c86c64.tar.gz
map-2cb752123d15916496e872c9fbd423c788c86c64.tar.bz2
map-2cb752123d15916496e872c9fbd423c788c86c64.zip
Remove unused color modal
-rw-r--r--public/main.css5
-rw-r--r--src/View/Colors.ml4
-rw-r--r--src/View/Map.ml3
-rw-r--r--src/View/Map/Marker.ml7
4 files changed, 10 insertions, 9 deletions
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))