Removed dep on marked, added in a definition list for list types

package.json

@@ -29,7 +29,6 @@
     "jwt-simple": "^0.5.1",
     "lodash": "^4.17.3",
     "loglevel": "^1.4.1",
-    "marked": "^0.3.5",
     "moment": "^2.11.0",
     "mongoose": "^4.3.3",
     "nconf": "^0.8.4",

shared/homebrewery/markdown.js

@@ -1,5 +1,6 @@
 const _ = require('lodash');
-const Markdown = require('marked');
+//const Markdown = require('marked');
+const Markdown = require('./marked.lib.js');
 
 
 const renderer = new Markdown.Renderer();
@@ -25,19 +26,27 @@ renderer.paragraph = function(text){
 	}, []).join('\n');
 	return res;
 };
-
 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(isOrdered) return `<ol>${list}</ol>`;
+	return `<ul>${list}</ul>`;
+}
+
 
 module.exports = {
 	marked : Markdown,
 	render : (rawBrewText)=>{
 		blockCount = 0;
 
-		rawBrewText = rawBrewText.replace(/\\column/g, '{{columnSplit }}')
+		rawBrewText = rawBrewText.replace(/\\column/g, '{{columnSplit }}');
+
+
+		let html = Markdown(rawBrewText,{renderer : renderer, sanitize: true});
+
 
-		let html = Markdown(rawBrewText, {renderer : renderer, sanitize: true});
 		//Close all hanging block tags
 		html += _.times(blockCount, ()=>{return '</div>'}).join('\n');
 		return html;

shared/homebrewery/phb_style/phb.blocks.less

@@ -1,15 +1,7 @@
 
 ///////////////////
 .spell{
-	ul:first-of-type{
-		margin-top      : -0.5em;
-		margin-bottom   : 0.5em;
 
-		list-style-type : none;
-		&+p{
-			text-indent : 0em;
-		}
-	}
 }
 .monster{
 	.breakAvoid();

shared/homebrewery/phb_style/phb.elements.less

@@ -1,15 +1,14 @@
+
 pre{
-	font-family : monospace;
+	padding                     : 12px;
-	background-color : @yellow;
+	background-color            : @yellow;
-	padding : 12px;
+	font-family                 : monospace;
-	border: 1px solid #bfbfbf;
+	color                       : #333;
-	white-space: pre-wrap;
+	border                      : 1px solid #bfbfbf;
-	color : #333;
+	white-space                 : pre-wrap;
 	-webkit-column-break-inside : avoid;
 	column-break-inside         : avoid;
 }
-
-
 hr{
 	visibility       : visible;
 	height           : 6px;
@@ -18,65 +17,49 @@ hr{
 	background-size  : 100% 100%;
 	border           : none;
 }
-
-
 p{
 	padding-bottom : 0.8em;
 	line-height    : 1.3em;
 	&+p{
 		margin-top : -0.8em;
 	}
-
-
 }
-
-
-
 blockquote{
 	font-style : italic;
 	&>p{
-		line-height: 1.8em;
+		line-height : 1.8em;
-
 		//Why did I do this?
 		&:first-child::first-line{
-
+			font-family : ScalySansSmallCaps;
 			//TODO: Find the right font for block quotes
-			font-style: normal;
+			font-style  : normal;
-			font-family: ScalySansSmallCaps;
-
-
 		}
 	}
 	.cite{
-		font-style: normal;
+		font-style : normal;
-		text-align: right;
+		text-align : right;
 	}
-
-
 }
-
-
-
 // IMAGE
 img{
-	z-index : -1;
+	display        : block;
-	display: block;
+	z-index        : -1;
-	mix-blend-mode:multiply;
+	mix-blend-mode : multiply;
-
 	&.center{
-		margin-right: auto;
+		margin-right : auto;
-		margin-left: auto;
+		margin-left  : auto;
+	}
+	&.noBlend{
+		mix-blend-mode : normal;
+	}
+	&.bg, &.background{
+		position : absolute;
 	}
 }
-
-
-
 //Indents after p or lists
 p+p, ul+p, ol+p{
 	text-indent : 1em;
 }
-
-
 strong{
 	font-weight    : bold;
 	letter-spacing : 0.03em;
@@ -127,8 +110,6 @@ h5{
 	font-size     : 0.423cm;
 	font-weight   : 900;
 }
-
-
 //******************************
 //          LISTS
 //******************************
@@ -154,17 +135,26 @@ ol{
 	list-style-position : outside;
 	list-style-type     : decimal;
 }
-
+ul.def{
-
+	margin-top          : -0.5em;
+	margin-bottom       : 0.5em;
+	padding-left        : 0em;
+	list-style-position : outside;
+	list-style-type     : none;
+	list-style-type     : none;
+	&+p{
+		text-indent : 0em;
+	}
+}
 //*****************************
 // *          TABLE
 // *****************************/
 table{
 	.useSansSerif();
-	break-inside: avoid-column;
 	width         : 100%;
 	margin-bottom : 1em;
 	font-size     : 10pt;
+	break-inside  : avoid-column;
 	thead{
 		font-weight : 800;
 		th{