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

Merge branch 'gray-content-block-btn-alignment' into 'master'
8089a77c · Jacob Schatz · 89fc80be · 7b2f3a67 · 8089a77c
Commit 8089a77c authored Feb 24, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

blocks.scss app/assets/stylesheets/framework/blocks.scss +1 -1

No files found.
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -66,7 +66,7 @@
  }

  .oneline {
-    line-height: 42px;
+    line-height: 35px;
  }

  > p:last-child {