Merge remote-tracking branch 'origin/master'

# Conflicts: # Wello/www/admin.php # Wello/www/cred.php
etl12003 · Apr 24, 2017 · 5514af2 · 5514af2
2 parents f3965a2 + 11cef42
commit 5514af2
Show file tree

Hide file tree

Showing 33 changed files with 4,626 additions and 4,551 deletions.
diff --git a/Wello/www/PhpMyAdmin/js/jquery/jquery-1.8.3.min.js b/Wello/www/PhpMyAdmin/js/jquery/jquery-1.8.3.min.js
diff --git a/Wello/www/PhpMyAdmin/libraries/phpseclib/Crypt/AES.php b/Wello/www/PhpMyAdmin/libraries/phpseclib/Crypt/AES.php
diff --git a/Wello/www/PhpMyAdmin/libraries/phpseclib/Crypt/Rijndael.php b/Wello/www/PhpMyAdmin/libraries/phpseclib/Crypt/Rijndael.php
diff --git a/Wello/www/PhpMyAdmin/libraries/select_lang.lib.php b/Wello/www/PhpMyAdmin/libraries/select_lang.lib.php
@@ -521,11 +521,11 @@ $GLOBALS['l']['w_page'] = __('Page number:');
 
 
 // now, that we have loaded the language strings we can send the errors
-if ($GLOBALS['lang_failed_cfg']
-    || $GLOBALS['lang_failed_cookie']
-    || $GLOBALS['lang_failed_request']) {
+if ($GLOBALS['lang_failed_cfg']
+    || $GLOBALS['lang_failed_cookie']
+    || $GLOBALS['lang_failed_request']) {
     trigger_error(
-        __('Ignoring unsupported language code'),
+        __('Ignoring unsupported language code'),
         E_USER_ERROR
     );
 }

diff --git a/Wello/www/css/desktop.css b/Wello/www/css/desktop.css
@@ -1,63 +1,63 @@
-@media only screen and (min-width: 40.75em) {
-	div.well-card {
-    	border: 2px solid #4d4d4d;
-		margin: 1.5rem;
-		max-width: 41rem;
-	}
-
-	main.list {
-		display: flex;
-		flex-direction: column;
-/*		justify-content: center;*/
-		align-items: center;
-	}
-
-	main.list h1{
-		display: block;
-	}
-
-	main.list a{
-		width: 75%;
-		max-width: 41rem;
-	}
-}
-
-@media only screen and (min-width: 45em) {
-	div.well-card {
-    	border: 2px solid #4d4d4d;
-		margin: 1.5rem;
-		max-width: 41rem;
-	}
-	main.search{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	main.search  a{
-		color: inherit;
-		width: 50%;
-		max-width: 41rem;
-	}
-
-
-
-}
-
-@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;
-	}
-	main.map{
-		margin-top: 0;
-	}
-}
+@media only screen and (min-width: 40.75em) {
+	div.well-card {
+    	border: 2px solid #4d4d4d;
+		margin: 1.5rem;
+		max-width: 41rem;
+	}
+
+	main.list {
+		display: flex;
+		flex-direction: column;
+/*		justify-content: center;*/
+		align-items: center;
+	}
+
+	main.list h1{
+		display: block;
+	}
+
+	main.list a{
+		width: 75%;
+		max-width: 41rem;
+	}
+}
+
+@media only screen and (min-width: 45em) {
+	div.well-card {
+    	border: 2px solid #4d4d4d;
+		margin: 1.5rem;
+		max-width: 41rem;
+	}
+	main.search{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	main.search  a{
+		color: inherit;
+		width: 50%;
+		max-width: 41rem;
+	}
+
+
+
+}
+
+@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;
+	}
+	main.map{
+		margin-top: 0;
+	}
+}
diff --git a/Wello/www/css/main.css b/Wello/www/css/main.css
@@ -1,3 +1,5 @@
+@import url('https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i');
+
 /*! HTML5 Boilerplate v5.3.0 | MIT License | https://html5boilerplate.com/ */
 /*
  * What follows is the result of much research on cross-browser styling.
@@ -10,7 +12,8 @@
 html {
   color: #222;
   font-size: 1em;
-  line-height: 1.4; }
+  line-height: 1.4; 
+}
 
 /*
  * Remove text-shadow in selection highlight:
@@ -84,6 +87,9 @@ textarea {
   box-sizing: border-box;
   font-family: "roboto";
 }
+body{
+width: 100vw;
+}
 main.intro{
     margin: 0;
     padding: 0;
@@ -131,6 +137,8 @@ nav h1{
     flex-grow: 1;
     margin: 0 0;
 	font-size: 1.5rem;
+	margin-left: 1.25rem;
+	color: white;
 }
 h1.title{
   display: none;
@@ -163,6 +171,11 @@ div.slide-menu{
   box-shadow: 5px 0px 8px rgba(0, 0, 0, 0.35);
 }
 
+nav img{
+	max-width: 3rem;
+	width: 100%;
+}
+
 div.main-bttns{
     display: flex;
     align-items: center;
@@ -191,6 +204,15 @@ div.close-menu{
 h3{
   margin: 0;
   font-size: 1.25rem;
+	font-weight: 600;
+}
+h4{
+	font-weight: 400;
+	font-size: 1.1rem;
+	margin-bottom: 0;
+}
+p{
+	font-weight: 300;
 }
 a.settings{
  position: absolute;
@@ -272,29 +294,6 @@ button, a {
     button.gps img {
       width: 100%; }
 
-
-/*
-#map {
-  width: 100vw !important;
-  height: 100vh !important;
-  height: calc(100vh - 8.1rem); 
-}
-*/
-/*
-#map {
-        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;
-    }
-*/
 .google-maps {
         position: relative;
 
@@ -310,27 +309,23 @@ button, a {
         height: 100% !important;
     }
 main{
-/*    margin-top: 4.1rem;*/
 	margin-top: 0;
 }
 
-/*
-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;
+	width: 100%;
 }
-form{
-
+nav.form a{
+    text-decoration: none;
+	font-weight: 600;
+	color: white;
+	font-size: 1.25rem;
+	padding: .5rem;
 }
 main img{
     width: 100%;
@@ -343,20 +338,26 @@ main.details li, main.details p{
 }
 
 label[for=well-picture] {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 13rem;
+    margin-top: 60px;
     background: lightgray;
 }
-
+label[for=well-picture] img {
+	width: 100%;
+}
+label[for=gps-coordinates] img {
+	height: 1.75rem;
+}
 h2{
     width: calc(100% - 2rem);
   font-weight: 700;
   margin-bottom: 0;
   border-bottom: 1px solid black;
 }
 
+h3{
+	font-weight: 500;
+}
+
 label {
   display: block;
   font-weight: 500;
@@ -455,12 +456,23 @@ div.group{
 main.search{
 	margin-top: 4.2rem;
 }
-
+main.details{
+	margin-top: 53px;
+}
 main.list{
-  margin-top: 66px;
+  margin-top: 64px;
   margin-bottom: 66px;
 }
 
+input[type=file]{
+	width: 0.1px;
+	height: 0.1px;
+	opacity: 0;
+	overflow: hidden;
+	position: absolute;
+	z-index: -1;
+}
+
 /* ==========================================================================
    Helper classes
    ========================================================================== */