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/10] 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 87a91941895ae9bf9cd96400c58f2cc1ec3d6ff8 Mon Sep 17 00:00:00 2001
From: Gazook89 <58999374+Gazook89@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:08:52 -0500
Subject: [PATCH 03/10] remove unset on listPage height.
---
client/homebrew/pages/basePages/listPage/listPage.less | 1 -
1 file changed, 1 deletion(-)
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less
index 6ee160fdc..2286c2d6e 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -12,7 +12,6 @@
-moz-column-gap : auto;
}
.listPage{
- height : unset !important;
.content{
.phb{
.noColumns();
From 10a349ade8047e966f02dd7746dd26099b1b7d2c Mon Sep 17 00:00:00 2001
From: Gazook89 <58999374+Gazook89@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:27:02 -0500
Subject: [PATCH 04/10] change sortDir to always white.
---
client/homebrew/pages/basePages/listPage/listPage.less | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less
index 2286c2d6e..2b804a4ce 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -77,9 +77,7 @@
&.sortDir{
width : auto;
padding: 5px;
- &:hover {
- color: white;
- }
+ color: white;
}
}
From 8ac4d9358163229fcd1c109bde3183c18cde7836 Mon Sep 17 00:00:00 2001
From: Gazook89 <58999374+Gazook89@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:47:35 -0500
Subject: [PATCH 05/10] change sort-container to baseline alignment
---
client/homebrew/pages/basePages/listPage/listPage.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less
index 2b804a4ce..3f74fda79 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -43,7 +43,7 @@
z-index : 500;
display : flex;
justify-content : center;
- align-items : center;
+ align-items : baseline;
column-gap : 15px;
row-gap : 5px;
flex-wrap : wrap;
From 9fcc7b84c33302b4d2d2ffa8cde19149b17368fe Mon Sep 17 00:00:00 2001
From: Gazook89 <58999374+Gazook89@users.noreply.github.com>
Date: Mon, 19 Sep 2022 11:06:33 -0500
Subject: [PATCH 06/10] set .sort-option to .active rather than button within.
---
client/homebrew/pages/basePages/listPage/listPage.jsx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index 98451d54f..3ef9d54fd 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -114,11 +114,10 @@ const ListPage = createClass({
},
renderSortOption : function(sortTitle, sortValue){
- return
+ return
From 3c75ac6156955cf75185882a652d4b2246351fd5 Mon Sep 17 00:00:00 2001
From: Gazook89 <58999374+Gazook89@users.noreply.github.com>
Date: Mon, 19 Sep 2022 11:30:44 -0500
Subject: [PATCH 07/10] change some .less to reflect new focus of .active
---
.../pages/basePages/listPage/listPage.less | 28 +++++++++++++++----
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less
index 3f74fda79..fcdaea69e 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -52,6 +52,27 @@
font-family : 'Open Sans', sans-serif;
font-size : 11px;
font-weight : bold;
+ }
+ .sort-option {
+ display: flex;
+ align-items: center;
+ padding: 0 5px;
+
+
+ &.active {
+ font-weight: bold;
+ color: white;
+ border: 1px solid darkcyan;
+ border-radius: 5px;
+ button {
+ color: white;
+
+ &.sortDir {
+ background-color: darkcyan;
+ }
+ }
+ }
+
}
.filter-option {
margin-left: 20px;
@@ -69,14 +90,9 @@
font-size : 11px;
color : #888;
padding : 0;
- &.active{
- font-weight : bold;
- color : white;
- border-bottom : 1px solid white;
- }
&.sortDir{
width : auto;
- padding: 5px;
+ padding-left: 5px;
color: white;
}
}
From 6329cb2cec4260a26f1dceedab5a427d071360bd Mon Sep 17 00:00:00 2001
From: Gazook89 <58999374+Gazook89@users.noreply.github.com>
Date: Wed, 21 Sep 2022 10:56:45 -0500
Subject: [PATCH 08/10] style changes for better contrast
---
.../pages/basePages/listPage/listPage.jsx | 2 +-
.../pages/basePages/listPage/listPage.less | 27 ++++++++++---------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index 3ef9d54fd..6c097afe0 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -126,7 +126,7 @@ const ListPage = createClass({
onClick={this.handleSortDirChange}
className='sortDir'
>
- {this.state.sortDir == 'asc' ?
:
}
+ {this.state.sortDir == 'asc' ?
:
}
: ''
}
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less
index fcdaea69e..aa6fe707e 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -35,10 +35,11 @@
top : 0;
left : 0;
width : 100%;
+ height : 30px;
background-color : #555;
border-top : 1px solid #666;
+ border-bottom : 1px solid #666;
color : white;
- padding : 2px;
text-align : center;
z-index : 500;
display : flex;
@@ -56,19 +57,24 @@
.sort-option {
display: flex;
align-items: center;
- padding: 0 5px;
+ padding: 0 8px;
+ color: #ccc;
+ height: 100%;
+ &:hover{
+ background-color : #444;
+ }
&.active {
font-weight: bold;
- color: white;
- border: 1px solid darkcyan;
- border-radius: 5px;
+ color: #ddd;
+ background-color: #333;
+
button {
color: white;
-
+ font-weight: 800;
&.sortDir {
- background-color: darkcyan;
+ padding-left: 5px;
}
}
}
@@ -88,13 +94,8 @@
text-transform : uppercase;
font-weight : normal;
font-size : 11px;
- color : #888;
+ color : #ccc;
padding : 0;
- &.sortDir{
- width : auto;
- padding-left: 5px;
- color: white;
- }
}
From 3754468cf48af18f9535f431698247e758187a4e Mon Sep 17 00:00:00 2001
From: Gazook89 <58999374+Gazook89@users.noreply.github.com>
Date: Wed, 21 Sep 2022 11:12:23 -0500
Subject: [PATCH 09/10] change sortDir by clicking on sort title.
---
client/homebrew/pages/basePages/listPage/listPage.jsx | 2 +-
client/homebrew/pages/basePages/listPage/listPage.less | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index 6c097afe0..e49a24906 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -117,7 +117,7 @@ const ListPage = createClass({
return
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less
index aa6fe707e..9f274ce51 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -69,10 +69,11 @@
font-weight: bold;
color: #ddd;
background-color: #333;
-
+
button {
color: white;
font-weight: 800;
+ height: 100%;
&.sortDir {
padding-left: 5px;
}
From 910868cfdb6f63927cd65047cf7224a2a32058d9 Mon Sep 17 00:00:00 2001
From: Trevor Buckner
Date: Sun, 25 Sep 2022 22:20:44 -0400
Subject: [PATCH 10/10] Simplified sort arrow, removed duplicate "onClick"
---
.../pages/basePages/listPage/brewItem/brewItem.jsx | 4 ++--
client/homebrew/pages/basePages/listPage/listPage.jsx | 10 ++--------
client/homebrew/pages/basePages/listPage/listPage.less | 8 ++++----
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
index 79a4f7d0f..171fc5bb4 100644
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
@@ -96,7 +96,7 @@ const BrewItem = createClass({
render : function(){
const brew = this.props.brew;
if(Array.isArray(brew.tags)) { // temporary fix until dud tags are cleaned
- brew.tags = brew.tags?.filter(tag => tag); //remove tags that are empty strings
+ brew.tags = brew.tags?.filter((tag)=>tag); //remove tags that are empty strings
}
const dateFormatString = 'YYYY-MM-DD HH:mm:ss';
@@ -112,7 +112,7 @@ const BrewItem = createClass({
{brew.tags.map((tag, idx)=>{
- let matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
+ const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
return {matches[2]};
})}
diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index e49a24906..162aba5e4 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -121,14 +121,8 @@ const ListPage = createClass({
>
{`${sortTitle}`}
- {this.state.sortType == sortValue ?
-
- : ''
+ {this.state.sortType == sortValue &&
+
}
;
},
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less
index 9f274ce51..a88589265 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -74,12 +74,12 @@
color: white;
font-weight: 800;
height: 100%;
- &.sortDir {
+ & + .sortDir {
padding-left: 5px;
}
}
}
-
+
}
.filter-option {
margin-left: 20px;
@@ -98,7 +98,7 @@
color : #ccc;
padding : 0;
}
-
-
+
+
}
}