aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinhui2017-12-01 15:44:29 +0100
committerXinhui2017-12-01 15:44:43 +0100
commit0f83730c05bddbdf1ad0ba20ef9990289ecfdb37 (patch)
treebe6594b550fbf81406218fb4a450e9918166f189
parentfe376f05a3f4ced1dfe3eae9500e7b5ff553e5f1 (diff)
downloadchouette-core-0f83730c05bddbdf1ad0ba20ef9990289ecfdb37.tar.bz2
Fix css on header page-action interact with fixed header when scrolling
-rw-r--r--app/assets/stylesheets/components/_page_header.sass1
-rw-r--r--app/views/layouts/navigation/_page_header.html.slim2
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/components/_page_header.sass b/app/assets/stylesheets/components/_page_header.sass
index 566f46d6b..30b88f2c1 100644
--- a/app/assets/stylesheets/components/_page_header.sass
+++ b/app/assets/stylesheets/components/_page_header.sass
@@ -59,7 +59,6 @@
.page-action
line-height: 42px
- height: 45px
margin-bottom: 10px
text-align: right
diff --git a/app/views/layouts/navigation/_page_header.html.slim b/app/views/layouts/navigation/_page_header.html.slim
index 176624459..3df0d0634 100644
--- a/app/views/layouts/navigation/_page_header.html.slim
+++ b/app/views/layouts/navigation/_page_header.html.slim
@@ -14,7 +14,7 @@ div.page_header
div.col-lg-3.col-md-4.col-sm-5.col-xs-5.text-right
div.page-action
- if content_for? :page_header_meta
- div.small = yield :page_header_meta
+ = yield :page_header_meta
- if content_for? :page_header_actions
= yield :page_header_actions