From 10f9ac14c752d633fe2ee9dc4b8af16b462f891c Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Sun, 4 Jun 2017 16:04:34 -0400
Subject: [PATCH] Renaming colors and a bunch of other things

---
 shared/homebrewery/markdown.js                |  5 ++++-
 shared/homebrewery/marked.lib.js              |  2 +-
 shared/homebrewery/phb_style/phb.blocks.less  |  6 +-----
 shared/homebrewery/phb_style/phb.colors.less  | 21 +++++++++++--------
 .../homebrewery/phb_style/phb.elements.less   |  5 ++++-
 shared/homebrewery/phb_style/phb.less         |  4 ++--
 .../homebrewery/snippets/brew/brew.snippet.js |  4 +---
 .../snippets/brew/monster.snippet.js          |  3 ---
 .../homebrewery/snippets/brew/note.snippet.js |  2 +-
 .../snippets/brew/spell.snippet.js            |  7 +++----
 .../snippets/brew/table.snippet.js            |  7 ++++++-
 11 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/shared/homebrewery/markdown.js b/shared/homebrewery/markdown.js
index af9bf2552..4db9729e2 100644
--- a/shared/homebrewery/markdown.js
+++ b/shared/homebrewery/markdown.js
@@ -11,7 +11,10 @@ renderer.paragraph = function(text){
 	if(!matches) return `\n<p>${text}</p>\n`;
 	let matchIndex = 0;
 	const res =  _.reduce(text.split(blockReg), (r, text) => {
+		console.log(text);
+		//if(text) r.push(text);
 		if(text) r.push(Markdown(text, {renderer : renderer, sanitize: true}));
+
 		const block = matches[matchIndex];
 		if(block && block[0] == '{'){
 			r.push(`\n\n<div class="block ${block.substring(2).split(',').join(' ')}">`);
@@ -30,7 +33,7 @@ renderer.image = function(href, title, text){
 	return `<img src="${href}" class="${text.split(',').join(' ')}"></img>`;
 };
 renderer.list = function(list, isOrdered, isDef){
-	if(isDef) return `<ul class='def'>${list}</ul>`;
+	if(isDef) return `<ul class='alt'>${list}</ul>`;
 	if(isOrdered) return `<ol>${list}</ol>`;
 	return `<ul>${list}</ul>`;
 }
diff --git a/shared/homebrewery/marked.lib.js b/shared/homebrewery/marked.lib.js
index adab8d022..97c504146 100644
--- a/shared/homebrewery/marked.lib.js
+++ b/shared/homebrewery/marked.lib.js
@@ -14,7 +14,7 @@ var block = {
   newline: /^\n+/,
   code: /^( {4}[^\n]+\n*)+/,
   fences: noop,
-  hr: /^( *[-*_]){3,} *(?:\n+|$)/,
+  hr: /^( *[-]){3,} *(?:\n+|$)/,
   heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
   nptable: noop,
   lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
diff --git a/shared/homebrewery/phb_style/phb.blocks.less b/shared/homebrewery/phb_style/phb.blocks.less
index 0820acff5..c85aedd78 100644
--- a/shared/homebrewery/phb_style/phb.blocks.less
+++ b/shared/homebrewery/phb_style/phb.blocks.less
@@ -15,10 +15,6 @@
 		tbody tr { background-color: transparent };
 	}
 	ul:nth-of-type(1),ul:nth-of-type(2){
-		list-style: none;
-		padding-left    : 1em;
-		text-indent     : -1em;
-		margin-bottom   : 0.5em;
 		strong{
 			color : @crimson;
 		}
@@ -98,7 +94,7 @@
 	z-index    : 150;
 	width      : 200px;
 	font-size  : 0.9em;
-	color      : @gold;
+	color      : @brown;
 	text-align : right;
 }
 //*****************************
diff --git a/shared/homebrewery/phb_style/phb.colors.less b/shared/homebrewery/phb_style/phb.colors.less
index 35f82f24f..42abcb926 100644
--- a/shared/homebrewery/phb_style/phb.colors.less
+++ b/shared/homebrewery/phb_style/phb.colors.less
@@ -1,5 +1,13 @@
 //TODO: come up with fun color names
 
+@crimson : #58180D;
+@red : #9c2b1b;
+@brown : #c9ad6a; //brown?
+@green : #e0e5c1;
+@yellow : #faf7ea; //same as background?
+@teal : blue;
+@blue : blue;
+
 @background            : #EEE5CE;
 @noteGreen             : #e0e5c1;
 @headerUnderline       : #c9ad6a;
@@ -20,13 +28,7 @@
 	}
 }
 
-@crimson : #58180D;
-@red : #9c2b1b;
-@gold : #c9ad6a; //brown?
-@green : #e0e5c1;
-@yellow : #faf7ea; //same as background?
-@teal : blue;
-@blue : blue;
+
 
 
 //TODO make a color mixin generator
@@ -34,5 +36,6 @@
 .blue{ .colorElements(@blue); }
 .green{ .colorElements(@green); }
 .yellow{ .colorElements(@yellow); }
-.gold{ .colorElements(@gold); }
-.red{ .colorElements(@red); }
+.brown{ .colorElements(fade(@brown, 50%)); }
+.red{ .colorElements(fade(@red, 25%)); }
+.crimson{ .colorElements(fade(@crimson, 20%)); }
diff --git a/shared/homebrewery/phb_style/phb.elements.less b/shared/homebrewery/phb_style/phb.elements.less
index 3813b3745..237511973 100644
--- a/shared/homebrewery/phb_style/phb.elements.less
+++ b/shared/homebrewery/phb_style/phb.elements.less
@@ -135,8 +135,11 @@ ol{
 	list-style-position : outside;
 	list-style-type     : decimal;
 }
-ul.def{
+
+p+ul.alt{
 	margin-top          : -0.5em;
+}
+ul.alt{
 	margin-bottom       : 0.5em;
 	padding-left        : 0em;
 	list-style-position : outside;
diff --git a/shared/homebrewery/phb_style/phb.less b/shared/homebrewery/phb_style/phb.less
index e9adf63c6..9f739f2f5 100644
--- a/shared/homebrewery/phb_style/phb.less
+++ b/shared/homebrewery/phb_style/phb.less
@@ -57,7 +57,7 @@
 		background-size  : cover;
 		padding: 28px 63px;
 		box-sizing: border-box;
-		color : lighten(@gold, 0%);
+		color : lighten(@brown, 0%);
 		font-size: 0.7em;
 	}
 	&:nth-child(even){
@@ -81,7 +81,7 @@
 		bottom     : 22px;
 		width      : 50px;
 		font-size  : 0.9em;
-		color      : @gold;
+		color      : @brown;
 		text-align : center;
 	}
 
diff --git a/shared/homebrewery/snippets/brew/brew.snippet.js b/shared/homebrewery/snippets/brew/brew.snippet.js
index c40a53983..28bf39bf1 100644
--- a/shared/homebrewery/snippets/brew/brew.snippet.js
+++ b/shared/homebrewery/snippets/brew/brew.snippet.js
@@ -12,9 +12,7 @@ const Snips = _.merge(
 
 const BrewSnippets = {
 	brew : ()=>{
-
-
-
+		return _.times(_.random(1,10), ()=>BrewSnippets.page()).join('\n\n\\page\n\n');
 	},
 
 	page : ()=>{
diff --git a/shared/homebrewery/snippets/brew/monster.snippet.js b/shared/homebrewery/snippets/brew/monster.snippet.js
index eb729aaff..70447d6cf 100644
--- a/shared/homebrewery/snippets/brew/monster.snippet.js
+++ b/shared/homebrewery/snippets/brew/monster.snippet.js
@@ -12,9 +12,6 @@ const getStats = function(){
 
 const getAttributes = ()=>{
 
-
-
-
 	return `
 - **Saving Throws**
 - **Condition Immunities** ${Data.rand(["groggy", "swagged", "weak-kneed", "buzzed", "groovy", "melancholy", "drunk"], 3).join(', ')},
diff --git a/shared/homebrewery/snippets/brew/note.snippet.js b/shared/homebrewery/snippets/brew/note.snippet.js
index 18c9233b1..2b79f6938 100644
--- a/shared/homebrewery/snippets/brew/note.snippet.js
+++ b/shared/homebrewery/snippets/brew/note.snippet.js
@@ -4,7 +4,7 @@ const Data = require('./random.data.js');
 
 module.exports = {
 	note : ()=>{
-		return `{{note
+		return `{{note,red
 ##### ${Data.rand('abilities')}
 ${Data.rand('sentences', 6, 4).join(' ')}
 }}`
diff --git a/shared/homebrewery/snippets/brew/spell.snippet.js b/shared/homebrewery/snippets/brew/spell.snippet.js
index 3a0088b16..6f0365f67 100644
--- a/shared/homebrewery/snippets/brew/spell.snippet.js
+++ b/shared/homebrewery/snippets/brew/spell.snippet.js
@@ -26,7 +26,7 @@ module.exports = {
 		const description = Data.rand('effects', 2).concat(Data.rand('effects2')).join(' ');
 
 
-		return `{{spell
+		return `
 #### ${_.sample(Data.spellNames)}
 *${_.sample(levels)}-level ${_.sample(schools)}*
 - **Casting Time:** ${_.sample(['1 action', 'Reaction', '10 minutes', '1 hour'])}
@@ -34,8 +34,7 @@ module.exports = {
 - **Components:** ${components}
 - **Duration:** ${duration}
 
-${description}
-}}`;
+${description}`;
 
 	},
 
@@ -47,6 +46,6 @@ ${description}
 			return `##### ${level} \n${spells} \n`;
 		}).join('\n');
 
-		return `{{fourColumn,fullPage\n${content}\n}}`;
+		return `{{fourColumn,fullPage,sansSerif\n${content}\n}}`;
 	}
 }
\ No newline at end of file
diff --git a/shared/homebrewery/snippets/brew/table.snippet.js b/shared/homebrewery/snippets/brew/table.snippet.js
index a12970505..8f195d544 100644
--- a/shared/homebrewery/snippets/brew/table.snippet.js
+++ b/shared/homebrewery/snippets/brew/table.snippet.js
@@ -43,6 +43,11 @@ const columns = {
 
 module.exports = {
 	table : () => {
+		let title = '';
+
+		if(Data.chance(5)) title = `##### ${Data.rand(Data.abilities)}\n`;
+
+
 		const rows = _.sample([4,6,8,10]);
 
 		let fns = [];
@@ -57,7 +62,7 @@ module.exports = {
 
 		const cols = _.map(fns, (fn)=>fn(rows));
 
-		return _.times(rows + 2, (i)=>{
+		return title + _.times(rows + 2, (i)=>{
 			if(i==1){
 				return '|' + _.map(cols, (col)=>col[i]).join('|') + '|';
 			}else{