Merged

bisak · bisak · commit f69f38aaa107 · 2016-11-14T17:44:06.000+02:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
 # DroneMapper
 
-<a href="https://docs.google.com/document/d/12SayItPnzYe70hpYb2lVgmwHRL0hAytFr74bw49XC-g/edit?usp=sharing">DroneMapper Documentation</a>
+<a href="https://docs.google.com/document/d/12SayItPnzYe70hpYb2lVgmwHRL0hAytFr74bw49XC-g/edit?usp=sharing">DroneMapper Old Documentation</a>
+Documentation will soon be updated.
diff --git a/gallery.html b/gallery.html
@@ -66,8 +66,10 @@
     <div class="container">
         <div class="row">
             <div class="col l4 s12">
-                <h5 class="white-text">Info</h5>
-                <p class="white-text">DroneMapper is an open source project ... add description</p>
+                <h5 class="white-text">Download</h5>
+                <a href='https://play.google.com/store/apps/details?id=com.dronemapper&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
+                    <img class="badgeGooglePlay" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/>
+                </a>
             </div>
             <div class="col l4 s12">
                 <h5 class="white-text">Contact</h5>
diff --git a/index.html b/index.html
@@ -50,7 +50,13 @@
         <div class="row">
             <div class="col l4 s12">
                 <h5 class="white-text">Download</h5>
+<<<<<<< HEAD
                 <a href='https://play.google.com/store/apps/details?id=com.dronemapper&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img class="responsive-img" style="max-width: 60%" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
+=======
+                <a href='https://play.google.com/store/apps/details?id=com.dronemapper&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
+                    <img class="badgeGooglePlay" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/>
+                </a>
+>>>>>>> origin/master
             </div>
             <div class="col l4 s12">
                 <h5 class="white-text">Contact</h5>
diff --git a/login.html b/login.html
@@ -74,8 +74,10 @@
     <div class="container">
         <div class="row">
             <div class="col l4 s12">
-                <h5 class="white-text">Info</h5>
-                <p class="white-text">DroneMapper is an open source project ... add description</p>
+                <h5 class="white-text">Download</h5>
+                <a href='https://play.google.com/store/apps/details?id=com.dronemapper&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
+                    <img class="badgeGooglePlay" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/>
+                </a>
             </div>
             <div class="col l4 s12">
                 <h5 class="white-text">Contact</h5>
diff --git a/register.html b/register.html
@@ -101,8 +101,10 @@
     <div class="container">
         <div class="row">
             <div class="col l4 s12">
-                <h5 class="white-text">Info</h5>
-                <p class="white-text">DroneMapper is an open source project ... add description</p>
+                <h5 class="white-text">Download</h5>
+                <a href='https://play.google.com/store/apps/details?id=com.dronemapper&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
+                    <img class="badgeGooglePlay" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/>
+                </a>
             </div>
             <div class="col l4 s12">
                 <h5 class="white-text">Contact</h5>
diff --git a/styles/map.css b/styles/map.css
@@ -10,4 +10,8 @@
 
 #materialbox-overlay {
     background-color: transparent;
+}
+
+img.materialboxed.initialized{
+    width: 100%;
 }
diff --git a/styles/style.css b/styles/style.css
@@ -15,4 +15,17 @@ main {
 
 .side-nav{
     z-index: 9999;
+}
+
+@media (min-width: 1025px) {
+    .badgeGooglePlay{
+        width: 200px;
+        margin-left: -14px;
+    }
+}
+
+@media(max-width: 1024px){
+    .badgeGooglePlay{
+        width: 100%;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,8 @@`
`10`	`10`
`11`	`11`	`#materialbox-overlay {`
`12`	`12`	`background-color: transparent;`
	`13`	`+}`
	`14`	`+`
	`15`	`+img.materialboxed.initialized{`
	`16`	`+ width: 100%;`
`13`	`17`	`}`