sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-18 12:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3752 from crookedneighbor/develop

Browse source 
Fixed issue with filters div that is bigger than containing div
This commit is contained in:
Tyler Renelle 2014-07-28 13:12:56 -06:00
commit fc910d70a8
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public/css/filters.styl
View file

@ -1,8 +1,11 @@
.filters
padding-top: 1em
padding-bottom: 0.618em
padding: 1em 15px 0.382em
margin-left: 0.382em
margin-right: 0em
&:after
content: ""
display: table
clear: both
ul
float: left
list-style: none
@ -31,4 +34,4 @@
display: inline-block
margin-right: 0.618em
@extend $hrpg-button-with-input
hrpg-button-color-mixin($color-options-submenu)
hrpg-button-color-mixin($color-options-submenu)

4
views/main/filters.jade
View file

@ -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')
// <li class="{#unless activeFilters(users[_userId].filters)}hidden{/}">
// <li class="{#unless activeFilters(users[_userId].filters)}hidden{/}">