From 46a45a85360e6588b87c3724ef848f3dede39e18 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:57:28 -0500 Subject: [PATCH 01/23] replace sort table with divs and give UI styling --- .../pages/basePages/listPage/listPage.jsx | 28 ++++---- .../pages/basePages/listPage/listPage.less | 66 ++++++++++--------- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 0969b9f2a..b81f9c8e0 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -114,7 +114,7 @@ const ListPage = createClass({ }, renderSortOption : function(sortTitle, sortValue){ - return + return
- ; +
; }, handleFilterTextChange : function(e){ @@ -150,7 +150,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 :
-
+ -
+ + +
; }, @@ -233,10 +227,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..a6d465420 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -12,8 +12,8 @@ -moz-column-gap : auto; } .listPage{ + height : unset !important; .content{ - overflow-y : overlay; .phb{ .noColumns(); height : auto; @@ -32,47 +32,49 @@ } .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; + position : sticky; + top : 0; + left : 0; + width : 100%; + background-color : #555; + border-top : 1px solid #666; + color : white; padding : 2px; text-align : center; - z-index : 15; + z-index : 500; + display : flex; + justify-content : center; + align-items : center; 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; - } - } + .filter-option { + background-color: transparent !important; + i{ + padding-right : 5px } } + button{ + background-color : transparent; + font-family : 'Open Sans', sans-serif; + font-size : 11px; + text-transform : uppercase; + font-weight : normal; + color : #888; + &.active{ + font-weight : bold; + text-decoration : underline; + color : unset; + } + &.sortDir{ + width : 75px; + } + } + + } h1 { cursor: pointer; From cfdbe06d07cb71145f7f937b53d4d0f1c4ff1ffe Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Tue, 13 Sep 2022 12:26:28 -0500 Subject: [PATCH 02/23] move dir button next to active sort option --- .../pages/basePages/listPage/listPage.jsx | 48 +++++++++---------- .../pages/basePages/listPage/listPage.less | 44 +++++++---------- 2 files changed, 40 insertions(+), 52 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index b81f9c8e0..98451d54f 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -114,14 +114,23 @@ const ListPage = createClass({ }, renderSortOption : function(sortTitle, sortValue){ - return
- + return
+ + {this.state.sortType == sortValue ? + + : '' + }
; }, @@ -165,26 +174,17 @@ const ListPage = createClass({ renderSortOptions : function(){ return
-
Sort by :
- {this.renderSortOption('Title', 'alpha')} - {this.renderSortOption('Created Date', 'created')} - {this.renderSortOption('Updated Date', 'updated')} - {this.renderSortOption('Views', 'views')} - {/* {this.renderSortOption('Latest', 'latest')} */} +
Sort by :
+ {this.renderSortOption('Title', 'alpha')} + {this.renderSortOption('Created Date', 'created')} + {this.renderSortOption('Updated Date', 'updated')} + {this.renderSortOption('Views', 'views')} + {/* {this.renderSortOption('Latest', 'latest')} */} -
Direction :
+ {this.renderFilterOption()} - - {this.renderFilterOption()} - -
; }, diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index a6d465420..6ee160fdc 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -45,6 +45,9 @@ display : flex; justify-content : center; align-items : center; + column-gap : 15px; + row-gap : 5px; + flex-wrap : wrap; h6{ text-transform : uppercase; font-family : 'Open Sans', sans-serif; @@ -52,50 +55,35 @@ font-weight : bold; } .filter-option { - background-color: transparent !important; + margin-left: 20px; + background-color : transparent !important; + font-size : 11px; i{ - padding-right : 5px + padding-right : 5px; } } button{ background-color : transparent; font-family : 'Open Sans', sans-serif; - font-size : 11px; text-transform : uppercase; font-weight : normal; + font-size : 11px; color : #888; + padding : 0; &.active{ font-weight : bold; - text-decoration : underline; - color : unset; + color : white; + border-bottom : 1px solid white; } &.sortDir{ - width : 75px; + width : auto; + padding: 5px; + &:hover { + color: white; + } } } } - 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'; - } - } } From bb25d30663bfe543ee9d4a1119238bb8c753799d Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Thu, 15 Sep 2022 12:29:25 -0500 Subject: [PATCH 03/23] flex working, but odd vertical spacing --- .../editor/metadataEditor/metadataEditor.jsx | 34 +++++++------ .../editor/metadataEditor/metadataEditor.less | 50 +++++++++++++------ 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 29c193323..a793c4f3f 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -231,23 +231,25 @@ const MetadataEditor = createClass({ value={this.props.metadata.title} onChange={(e)=>this.handleFieldChange('title', e)} />
-
- -