From 7c51910835f4c303ec227456e4d8ed86ff855e53 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Wed, 16 Jul 2014 19:54:01 -0500 Subject: [PATCH 1/2] Fixed over width issue caused by the filters div --- public/css/filters.styl | 4 +++- views/main/filters.jade | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/public/css/filters.styl b/public/css/filters.styl index cc340ff8d3..df34bdcb72 100644 --- a/public/css/filters.styl +++ b/public/css/filters.styl @@ -1,6 +1,8 @@ .filters padding-top: 1em padding-bottom: 0.618em + padding-left: 15px + padding-right: 15px margin-left: 0.382em margin-right: 0em ul @@ -31,4 +33,4 @@ display: inline-block margin-right: 0.618em @extend $hrpg-button-with-input - hrpg-button-color-mixin($color-options-submenu) \ No newline at end of file + hrpg-button-color-mixin($color-options-submenu) diff --git a/views/main/filters.jade b/views/main/filters.jade index 9df0a99f24..ff2e4e644c 100644 --- a/views/main/filters.jade +++ b/views/main/filters.jade @@ -1,6 +1,6 @@ .container-fluid .row - .filters.col-md-12(ng-controller='FiltersCtrl') + .filters(ng-controller='FiltersCtrl') ul.filters-controls li=env.t('tags') //- Edit button @@ -33,4 +33,4 @@ a(ng-click='toggleFilter(tag)') span.glyphicon.glyphicon-bullhorn(bo-if="tag.challenge") markdown(ng-model='tag.name') - //
  • \ No newline at end of file + //
  • From 490b0d1b1b11a62d63f9c63ff30b13eafcddb60f Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 19 Jul 2014 18:19:50 -0500 Subject: [PATCH 2/2] Corrected gap in filters style --- public/css/filters.styl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/css/filters.styl b/public/css/filters.styl index df34bdcb72..b436ee25d6 100644 --- a/public/css/filters.styl +++ b/public/css/filters.styl @@ -1,10 +1,11 @@ .filters - padding-top: 1em - padding-bottom: 0.618em - padding-left: 15px - padding-right: 15px + padding: 1em 15px 0.382em margin-left: 0.382em margin-right: 0em + &:after + content: "" + display: table + clear: both ul float: left list-style: none