Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers

2 files changed, 26 insertions, 6 deletions

diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 7a7f2b0..3db83a9 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -430,6 +430,9 @@ nav .sub.active a {
 	width: calc(87% - 80px);
 	margin-left: 160px;	
 }
+.entry.all {
+	width: 90%;
+}
 .entry h1{
 	margin-bottom: 1.2em;
 	border-bottom: 1px solid;
@@ -664,7 +667,7 @@ nav .sub.active a {
 	opacity:1;
 }
 .cell img {
-	max-height:100%;
+	height:100%;
 	opacity:0.0;
 	transition:0.4s opacity ease-in;
 }
@@ -757,13 +760,13 @@ nav .sub.active a {
 
 .project {
   float: left;
-  width: 33.33333%;
-  height: 220px;
-  padding: 10px 10px 0 10px;
+  width: 25%;
+	height: 200px;
+  height: 14vw;
+  padding: 10px 0px 0 10px;
   cursor: pointer;
   opacity: 0.0;
   font-size: 0.8em;
-  max-width: 300px;
 	transition: 0.1s opacity ease-in;
 	transition-delay:0.4s;
 }
@@ -880,6 +883,23 @@ nav .sub.active a {
 		-moz-column-count: 2;
 		column-count: 2;
 	}
+	
+	.project {
+		width:33.3333%;
+	}
+
+}
+
+@media (max-width:900px) {
+	.entry span div.content {
+		-webkit-column-count: 2;
+		-moz-column-count: 2;
+		column-count: 2;
+	}
+	
+	.project {
+		width:50%;
+	}
 
 }
 
diff --git a/site/templates/all.liquid b/site/templates/all.liquid
index 73da67b..63e5f35 100644
--- a/site/templates/all.liquid
+++ b/site/templates/all.liquid
@@ -1,4 +1,4 @@
-<div class="entry all undone">
+<div class="all undone">
   {% for project in advertisings %}
     <div class="project" data-id="{{ project.id }}" data-type="advertising">
       <img src="{{ project.thumbnail.uri }}">