diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-24 11:57:15 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-24 11:57:15 +0000 |
commit | 8089a77c4b8477e73de7c942594ebaa3e26dc558 (patch) | |
tree | 14945e0ccbad3ca32ccc17e26cfb1deff8f2db48 | |
parent | 89fc80beb5516f1c482c61520f328d867e7a07cf (diff) | |
parent | 7b2f3a6727e6ed190928a6bc42df0e3cf3bfdf57 (diff) | |
download | gitlab-ce-8089a77c4b8477e73de7c942594ebaa3e26dc558.tar.gz |
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
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index bd89cc7dc1d..d7e4153ddc0 100644 --- 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 { |