diff --git a/client/homebrew/phbStyle/phb.depricated.less b/client/homebrew/phbStyle/phb.depricated.less deleted file mode 100644 index a790b51b8..000000000 --- a/client/homebrew/phbStyle/phb.depricated.less +++ /dev/null @@ -1,33 +0,0 @@ -.brewRendererOld { - .phb_old{ - //Double hr for full width elements - hr+hr+blockquote{ - column-span : all; - -webkit-column-span : all; - -moz-column-span : all; - } - - //***************************** - // * CLASS TABLE - // *****************************/ - hr+table{ - margin-top : -5px; - margin-bottom : 50px; - padding-top : 10px; - border-collapse : separate; - background-color : white; - border : initial; - border-style : solid; - border-image-outset : 37px 17px; - border-image-repeat : round; - border-image-slice : 150 200 150 200; - border-image-source : @frameBorderImage; - border-image-width : 47px; - } - h5+hr+table{ - column-span : all; - -webkit-column-span : all; - -moz-column-span : all; - } - } -} \ No newline at end of file diff --git a/shared/depricated/brewRendererOld/brewRendererOld.jsx b/shared/depricated/brewRendererOld/brewRendererOld.jsx index f1f801ff2..51d39d39c 100644 --- a/shared/depricated/brewRendererOld/brewRendererOld.jsx +++ b/shared/depricated/brewRendererOld/brewRendererOld.jsx @@ -100,13 +100,13 @@ const OLD_BrewRenderer = React.createClass({ }, renderDummyPage : function(index){ - return
+ return
}, renderPage : function(pageText, index){ - return
+ return
}, renderPages : function(){ diff --git a/shared/homebrewery/brewRenderer/brewRenderer.jsx b/shared/homebrewery/brewRenderer/brewRenderer.jsx index c1cb099fe..0560f3a99 100644 --- a/shared/homebrewery/brewRenderer/brewRenderer.jsx +++ b/shared/homebrewery/brewRenderer/brewRenderer.jsx @@ -107,13 +107,13 @@ const BrewRenderer = React.createClass({ }, renderDummyPage : function(index){ - return
+ return
}, renderPage : function(pageText, index){ - return
+ return
}, renderPages : function(){ diff --git a/shared/homebrewery/brewRenderer/brewRenderer.less b/shared/homebrewery/brewRenderer/brewRenderer.less index c893dbac4..26d9df3a6 100644 --- a/shared/homebrewery/brewRenderer/brewRenderer.less +++ b/shared/homebrewery/brewRenderer/brewRenderer.less @@ -1,5 +1,5 @@ -@import (less) './client/homebrew/phbStyle/phb.style.less'; +@import (less) './shared/homebrewery/phb_style/phb.style.less'; .pane{ position : relative; } diff --git a/client/homebrew/phbStyle/border.png b/shared/homebrewery/phb_style/img/border.png similarity index 100% rename from client/homebrew/phbStyle/border.png rename to shared/homebrewery/phb_style/img/border.png diff --git a/client/homebrew/phbStyle/note_border.png b/shared/homebrewery/phb_style/img/note_border.png similarity index 100% rename from client/homebrew/phbStyle/note_border.png rename to shared/homebrewery/phb_style/img/note_border.png diff --git a/client/homebrew/phbStyle/red.png b/shared/homebrewery/phb_style/img/red.png similarity index 100% rename from client/homebrew/phbStyle/red.png rename to shared/homebrewery/phb_style/img/red.png diff --git a/client/homebrew/phbStyle/phb.assets.less b/shared/homebrewery/phb_style/phb.assets.less similarity index 100% rename from client/homebrew/phbStyle/phb.assets.less rename to shared/homebrewery/phb_style/phb.assets.less diff --git a/client/homebrew/phbStyle/phb.fonts.css b/shared/homebrewery/phb_style/phb.fonts.css similarity index 100% rename from client/homebrew/phbStyle/phb.fonts.css rename to shared/homebrewery/phb_style/phb.fonts.css diff --git a/client/homebrew/phbStyle/phb.style.less b/shared/homebrewery/phb_style/phb.style.less similarity index 61% rename from client/homebrew/phbStyle/phb.style.less rename to shared/homebrewery/phb_style/phb.style.less index c0bf41684..faadb4202 100644 --- a/client/homebrew/phbStyle/phb.style.less +++ b/shared/homebrewery/phb_style/phb.style.less @@ -1,47 +1,54 @@ @import (less) 'shared/naturalcrit/styles/reset.less'; -@import (less) './client/homebrew/phbStyle/phb.fonts.css'; -@import (less) './client/homebrew/phbStyle/phb.assets.less'; -@import (less) './client/homebrew/phbStyle/phb.depricated.less'; -//Colors -@background : #EEE5CE; -@noteGreen : #e0e5c1; -@headerUnderline : #c9ad6a; -@horizontalRule : #9c2b1b; -@headerText : #58180D; -@monsterStatBackground : #FDF1DC; +@import (less) './phb.fonts.css'; +@import (less) './phb.assets.less'; -@page { margin: 0; } -//TODO: Change -.brewRenderer { - counter-reset : phb-page-numbers; +@media print { + .phb.v1{ + .descriptive, blockquote{ + box-shadow : none; + } + } } -.useSansSerif(){ - font-family : ScalySans; - em{ + +.phb.v1{ + + //Colors + @background : #EEE5CE; + @noteGreen : #e0e5c1; + @headerUnderline : #c9ad6a; + @horizontalRule : #9c2b1b; + @headerText : #58180D; + @monsterStatBackground : #FDF1DC; + + @page { margin: 0; } + + + .useSansSerif(){ font-family : ScalySans; - font-style : italic; + em{ + font-family : ScalySans; + font-style : italic; + } + strong{ + font-family : ScalySans; + font-weight : 800; + letter-spacing : -0.02em; + } } - strong{ - font-family : ScalySans; - font-weight : 800; - letter-spacing : -0.02em; + .useColumns(@multiplier : 1){ + column-count : 2; + column-fill : auto; + column-gap : 1cm; + column-width : 8cm * @multiplier; + -webkit-column-count : 2; + -moz-column-count : 2; + -webkit-column-width : 8cm * @multiplier; + -moz-column-width : 8cm * @multiplier; + -webkit-column-gap : 1cm; + -moz-column-gap : 1cm; } -} -.useColumns(@multiplier : 1){ - column-count : 2; - column-fill : auto; - column-gap : 1cm; - column-width : 8cm * @multiplier; - -webkit-column-count : 2; - -moz-column-count : 2; - -webkit-column-width : 8cm * @multiplier; - -moz-column-width : 8cm * @multiplier; - -webkit-column-gap : 1cm; - -moz-column-gap : 1cm; -} -.phb{ & *{ -webkit-print-color-adjust : exact; } @@ -361,124 +368,157 @@ -webkit-column-break-inside : avoid; column-break-inside : avoid; } -} -//***************************** -// * SPELL LIST -// *****************************/ -.phb .spellList{ - .useSansSerif(); - column-count : 4; - column-span : all; - -webkit-column-span : all; - -moz-column-span : all; - ul+h5{ - margin-top : 15px; - } - p, ul{ - font-size : 0.352cm; - line-height : 1.3em; - } - ul{ - margin-bottom : 0.5em; - padding-left : 1em; - text-indent : -1em; - list-style-type : none; - -webkit-column-break-inside : auto; - column-break-inside : auto; - } -} -//***************************** -// * PRINT -// *****************************/ -.phb.print{ - blockquote{ - box-shadow : none; - } -} -@media print { - .phb .descriptive, .phb blockquote{ - box-shadow : none; - } -} -//***************************** -// * WIDE -// *****************************/ -.phb .wide{ - column-span : all; - -webkit-column-span : all; - -moz-column-span : all; -} -//***************************** -// * CLASS TABLE -// *****************************/ -.phb .classTable{ - margin-top : 25px; - margin-bottom : 40px; - border-collapse : separate; - background-color : white; - border : initial; - border-style : solid; - border-image-outset : 25px 17px; - border-image-repeat : round; - border-image-slice : 150 200 150 200; - border-image-source : @frameBorderImage; - border-image-width : 47px; - h5{ - margin-bottom : 10px; - } -} -//***************************** -// * CLASS TABLE -// *****************************/ -.phb .descriptive{ - display : block-inline; - margin-bottom : 1em; - background-color : #faf7ea; - font-family : ScalySans; - border-style : solid; - border-width : 7px; - border-image : @descriptiveBoxImage 12 round; - border-image-outset : 4px; - box-shadow : 0px 0px 6px #faf7ea; - p{ - display : block; - padding-bottom : 0px; - line-height : 1.5em; - } - p + p { - padding-top : .8em; - } - em { - font-family : ScalySans; - font-style : italic; - } - strong { - font-family : ScalySans; - font-weight : 800; - letter-spacing : -0.02em; - } -} -.phb pre+.descriptive{ - margin-top : 8px; -} -//***************************** -// * TABLE OF CONTENTS -// *****************************/ -.phb .toc{ - -webkit-column-break-inside : avoid; - column-break-inside : avoid; - a{ - color : black; - text-decoration : none; - &:hover{ - text-decoration : underline; + + //***************************** + // * SPELL LIST + // *****************************/ + .spellList{ + .useSansSerif(); + column-count : 4; + column-span : all; + -webkit-column-span : all; + -moz-column-span : all; + ul+h5{ + margin-top : 15px; + } + p, ul{ + font-size : 0.352cm; + line-height : 1.3em; + } + ul{ + margin-bottom : 0.5em; + padding-left : 1em; + text-indent : -1em; + list-style-type : none; + -webkit-column-break-inside : auto; + column-break-inside : auto; } } - ul{ - padding-left : 0; - list-style-type : none; + //***************************** + // * PRINT + // *****************************/ + &.print{ + blockquote{ + box-shadow : none; + } } - &>ul>li{ - margin-bottom : 10px; + + //***************************** + // * WIDE + // *****************************/ + .wide{ + column-span : all; + -webkit-column-span : all; + -moz-column-span : all; + } + //***************************** + // * CLASS TABLE + // *****************************/ + .classTable{ + margin-top : 25px; + margin-bottom : 40px; + border-collapse : separate; + background-color : white; + border : initial; + border-style : solid; + border-image-outset : 25px 17px; + border-image-repeat : round; + border-image-slice : 150 200 150 200; + border-image-source : @frameBorderImage; + border-image-width : 47px; + h5{ + margin-bottom : 10px; + } + } + //***************************** + // * CLASS TABLE + // *****************************/ + .descriptive{ + display : block-inline; + margin-bottom : 1em; + background-color : #faf7ea; + font-family : ScalySans; + border-style : solid; + border-width : 7px; + border-image : @descriptiveBoxImage 12 round; + border-image-outset : 4px; + box-shadow : 0px 0px 6px #faf7ea; + p{ + display : block; + padding-bottom : 0px; + line-height : 1.5em; + } + p + p { + padding-top : .8em; + } + em { + font-family : ScalySans; + font-style : italic; + } + strong { + font-family : ScalySans; + font-weight : 800; + letter-spacing : -0.02em; + } + } + pre+.descriptive{ + margin-top : 8px; + } + //***************************** + // * TABLE OF CONTENTS + // *****************************/ + .toc{ + -webkit-column-break-inside : avoid; + column-break-inside : avoid; + a{ + color : black; + text-decoration : none; + &:hover{ + text-decoration : underline; + } + } + ul{ + padding-left : 0; + list-style-type : none; + } + &>ul>li{ + margin-bottom : 10px; + } + } + + + + //***************************** + // * Old Stuff + // *****************************/ + + //Double hr for full width elements + hr+hr+blockquote{ + column-span : all; + -webkit-column-span : all; + -moz-column-span : all; + } + + //***************************** + // * CLASS TABLE + // *****************************/ + hr+table{ + margin-top : -5px; + margin-bottom : 50px; + padding-top : 10px; + border-collapse : separate; + background-color : white; + border : initial; + border-style : solid; + border-image-outset : 37px 17px; + border-image-repeat : round; + border-image-slice : 150 200 150 200; + border-image-source : @frameBorderImage; + border-image-width : 47px; + } + h5+hr+table{ + column-span : all; + -webkit-column-span : all; + -moz-column-span : all; } } \ No newline at end of file