Merge remote-tracking branch 'origin/master'

# Conflicts: # html-ONLY-site/wells-list.php
etl12003 · Mar 28, 2017 · a130f35 · a130f35
2 parents d30d84f + f7ae17c
commit a130f35
Show file tree

Hide file tree

Showing 16 changed files with 1,246 additions and 778 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/desktop.css b/html-ONLY-site/css/desktop.css
@@ -0,0 +1,47 @@
+@media only screen and (min-width: 40.75em) {
+	div.well-card {
+    	border: 2px solid #4d4d4d;
+		margin: 1.5rem;
+		width: 41rem;
+	}
+
+	main.list {
+		display: flex;
+		flex-direction: column;
+/*		justify-content: center;*/
+		align-items: center;
+	}
+}
+
+@media only screen and (min-width: 45em) {
+	div.well-card {
+    	border: 2px solid #4d4d4d;
+		margin: 1.5rem;
+		width: 41rem;
+	}
+	main.search{
+		display: flex;
+		justify-content: center;
+	}
+
+	main.search a{
+		color: inherit;
+		width: 50%;
+	}
+
+
+}
+
+@media only screen and (min-width: 25em) {
+	main.details{
+		max-width: 25rem;
+		margin-left: auto;
+		margin-right: auto;
+		margin-top: 8rem;
+	}
+	#add-well{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+}
diff --git a/html-ONLY-site/css/main.css b/html-ONLY-site/css/main.css
@@ -84,36 +84,48 @@ textarea {
   box-sizing: border-box;
   font-family: "roboto";
 }
-
 main.intro{
-    position: fixed;
-    margin-top: 0;
-    padding: 3rem;
+    margin: 0;
+    padding: 0;
+    width: 100vw;
+    height: 100vh;
     background-color: #65b2ff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+div.intro{
+    margin-top: 1rem;
+    margin: 1rem 1rem 1rem 1rem;
+    padding: 3rem;
     height: 100vh;
     top: 0;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
     text-align: center;
+    max-width: 35rem;
+    max-height: 40rem;
 }
 
-main.intro h1{
-    font-size: 2.75rem;
+.intro h1{
+    font-size: 2.3rem;
     color: #000633;
 }
-main.intro p{
+.intro p{
     text-align: left;
     height: 40vh;
-    color: white
+    color: white;
+    line-height: 1.45rem;
 }
-main.intro a{
+.intro a{
     font-size: 2rem;
     color: white;
     text-decoration: none;
     padding: 1rem;
     background-color: #000633;
     border-radius: 10px;
+    width: 100%;
 }
 nav h1{
     flex-grow: 1;
@@ -145,20 +157,26 @@ div.slide-menu{
   display: flex;
   flex-direction: column;
   padding: 1rem;
-  //padding-top: 5rem;
   box-shadow: 5px 0px 8px rgba(0, 0, 0, 0.35);
 }
+
+div.main-bttns{
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+    width: 100%;
+}
 div.slide-menu button{
  margin: 1rem 0;
     text-align: left;
     font-weight: 600;
     font-size: 1.2rem;
 }
 div.slide-menu p{
-    //margin-top: rem;
+/*    margin-top: rem;*/
 }
 div.slide-menu a{
-    //margin-top: 0rem;
+/*    margin-top: 0rem;*/
 }
 div.close-menu{
     position: fixed;
@@ -246,11 +264,17 @@ button {
 main{
     margin-top: 4.1rem;
 }
+main.map {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+}
 main.details {
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
-    align-items: flex-start
+    align-items: flex-start;
 }
 form{
 
@@ -350,14 +374,27 @@ input[type=search]{
   margin: .5rem;
   background: rgba(255, 255, 255, 0.19);
   border: none;
-  //border-bottom: 2px rgb(255, 255, 255) solid;
+/*  //border-bottom: 2px rgb(255, 255, 255) solid;*/
   color: white;
   font-weight: 600;
   font-size: 1.2rem;
   border-radius: 5px;
+	max-width: 40rem;
 }
-main.details{
+nav.search{
+	justify-content: center;
 }
+div.desk-details {
+    display: none;
+}
+
+
+div.group{
+	width: 100%;
+	max-width: 26rem;
+}
+
+
 
 /* ==========================================================================
    Helper classes