diff --git a/scripts/notes.js b/scripts/notes.js new file mode 100644 index 0000000..0571bc0 --- /dev/null +++ b/scripts/notes.js @@ -0,0 +1,8 @@ + +require('fixme')({ + path: process.cwd(), + ignored_directories: ['node_modules/**', '.git/**', 'build/**'], + file_patterns: ['**/*.js', '**/*.jsx', '**/*.less'], + file_encoding: 'utf8', + line_length_limit: 200 +}); \ No newline at end of file diff --git a/shared/homebrewery/brewEditor/brewEditor.jsx b/shared/homebrewery/brewEditor/brewEditor.jsx index 6d142b1..489b0ad 100644 --- a/shared/homebrewery/brewEditor/brewEditor.jsx +++ b/shared/homebrewery/brewEditor/brewEditor.jsx @@ -105,6 +105,11 @@ const BrewEditor = React.createClass({ r.push(lineNumber); } + if(line.indexOf('\\column') !== -1){ + codeMirror.addLineClass(lineNumber, 'text', 'columnSplit'); + r.push(lineNumber); + } + if(_.startsWith(line, '{{') || _.startsWith(line, '}}')){ codeMirror.addLineClass(lineNumber, 'text', 'block'); } diff --git a/shared/homebrewery/brewEditor/brewEditor.less b/shared/homebrewery/brewEditor/brewEditor.less index d54d8f8..48e3e08 100644 --- a/shared/homebrewery/brewEditor/brewEditor.less +++ b/shared/homebrewery/brewEditor/brewEditor.less @@ -12,6 +12,10 @@ color : purple; //font-style: italic; } + .columnSplit{ + font-style : italic; + color : grey; + } } .brewJump{ diff --git a/shared/homebrewery/brewRenderer/brewRenderer.jsx b/shared/homebrewery/brewRenderer/brewRenderer.jsx index f140fdf..bcce8c6 100644 --- a/shared/homebrewery/brewRenderer/brewRenderer.jsx +++ b/shared/homebrewery/brewRenderer/brewRenderer.jsx @@ -133,6 +133,11 @@ const BrewRenderer = React.createClass({ return this.lastRender; }, + //TODO: This is pretty bad + renderStyle : function(){ + return + }, + render : function(){ if(this.props.brew.version == 1) return ; @@ -146,7 +151,7 @@ const BrewRenderer = React.createClass({ - + {this.renderStyle()}
{this.renderPages()} diff --git a/shared/homebrewery/markdown.js b/shared/homebrewery/markdown.js index 32380a0..36947a9 100644 --- a/shared/homebrewery/markdown.js +++ b/shared/homebrewery/markdown.js @@ -31,6 +31,9 @@ module.exports = { marked : Markdown, render : (rawBrewText)=>{ blockCount = 0; + + rawBrewText = rawBrewText.replace(/\\column/g, '{{columnSplit }}') + let html = Markdown(rawBrewText, {renderer : renderer, sanitize: true}); //Close all hanging block tags html += _.times(blockCount, ()=>{return '
'}).join('\n'); diff --git a/shared/homebrewery/phb_style/phb.blocks.less b/shared/homebrewery/phb_style/phb.blocks.less index 30ff368..41aac34 100644 --- a/shared/homebrewery/phb_style/phb.blocks.less +++ b/shared/homebrewery/phb_style/phb.blocks.less @@ -57,11 +57,22 @@ -moz-column-span : all; } -.twoCol{ - background-color: red; +.oneColumn{ + column-count : 1; +} +.twoColumn{ column-count : 2; } +.threeColumn{ + column-count : 3; +} +.fourColumn{ + column-count : 4; +} .columnSplit{ - //TODO: make \column trigger this + visibility : hidden; + -webkit-column-break-after : always; + break-after : always; + -moz-column-break-after : always; } \ No newline at end of file diff --git a/shared/homebrewery/phb_style/phb.less b/shared/homebrewery/phb_style/phb.less index 42fc0ec..aa9c056 100644 --- a/shared/homebrewery/phb_style/phb.less +++ b/shared/homebrewery/phb_style/phb.less @@ -15,7 +15,7 @@ @import './phb.blocks.less'; - @page { margin: 0; } //???? + @page { margin: 0; } //TODO: ???? .useColumns(@multiplier : 1){ @@ -322,12 +322,14 @@ list-style-type : none; } //Column Break + /* pre, code{ visibility : hidden; -webkit-column-break-after : always; break-after : always; -moz-column-break-after : always; } + */ //Avoid breaking up p,blockquote,table{ z-index : 15; diff --git a/shared/homebrewery/snippets/style/bg.snippet.js b/shared/homebrewery/snippets/style/bg.snippet.js new file mode 100644 index 0000000..b898f0e --- /dev/null +++ b/shared/homebrewery/snippets/style/bg.snippet.js @@ -0,0 +1,12 @@ +module.exports = { + dmg : ()=>{ + return `.phb{ + background-image: url('/assets/homebrewery/phb_style/img/dmg_bg.jpg'); +}`; + }, + dark: ()=>{ + return `.phb{ + background-image: url('/assets/homebrewery/phb_style/img/phb_dark_bg.jpg'); +}`; + } +} \ No newline at end of file diff --git a/shared/homebrewery/snippets/style/index.js b/shared/homebrewery/snippets/style/index.js index 995e36d..bdf313a 100644 --- a/shared/homebrewery/snippets/style/index.js +++ b/shared/homebrewery/snippets/style/index.js @@ -2,5 +2,6 @@ const _ = require('lodash'); module.exports = _.merge( require('./ink.snippet.js'), - require('./a4.snippet.js') + require('./a4.snippet.js'), + require('./bg.snippet.js') );