Merge pull request #61 from Yaronkr/map-fixing

fix maps
Yaronkr · Jun 16, 2022 · 66953f1 · 66953f1
2 parents dc76e86 + afdfc23
commit 66953f1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/app/assets/stylesheets/pages/_childcares-index.scss b/app/assets/stylesheets/pages/_childcares-index.scss
@@ -1,6 +1,12 @@
 .childcares-index-container {
   margin-top: 30px;
 }
+#map {
+  width: 100%;
+  height: 100vh;
+  position: sticky;
+  top: 0;
+}
 
 // body {
 //   background-color: #FAEEE7;

diff --git a/app/assets/stylesheets/pages/_show.scss b/app/assets/stylesheets/pages/_show.scss
@@ -9,7 +9,6 @@
 }
 
 .map-container {
-  width: 500px;
   height: 500px;
   border-radius: 20px;
 }

diff --git a/app/views/childcares/index.html.erb b/app/views/childcares/index.html.erb
@@ -5,7 +5,7 @@
       <% end %>
     </div>
 
-  <div id="map" style="width: 100%; height: 600px"
+  <div id="map"
     data-controller="mapbox"
     data-mapbox-markers-value="<%= @markers.to_json %>"
     data-mapbox-api-key-value="<%= ENV['MAPBOX_API_KEY'] %>">

diff --git a/app/views/childcares/show.html.erb b/app/views/childcares/show.html.erb
@@ -8,22 +8,25 @@
 
 <%= render 'shared/show_photo_banner'%>
 
-<div class="map-wrraper d-flex justify-content-between">
-  <div class="container map-container  pl-40 mr-10 ">
+<div class="map-wrraper">
+<div class="container d-flex justify-content-between">
+
+  <div class="map-container w-75 mx-5">
     <div id="show-map"
         data-controller="mapbox"
         data-mapbox-markers-value="<%= @markers.to_json %>"
         data-mapbox-api-key-value="<%= ENV['MAPBOX_API_KEY'] %>">
     </div>
   </div>
-  <div class="conatiner opening-hours mr-30">
-  <h2 style="padding-bottom: 20px;"> <strong>Opening Hours</strong></h2>
-  <ul>
-    <% @childcare.opening_hours.each do |time| %>
-    <li style="white-space: nowwrap; width:300px;"><%= time.time %></li>
-    <% end  %>
-  </ul>
-    </div>
+  <div class="opening-hours">
+    <h2 style="padding-bottom: 20px; font-size: 24px"> <strong>Opening Hours</strong></h2>
+    <ul>
+      <% @childcare.opening_hours.each do |time| %>
+      <li class="my-2" style="white-space: nowwrap; width:300px;"><%= time.time %></li>
+      <% end  %>
+    </ul>
+  </div>
+  </div>
 </div>
 
 <div style="background-color: #FAEEE7; padding-top:2px;">