Merge branch 'master' into feature/skm/196_health_check

Conflicts: .travis.yml
mitodl · Aug 12, 2015 · aff80d0 · aff80d0
2 parents 8d1ad0b + 445d54c
commit aff80d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,js,docs
+envlist = py27,py34,js,docs
 skip_missing_interpreters = True
 skipsdist = True
 

diff --git a/ui/static/ui/css/mit-lore.css b/ui/static/ui/css/mit-lore.css
@@ -325,14 +325,13 @@ a {
 }
 
 .tile-meta {
-    font-size: 13px;
-    color: #666;
-    font-weight: 700;
+	font-size:small;
+	color:#929292;
 }
 
 .meta-item {
     display: inline-block;
-    margin: 0 10px 0 0;
+    margin: 0 14px 0 0;
 }
 
 .meta-item .fa {