Merge branch 'gray-content-block-btn-alignment' into 'master'

Correctly aligned buttons vertical in gray-content-block

Closes #12790 

![Screen_Shot_2016-02-23_at_15.09.19](/uploads/e5c6d97d8c1712273c87a0d592430390/Screen_Shot_2016-02-23_at_15.09.19.png)

See merge request !2941

app/assets/stylesheets/framework/blocks.scss

@@ -66,7 +66,7 @@
   }
 
   .oneline {
-    line-height: 42px;
+    line-height: 35px;
   }
 
   > p:last-child {