diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 0969b9f2a..162aba5e4 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -114,15 +114,17 @@ const ListPage = createClass({ }, renderSortOption : function(sortTitle, sortValue){ - return - - ; + return
+ + {this.state.sortType == sortValue && + + } +
; }, handleFilterTextChange : function(e){ @@ -150,7 +152,7 @@ const ListPage = createClass({ }, renderFilterOption : function(){ - return + return
- ; +
; }, renderSortOptions : function(){ return
- - - - - {this.renderSortOption('Title', 'alpha')} - {this.renderSortOption('Created Date', 'created')} - {this.renderSortOption('Updated Date', 'updated')} - {this.renderSortOption('Views', 'views')} - {/* {this.renderSortOption('Latest', 'latest')} */} - - - {this.renderFilterOption()} - - -
-
Sort by :
-
-
Direction :
-
- -
+
Sort by :
+ {this.renderSortOption('Title', 'alpha')} + {this.renderSortOption('Created Date', 'created')} + {this.renderSortOption('Updated Date', 'updated')} + {this.renderSortOption('Views', 'views')} + {/* {this.renderSortOption('Latest', 'latest')} */} + + {this.renderFilterOption()} + + +
; }, @@ -233,10 +220,10 @@ const ListPage = createClass({ return
{this.props.navItems} + {this.renderSortOptions()}
- {this.renderSortOptions()} {this.renderBrewCollection(this.state.brewCollection)}
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index d4efbe445..a88589265 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -13,7 +13,6 @@ } .listPage{ .content{ - overflow-y : overlay; .phb{ .noColumns(); height : auto; @@ -32,68 +31,74 @@ } .sort-container{ font-family : 'Open Sans', sans-serif; - position : fixed; - top : 35px; - left : calc(50vw - 400px); - border : 2px solid #58180D; - width : 800px; - background-color : #EEE5CE; - padding : 2px; + position : sticky; + top : 0; + left : 0; + width : 100%; + height : 30px; + background-color : #555; + border-top : 1px solid #666; + border-bottom : 1px solid #666; + color : white; text-align : center; - z-index : 15; + z-index : 500; + display : flex; + justify-content : center; + align-items : baseline; + column-gap : 15px; + row-gap : 5px; + flex-wrap : wrap; h6{ text-transform : uppercase; font-family : 'Open Sans', sans-serif; font-size : 11px; font-weight : bold; - color : #58180D; } - table{ - margin : 0px; - vertical-align : middle; - tbody tr{ - background-color: transparent !important; - i{ - padding-right : 5px - } - button{ - background-color : transparent; - color : #58180D; - font-family : 'Open Sans', sans-serif; - font-size : 11px; - text-transform : uppercase; - font-weight : normal; - &.active{ - font-weight : bold; - border : 2px solid #58180D; - } - &.sortDir{ - width : 75px; - } + .sort-option { + display: flex; + align-items: center; + padding: 0 8px; + color: #ccc; + height: 100%; + + &:hover{ + background-color : #444; + } + + &.active { + font-weight: bold; + color: #ddd; + background-color: #333; + + button { + color: white; + font-weight: 800; + height: 100%; + & + .sortDir { + padding-left: 5px; } } } - } - h1 { - cursor: pointer; - &.active { - color: #58180D; + } - &.inactive { - color: #707070; - - } - &.active::before, &.inactive::before { - font-family: 'Font Awesome 5 Free'; - font-weight: 900; - font-size: 0.6cm; - padding-right: 0.5em; - } - &.active::before { - content: '\f107'; - } - &.inactive::before { - content: '\f105'; + .filter-option { + margin-left: 20px; + background-color : transparent !important; + font-size : 11px; + i{ + padding-right : 5px; + } } + button{ + background-color : transparent; + font-family : 'Open Sans', sans-serif; + text-transform : uppercase; + font-weight : normal; + font-size : 11px; + color : #ccc; + padding : 0; + } + + } }