From 4d66ca653a299c84a623920134f8c9cb87d79b0c Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Mon, 13 Mar 2017 12:48:21 +0200 Subject: [PATCH] Content filter style updates --- app/styles/layouts/content.css | 20 +++++++++++++++++++- app/templates/posts.hbs | 16 ++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/styles/layouts/content.css b/app/styles/layouts/content.css index 7ed46ee02e..d76f34aebb 100644 --- a/app/styles/layouts/content.css +++ b/app/styles/layouts/content.css @@ -8,11 +8,29 @@ align-items: center; justify-content: space-between; margin: 2vw 0 1vw; - padding: 0; + padding: 10px 0 0 0; border-top: color(var(--lightgrey)) 1px solid; list-style: none; } +.gh-contentfilter-left { + display: flex; + align-items: center; +} + +.gh-contentfilter-left .gh-contentfilter-menu { + margin-right: 10px; +} + +.gh-contentfilter-right { + display: flex; + align-items: center; +} + +.gh-contentfilter-right .gh-contentfilter-menu { + margin-left: 10px; +} + .gh-contentfilter li { position: relative; display: inline-block; diff --git a/app/templates/posts.hbs b/app/templates/posts.hbs index afe7190bc6..75b9dd1447 100644 --- a/app/templates/posts.hbs +++ b/app/templates/posts.hbs @@ -13,6 +13,7 @@ searchField="name" onchange=(action "changeType") tagName="div" + classNames="gh-contentfilter-menu gh-contentfilter-type" data-test-type-select=true as |type| }} @@ -26,6 +27,7 @@ searchField="name" onchange=(action "changeAuthor") tagName="div" + classNames="gh-contentfilter-menu gh-contentfilter-author" data-test-author-select=true as |author| }} @@ -39,6 +41,7 @@ searchField="name" onchange=(action "changeTag") tagName="div" + classNames="gh-contentfilter-menu gh-contentfilter-tag" data-test-tag-select=true as |tag| }} @@ -54,6 +57,7 @@ searchEnabled=false onchange=(action "changeOrder") tagName="div" + classNames="gh-contentfilter-menu gh-contentfilter-sort" data-test-order-select=true as |order| }} @@ -93,12 +97,12 @@ {{#if showDeletePostModal}} {{gh-fullscreen-modal "delete-post" - model=(hash - post=selectedPost - onSuccess=(route-action 'onPostDeletion') - ) - close=(action "toggleDeletePostModal") - modifier="action wide"}} + model=(hash + post=selectedPost + onSuccess=(route-action 'onPostDeletion') + ) + close=(action "toggleDeletePostModal") + modifier="action wide"}} {{/if}} {{outlet}}