idk

etl12003 · Apr 17, 2017 · 8fd7005 · 8fd7005
1 parent cad0d67
commit 8fd7005
Show file tree

Hide file tree

Showing 11 changed files with 1,181 additions and 539 deletions.
diff --git a/Wello/platforms/browser/cordova/build b/Wello/platforms/browser/cordova/build
diff --git a/Wello/platforms/browser/cordova/clean b/Wello/platforms/browser/cordova/clean
diff --git a/...node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js b/...node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js
diff --git a/...wser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js b/...wser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js
diff --git a/Wello/platforms/browser/cordova/run b/Wello/platforms/browser/cordova/run
diff --git a/Wello/platforms/browser/cordova/version b/Wello/platforms/browser/cordova/version
diff --git a/html-ONLY-site/css/main.css b/html-ONLY-site/css/main.css
@@ -255,10 +255,28 @@ button {
     button.gps img {
       width: 100%; }
 
+
+/*
+#map {
+  width: 100vw !important;
+  height: 100vh !important;
+  height: calc(100vh - 8.1rem); 
+}
+*/
 /*
 #map {
-  width: 100vw;
-  height: calc(100vh - 8.1rem); }
+        position: relative;
+        padding-bottom: 75%; // This is the aspect ratio
+        height: 0;
+        overflow: hidden;
+    }
+    #map iframe {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100% !important;
+        height: 100% !important;
+    }
 */
 
 main{

diff --git a/html-ONLY-site/map.php b/html-ONLY-site/map.php
@@ -1,3 +1,5 @@
+
+
 <!DOCTYPE html>
 <html class="no-js" lang="">
 
@@ -16,12 +18,22 @@
     <script src="js/vendor/modernizr-2.8.3.min.js"></script>
 </head>
 
+
+
+
+
+
 <body>
     <!--[if lt IE 8]>
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
     <!-- Add your site or application content here -->
 
+
+
+
+
+
     <nav class="top-nav">
         <div class="main-bttns">
         <button onclick="document.getElementById('menu').classList.toggle('closed'); document.getElementById('close-menu').classList.toggle('closed')"><img src="img/menu.svg" alt="menu" /></button> <h1>Well Report App</h1>
@@ -46,13 +58,24 @@
     </nav>
 
     <main class="map">
-        <div style="height:100%; width: 100%; position:absolute;"> 
-            <div id="map"></div>
-        </div>
+<!--        <div style=""> -->
+            <div id="map">
+                <iframe
+                  width="600"
+                  height="450"
+                  frameborder="0" style="border:0"
+                  src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBmQZToyeMOBTd6KlJRFHzv-5sj7u_AidY
+                    &q=41.8077,-72.2540" allowfullscreen>
+                </iframe>
+
+            </div>
+<!--        </div>-->
 
+<!--
         <script async defer
         src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
         </script>
+-->
 
         <div class="well-preview well-card clearfix">
             <div class="well-img"></div>
@@ -62,7 +85,7 @@
                 <a href="details.html">DETAILS</a>
             </div>
         </div>
-
+        
         <div class="desk-details">
 			<a href="details.php" class="go-to" > go to > </a>
         <?php
@@ -118,4 +141,4 @@
 we will need a file where we import the well name, address, longiture and latitude within the range we chose
 
 we need a food loop for it
--->
+-->