Merge branch 'master' of github.com:adamhrv/megapixels_dev

4 files changed, 84 insertions, 6 deletions

diff --git a/site/assets/css/applets.css b/site/assets/css/applets.css
index fc71ecc4..ecba518c 100644
--- a/site/assets/css/applets.css
+++ b/site/assets/css/applets.css
@@ -1,7 +1,77 @@
 .applet {
   margin-bottom: 40px;
+  transition: opacity 0.2s cubic-bezier(0,0,1,1);
+  opacity: 0;
 }
 .applet.map {
   width: 100vw;
   height: 50vh;
-}
\ No newline at end of file
+}
+.applet.loaded {
+  opacity: 1;
+}
+
+.row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
+
+.results {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+.results > div {
+  width: 200px;
+  margin-left: 20px;
+  margin-bottom: 40px;
+  font-size: 8pt;
+}
+.results > div img {
+  margin-bottom: 4px;
+  width: 200px;
+  height: 200px;
+  background: rgba(255,255,255,0.05);
+}
+.results > div:nth-child(3n+1) {
+  margin-left: 0;
+}
+.query h2 {
+  margin-top: 0; padding-top: 0;
+}
+.cta {
+  padding-left: 20px;
+  font-size: 11pt;
+}
+.cta ol {
+  margin: 0;
+  padding: 0 0 20px 20px;
+}
+.uploadContainer > div {
+  position: relative;
+  width: 300px;
+  height: 300px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #333;
+  border: 3px dashed #fff;
+  border-radius: 10px;
+  opacity: 0.3;
+  transition: opacity 0.2s cubic-bezier(0,0,1,1);
+}
+.uploadContainer.active,
+.desktop .uploadContainer > div:hover {
+  opacity: 1;
+}
+.uploadContainer input {
+  position: absolute;
+  top: 0; left: 0;
+  width: 100%; height: 100%;
+  opacity: 0;
+  cursor: pointer;
+}
+.uploadContainer img {
+  max-width: 40px;
+}
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index b6742cdc..4f2d7c6e 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -131,23 +131,31 @@ h1 {
   padding: 0;
   transition: color 0.2s cubic-bezier(0,0,1,1);
 }
-h2, h3 {
+h2 {
+  color: #ddd;
+  font-weight: 300;
+  font-size: 18pt;
+  margin: 20px 0 10px;
+  padding: 0;
+  transition: color 0.2s cubic-bezier(0,0,1,1);
+}
+h3 {
   margin: 0 0 20px 0;
   padding: 0;
   font-size: 11pt;
   font-weight: 500;
   transition: color 0.2s cubic-bezier(0,0,1,1);
 }
-.content h2 a {
+.content h3 a {
   color: #888;
   text-decoration: none;
 }
-.desktop .content h2 a:hover {
+.desktop .content h3 a:hover {
   color: #fff;
   text-decoration: underline;
 }
 
-th, .gray, h2, h3 {
+th, .gray, h3 {
   font-family: 'Roboto Mono', monospace;
   font-weight: 400;
   text-transform: uppercase;
diff --git a/site/assets/img/icon_camera.svg b/site/assets/img/icon_camera.svg
index b349072e..605fcfe1 100644
--- a/site/assets/img/icon_camera.svg
+++ b/site/assets/img/icon_camera.svg
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -256 1950 1950"><path d="m975.19 549.05q119 0 203.5 84.5t84.5 203.5-84.5 203.5-203.5 84.5-203.5-84.5-84.5-203.5 84.5-203.5 203.5-84.5m704-416q106 0 181 75t75 181v896q0 106-75 181t-181 75h-1408q-106 0-181-75t-75-181v-896q0-106 75-181t181-75h224l51-136q19-49 69.5-84.5t103.5-35.5h512q53 0 103.5 35.5t69.5 84.5l51 136h224m-704 1152q185 0 316.5-131.5t131.5-316.5-131.5-316.5-316.5-131.5-316.5 131.5-131.5 316.5 131.5 316.5 316.5 131.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -256 1950 1950"><path d="m975.19 549.05q119 0 203.5 84.5t84.5 203.5-84.5 203.5-203.5 84.5-203.5-84.5-84.5-203.5 84.5-203.5 203.5-84.5m704-416q106 0 181 75t75 181v896q0 106-75 181t-181 75h-1408q-106 0-181-75t-75-181v-896q0-106 75-181t181-75h224l51-136q19-49 69.5-84.5t103.5-35.5h512q53 0 103.5 35.5t69.5 84.5l51 136h224m-704 1152q185 0 316.5-131.5t131.5-316.5-131.5-316.5-316.5-131.5-316.5 131.5-131.5 316.5 131.5 316.5 316.5 131.5" fill='#fff'/></svg>
\ No newline at end of file
diff --git a/site/assets/img/ajax-loader.gif b/site/assets/img/loader.gif
index dc21df18..dc21df18 100644
--- a/site/assets/img/ajax-loader.gif
+++ b/site/assets/img/loader.gif