Merge remote-tracking branch 'origin/dev'

Conflicts: app/views/general/mainBody.scala.html All conflicts now resolved, and build passes.
KatrinaHoffert · Mar 10, 2015 · 39605b1 · 39605b1
2 parents 529ede0 + de73144
commit 39605b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/assets/stylesheets/main.less b/app/assets/stylesheets/main.less
@@ -88,6 +88,11 @@ body {
   }
 }
 
+/* Moves all glyphicons up one pixel */
+glyphicon {
+  top: 0px;
+}
+
 .largeHeading, .smallHeading {
   flex-shrink: 0;
 }

diff --git a/app/views/general/mainBody.scala.html b/app/views/general/mainBody.scala.html
@@ -46,11 +46,6 @@
 
     <!-- This is the custom stylesheet, so must load last. -->
     <link rel="stylesheet" href="@controllers.routes.Assets.at("stylesheets/main.css")" />
-      <style>
-      .glyphicon {
-	    top: 0px;
-	  }
-    </style>
   </head>
   <body>
     @* Here be ye right ol' content! *@