Merge pull request #8 from boriskrasko/markup

Markup -> gh-pages
boriskrasko · Feb 4, 2024 · 1ca0eb5 · 1ca0eb5
2 parents e17eff5 + c750f2d
commit 1ca0eb5
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/assets/images/black_map.png → assets/img/black_map.png b/assets/images/black_map.png → assets/img/black_map.png
diff --git a/assets/images/blue_map.png → assets/img/blue_map.png b/assets/images/blue_map.png → assets/img/blue_map.png
diff --git a/assets/images/contrast_map.png → assets/img/contrast_map.png b/assets/images/contrast_map.png → assets/img/contrast_map.png
diff --git a/assets/images/dark_blue_map.png → assets/img/dark_blue_map.png b/assets/images/dark_blue_map.png → assets/img/dark_blue_map.png
diff --git a/assets/img/standard-map 20.31.27.png b/assets/img/standard-map 20.31.27.png
diff --git a/assets/img/standard-map.png b/assets/img/standard-map.png
diff --git a/assets/images/standard_map.png → assets/img/standard_map.png b/assets/images/standard_map.png → assets/img/standard_map.png
diff --git a/assets/images/world.svg → assets/img/world.svg b/assets/images/world.svg → assets/img/world.svg
diff --git a/index.html b/index.html
@@ -1150,25 +1150,25 @@
                   <ul>
                     <li data-map-style="standart">
                       <span class="box">
-                        <img src="assets/images/standard_map.png" alt="">
+                        <img src="assets/img/standard_map.png" alt="">
                       </span>
                       <span class="basemaps-item">Standart</span>
                     </li>
                     <li data-map-style="blue">
                       <span class="box">
-                        <img src="assets/images/blue_map.png" alt="">
+                        <img src="assets/img/blue_map.png" alt="">
                       </span>
                       <span class="basemaps-item">Blue</span>
                     </li>
                     <li data-map-style="contrast">
                       <span class="box">
-                        <img src="assets/images/contrast_map.png" alt="">
+                        <img src="assets/img/contrast_map.png" alt="">
                       </span>
                       <span class="basemaps-item">Contrast</span>
                     </li>
                     <li data-map-style="dark-blue">
                       <span class="box">
-                        <img src="assets/images/dark_blue_map.png" alt="">
+                        <img src="assets/img/dark_blue_map.png" alt="">
                       </span>
                       <span class="basemaps-item">Dark blue</span>
                     </li>

diff --git a/main.js b/main.js
@@ -139,7 +139,7 @@ mapImage.onmousedown = function (e) {
 
   mapImage.onmouseup = resetDrag;
   document.querySelector('.map-svg').onmouseleave = resetDrag;
-
+  
   const countryName = e.target.getAttribute('name') || e.target.getAttribute('class').split(' ')[0];
   const currentCountry = findCountryByName(countryName);
   updateGlobalCounterRecovery(countryName);
@@ -252,7 +252,7 @@ const basemaps = document.querySelector('.basemaps-list ul');
 
 basemaps.querySelectorAll('li').forEach(li => {
   li.addEventListener('click', () => {
-    mapImage.classList = li.dataset.mapStyle;
+    mapImage.id = li.dataset.mapStyle;
   })
 })
 

diff --git a/style.css b/style.css
@@ -902,41 +902,41 @@ footer ul li {
   fill: #17D0FA;
 }
 
-.dark-blue .active-country {
+#dark-blue .active-country {
   fill: #eee;
 }
 
-.blue .active-country {
+#blue .active-country {
   fill: #999;
   stroke: #fff;
 }
 
-.standart .active-country {
+#standart .active-country {
   fill: #17D0FA;
 }
 
-.blue > * {
+#blue > * {
   fill: #17D0FADD;
   stroke: #000;
 }
 
-.dark-blue > * {
+#dark-blue > * {
   stroke: #fff;
 }
 
-.dark-blue {
+#dark-blue {
   background-color: #1C2E3B;
 }
 
-.contrast {
+#contrast {
   stroke-width: 2;
 }
 
-.standart {
+#standart {
   stroke-width: 0.3;
 }
 
-.standart > *{
+#standart > *{
   stroke: #17D0FA;
   fill: transparent;
 }