merge and squash dev into master

euryalus · Jan 10, 2017 · b42ee06 · b42ee06
1 parent c29599e
commit b42ee06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/assets/stylus/components/blog.styl b/assets/stylus/components/blog.styl
@@ -100,15 +100,19 @@
   border-radius 4px
 
 .Circle-tag
-  width 14em
-  height 14em
+  width 13em
+  height 13em
   background #ededed
   border-radius 50%
 
   @media $break-767
-    width 10em
-    height 10em
+    width 8em
+    height 8em
 
+  @media $break-767-height
+    width 8em
+    height 8em
+
 .Tag-inner
   text-align center
   margin auto
@@ -118,7 +122,11 @@
   margin .1em
 
   @media $break-767
-      font-size 2.5em
+    font-size 1.5em
+
+  @media $break-767-height
+    font-size 1.5em
+
 
 .Caption-tag
   font-size 1.5em

diff --git a/assets/stylus/variables.styl b/assets/stylus/variables.styl
@@ -58,6 +58,7 @@ $paragraph-font-weight ?=	300
 // Media queries, breakpoints 
 $break-767 ?=             "all and (max-width 767px)"
 $break-320 ?=             "all and (max-width 320px)"
+$break-767-height ?=      "all and (max-height 767px)"
 $content-max ?=				1000px
 
 // Grid system

diff --git a/templates/blog.jade b/templates/blog.jade
@@ -23,7 +23,7 @@ block main
           h4(style="color:white;").Background-caption-text-button Read More
 
     section.Site-gray-bkg
-      div.Site-content-container
+      div(style="margin-bottom:1em;").Site-content-container
         a(class='anchor' name="pupil")
         div.Feature-container-column
           div.Grid.Grid--justifyCenter.Grid--center.Grid--alignContentCenter
@@ -51,6 +51,7 @@ block main
                       div.Circle-tag.Tag-inner.Grid--center.Grid--justifyCenter.Grid-cell--fillHeight.Grid-column
                         i.material-icons.Icon-tag= article.metadata.tag.icon
                         div.Caption-tag= article.metadata.tag.caption
+
               else
                 a(href=article.url)
                   div.Feature-image--blog-archive--wrapper.Grid--center.Grid--justifyCenter.Grid-cell--fillHeight