Merge branch 'develop'

coshx · Nov 25, 2014 · b1c21f3 · b1c21f3
2 parents 2125d76 + 45d18c6
commit b1c21f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/app/assets/stylesheets/posts.css.scss b/app/assets/stylesheets/posts.css.scss
@@ -106,6 +106,11 @@
   padding: 0px 10px;
   background-color: $grey-white;
 
+  .row {
+    padding-left: 0px;
+    padding-right: 0px;
+  }
+
   h3 {
     font-size: 42px !important;
     color: $dark-grey;

diff --git a/app/assets/stylesheets/z_media.css.scss b/app/assets/stylesheets/z_media.css.scss
@@ -0,0 +1,7 @@
+@media only screen and (max-width: 40em) { 
+  .post-content {
+    p {
+      font-size: 1.3em;
+    }
+  }
+}