diff --git a/changelog.md b/changelog.md
index 386f1a3..5c825ac 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
# changelog
+### Sunday, 27/11/2016 - v2.5.1
+- Fixed the column rendering on the new user page. Really should have tested that better
+- Added a hover tooltip to fully read the brew description
+- Made the brew items take up only 25% allowing you to view more per row.
+
### Wednesday, 23/11/2016 - v2.5.0
- Metadata can now be added to brews
- Added a metadata editor onto the edit and new pages
diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx
index 6a15903..c74a736 100644
--- a/client/homebrew/pages/userPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx
@@ -17,9 +17,9 @@ const BrewItem = React.createClass({
render : function(){
const brew = this.props.brew;
- return
+ return
{brew.title}
-
{brew.description}
+
{brew.description}
- Authors: {brew.authors.join(', ')}
diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.less b/client/homebrew/pages/userPage/brewItem/brewItem.less
index f8145cb..2263990 100644
--- a/client/homebrew/pages/userPage/brewItem/brewItem.less
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.less
@@ -2,7 +2,7 @@
.brewItem{
display : inline-block;
vertical-align : top;
- width : 33%;
+ width : 25%;
margin-bottom : 15px;
-webkit-column-break-inside : avoid;
page-break-inside : avoid;
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index b16fac1..c83fcb6 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -9,6 +9,7 @@ const RecentNavItem = require('../../navbar/recent.navitem.jsx');
const Account = require('../../navbar/account.navitem.jsx');
const BrewItem = require('./brewItem/brewItem.jsx');
+
const UserPage = React.createClass({
getDefaultProps: function() {
return {
@@ -18,6 +19,8 @@ const UserPage = React.createClass({
},
renderBrews : function(brews){
+ if(!brews || !brews.length) return No Brews.
+
return _.map(brews, (brew, idx) => {
return
});
@@ -29,10 +32,18 @@ const UserPage = React.createClass({
});
},
+ renderPrivateBrews : function(privateBrews){
+ if(!privateBrews || !privateBrews.length) return;
+
+ return [
+ {this.props.username}'s unpublished brews
,
+ this.renderBrews(privateBrews)
+ ];
+ },
+
render : function(){
const brews = this.getSortedBrews();
-
return
@@ -45,8 +56,7 @@ const UserPage = React.createClass({
{this.props.username}'s brews
{this.renderBrews(brews.published)}
- {brews.private ? {this.props.username}'s unpublished brews
: null}
- {this.renderBrews(brews.private)}
+ {this.renderPrivateBrews(brews.private)}
diff --git a/client/homebrew/pages/userPage/userPage.less b/client/homebrew/pages/userPage/userPage.less
index 9041470..d8885fb 100644
--- a/client/homebrew/pages/userPage/userPage.less
+++ b/client/homebrew/pages/userPage/userPage.less
@@ -1,12 +1,36 @@
+html, body, #reactContainer, .homebrew, .page {
+ height : auto;
+ min-height : 100vh;
+}
+
+.noColumns(){
+ column-count : auto;
+ column-fill : auto;
+ column-gap : auto;
+ column-width : auto;
+ -webkit-column-count : auto;
+ -moz-column-count : auto;
+ -webkit-column-width : auto;
+ -moz-column-width : auto;
+ -webkit-column-gap : auto;
+ -moz-column-gap : auto;
+}
+
.userPage{
.content .phb{
- height : 80%;
min-height : 350px;
margin : 20px auto;
- column-count : 1;
+ height : auto;
+ .noColumns();
&::after{
display : none;
}
+
+ .noBrews{
+ margin: 10px 0px;
+ font-style: italic;
+ font-size: 1.3em;
+ }
}
}
\ No newline at end of file
diff --git a/package.json b/package.json
index 0e66d4b..1e68b59 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "homebrewery",
"description": "Create authentic looking D&D homebrews using only markdown",
- "version": "2.5.0",
+ "version": "2.5.1",
"scripts": {
"build": "node_modules/.bin/gulp prod",
"watch": "node_modules/.bin/gulp",