From 4f2ddfa0202f5b15735f655b7b2e3f049d9b6a0b Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 12 Jul 2021 19:37:10 -0400 Subject: [PATCH] Themes are now compiled into separate css files and can be hot-swapped in the renderer as needed --- client/homebrew/brewRenderer/brewRenderer.jsx | 6 ++++- .../homebrew/brewRenderer/brewRenderer.less | 10 +------ client/homebrew/phbStyle/border.png | Bin 327 -> 0 bytes client/homebrew/phbStyle/note_border.png | Bin 530 -> 0 bytes client/homebrew/phbStyle/phb.assets.less | 9 ------- client/homebrew/phbStyle/red.png | Bin 864 -> 0 bytes scripts/buildHomebrew.js | 25 ++++++++++++++++-- .../phb.style.less => themes/5ePhb.style.less | 24 ++++++++--------- .../5ePhbLegacy.style.less | 6 ++--- themes/assets/assets.less | 9 +++++++ .../assets}/descriptiveBorder.png | Bin .../images => themes/assets}/footerAccent.png | Bin .../images => themes/assets}/frameBorder.png | Bin .../assets}/monsterBorderFancy.png | Bin .../assets}/monsterBorderLegacy.png | Bin .../images => themes/assets}/noteBorder.png | Bin .../assets}/parchmentBackground.jpg | Bin .../assets}/parchmentBackgroundGrayscale.jpg | Bin .../images => themes/assets}/redTriangle.png | Bin .../5e legacy}/Bookinsanity Bold Italic.woff2 | Bin .../fonts/5e legacy}/Bookinsanity Bold.woff2 | Bin .../5e legacy}/Bookinsanity Italic.woff2 | Bin .../fonts/5e legacy}/Bookinsanity.woff2 | Bin .../5e legacy}/Mr Eaves Small Caps.woff2 | Bin .../fonts/5e legacy}/Scaly Sans Caps.woff2 | Bin .../fonts/5e legacy}/Scaly Sans.woff2 | Bin .../fonts/5e legacy}/Solbera Imitation.woff2 | Bin .../fonts/5e legacy/fonts.less | 16 +++++------ .../fonts/5e}/Bookinsanity Bold Italic.woff2 | Bin .../fonts/5e}/Bookinsanity Bold.woff2 | Bin .../fonts/5e}/Bookinsanity Italic.woff2 | Bin .../5e}/Bookinsanity Semibold Italic.woff2 | Bin .../v3 => themes/fonts/5e}/Bookinsanity.woff2 | Bin .../fonts/5e}/Mr Eaves Small Caps.woff2 | Bin .../fonts/5e}/Scaly Sans Bold Italic.woff2 | Bin .../fonts/5e}/Scaly Sans Bold.woff2 | Bin .../fonts/5e}/Scaly Sans Caps.woff2 | Bin .../fonts/5e}/Scaly Sans Italic.woff2 | Bin .../v3 => themes/fonts/5e}/Scaly Sans.woff2 | Bin .../fonts/5e}/Solbera Imitation Tweak.woff2 | Bin .../fonts/5e/fonts.less | 24 ++++++++--------- .../phbStyle => themes}/phb.depricated.less | 0 42 files changed, 73 insertions(+), 56 deletions(-) delete mode 100644 client/homebrew/phbStyle/border.png delete mode 100644 client/homebrew/phbStyle/note_border.png delete mode 100644 client/homebrew/phbStyle/phb.assets.less delete mode 100644 client/homebrew/phbStyle/red.png rename client/homebrew/phbStyle/phb.style.less => themes/5ePhb.style.less (98%) rename client/homebrew/phbStyle/phb.styleLegacy.less => themes/5ePhbLegacy.style.less (98%) create mode 100644 themes/assets/assets.less rename {client/homebrew/phbStyle/images => themes/assets}/descriptiveBorder.png (100%) rename {client/homebrew/phbStyle/images => themes/assets}/footerAccent.png (100%) rename {client/homebrew/phbStyle/images => themes/assets}/frameBorder.png (100%) rename {client/homebrew/phbStyle/images => themes/assets}/monsterBorderFancy.png (100%) rename {client/homebrew/phbStyle/images => themes/assets}/monsterBorderLegacy.png (100%) rename {client/homebrew/phbStyle/images => themes/assets}/noteBorder.png (100%) rename {client/homebrew/phbStyle/images => themes/assets}/parchmentBackground.jpg (100%) rename {client/homebrew/phbStyle/images => themes/assets}/parchmentBackgroundGrayscale.jpg (100%) rename {client/homebrew/phbStyle/images => themes/assets}/redTriangle.png (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Bookinsanity Bold Italic.woff2 (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Bookinsanity Bold.woff2 (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Bookinsanity Italic.woff2 (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Bookinsanity.woff2 (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Mr Eaves Small Caps.woff2 (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Scaly Sans Caps.woff2 (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Scaly Sans.woff2 (100%) rename {client/homebrew/phbStyle/fonts/legacy => themes/fonts/5e legacy}/Solbera Imitation.woff2 (100%) rename client/homebrew/phbStyle/phb.fontsLegacy.less => themes/fonts/5e legacy/fonts.less (62%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Bookinsanity Bold Italic.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Bookinsanity Bold.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Bookinsanity Italic.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Bookinsanity Semibold Italic.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Bookinsanity.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Mr Eaves Small Caps.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Scaly Sans Bold Italic.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Scaly Sans Bold.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Scaly Sans Caps.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Scaly Sans Italic.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Scaly Sans.woff2 (100%) rename {client/homebrew/phbStyle/fonts/v3 => themes/fonts/5e}/Solbera Imitation Tweak.woff2 (100%) rename client/homebrew/phbStyle/phb.fonts.less => themes/fonts/5e/fonts.less (63%) rename {client/homebrew/phbStyle => themes}/phb.depricated.less (100%) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 440db1ce3..e95ea3a9d 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -176,7 +176,10 @@ const BrewRenderer = createClass({ : null} - + + style={{ width: '100%', height: '100%', visibility: this.state.visibility }} + contentDidMount={this.frameDidMount}>
@@ -189,6 +192,7 @@ const BrewRenderer = createClass({
{/* Apply CSS from Style tab */} +
${this.props.style} ` }} /> {/* Render pages from Markdown tab */} diff --git a/client/homebrew/brewRenderer/brewRenderer.less b/client/homebrew/brewRenderer/brewRenderer.less index 231e3301e..abb80fc5f 100644 --- a/client/homebrew/brewRenderer/brewRenderer.less +++ b/client/homebrew/brewRenderer/brewRenderer.less @@ -1,19 +1,11 @@ @import (multiple, less) 'shared/naturalcrit/styles/reset.less'; -& {@import (multiple, less) './client/homebrew/phbStyle/phb.styleLegacy.less';} //&{} keeps internal variables locally-scoped -& {@import (multiple, less) './client/homebrew/phbStyle/phb.style.less';} .brewRenderer{ will-change : transform; overflow-y : scroll; .pages{ margin : 30px 0px; - &>.phb{ - margin-right : auto; - margin-bottom : 30px; - margin-left : auto; - box-shadow : 1px 4px 14px #000; - } - &>.phb3{ + &>.page{ margin-right : auto; margin-bottom : 30px; margin-left : auto; diff --git a/client/homebrew/phbStyle/border.png b/client/homebrew/phbStyle/border.png deleted file mode 100644 index 9bfd85e38fc6df451cc628b9bc6115c8eb345b65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0YGfS!3HEhs@wJeDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5he4R}c>anMprAyFYeY$Kep*R+Vo@qXL1JcJiC$i6iGqoq zfu3>Cv*{o!c6hothE&A8y}eNIh=IV-fa#NGtv|5kVT{LwhGX7ajn6xLC|>{nZO@w8 z|LbHj4lHDo$pR6-*v=fdH}il5f3i)_M}uRBY0B91{hs;rUmNRIF}6z;tYB>4$5@>8 ami?_-?Of?ndpV#V7(8A5T-G@yGywqS(R~8| diff --git a/client/homebrew/phbStyle/note_border.png b/client/homebrew/phbStyle/note_border.png deleted file mode 100644 index bf7b30188c1e90112fcce7f91b7ad48ec815f63c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^0YGfS!3HEhs@wJeDVB6cUq=Rpjs4tz5?O(K&H|6f zVg?4jLmG+w|5Tu9(E9DeQ5i{gHcmKbxDVaqvXpbBaJ2{jYcMo24!|*;Wr!P{&V_UuDj@^SQcZw%mPd-yV*R*!N=5JL%B5)=xIyczn+{f-wo&g;yVjWdyT3%zopr0DAK3!TN2bZe?^J zG%heMGmPe!Pyhe|-bqA3RA@u(SvzP{K@=VTB4|j=X5Y*cqH*1QbC(DjzaR(-g7|3_ zg&-;7*&rDN(ur6}4NbWGqdVb& zO(jVT!lVaE@^e|~?Cfl;sy0$e3s&*PB)NGQ)rX{hTT6aaQG7#NBC){8n?6{@PB%$> z!}fay!>$LO)2vp;5-1sF8_C6iRal8J3&N<+;G=-}1?{=J{3Nf1{He=VHX&ugJR++f zQFRC7@to&w@;P5*mi7OzOjy1o@g01D+RDdxNT)=qb?XGHcIyNcLbC3}gRS+_cJ#;COW3sEru6YlGDM7Pr4Xoo4y zieiZ_#^xBw#er2=F*)|x!R><)oq@-XWn_F~uD*VukvDy?ik(W57z7^%lAjMhR4H0k zW2BT8tl}q&arg=='--dev'); const lessTransform = require('vitreum/transforms/less.js'); const assetTransform = require('vitreum/transforms/asset.js'); const babel = require('@babel/core'); +const less = require('less'); const babelify = async (code)=>(await babel.transformAsync(code, { presets: ['@babel/preset-env', '@babel/preset-react'], plugins: ['@babel/plugin-transform-runtime'] })).code; @@ -23,7 +24,27 @@ const build = async ({ bundle, render, ssr })=>{ await fs.outputFile('./build/homebrew/bundle.css', css); await fs.outputFile('./build/homebrew/bundle.js', bundle); await fs.outputFile('./build/homebrew/ssr.js', ssr); - await fs.copy('./client/homebrew/phbStyle/fonts', './build/fonts'); + await fs.copy('./themes/fonts', './build/fonts'); + let src = './themes/5ePhbLegacy.style.less'; + //Parse brew theme files + less.render(fs.readFileSync(src).toString(), { + compress : !isDev + }, function(e, output) { + fs.outputFile('./build/themes/5ePhbLegacy.style.css', output.css); + }); + src = './themes/5ePhb.style.less'; + less.render(fs.readFileSync(src).toString(), { + compress : !isDev + }, function(e, output) { + fs.outputFile('./build/themes/5ePhb.style.css', output.css); + }); + // await less.render(lessCode, { + // compress : !dev, + // sourceMap : (dev ? { + // sourceMapFileInline: true, + // outputSourceFiles: true + // } : false), + // }) //compress files in production if(!isDev){ @@ -37,7 +58,7 @@ const build = async ({ bundle, render, ssr })=>{ } }; -fs.emptyDirSync('./build/homebrew'); +fs.emptyDirSync('./build'); pack('./client/homebrew/homebrew.jsx', { paths : ['./shared'], libs : Proj.libs, diff --git a/client/homebrew/phbStyle/phb.style.less b/themes/5ePhb.style.less similarity index 98% rename from client/homebrew/phbStyle/phb.style.less rename to themes/5ePhb.style.less index 30ecb657a..ce27a89e9 100644 --- a/client/homebrew/phbStyle/phb.style.less +++ b/themes/5ePhb.style.less @@ -1,5 +1,5 @@ -@import (less) './client/homebrew/phbStyle/phb.fonts.less'; -@import (less) './client/homebrew/phbStyle/phb.assets.less'; +@import (less) './themes/fonts/5e/fonts.less'; +@import (less) './themes/assets/assets.less'; //Colors @background : #EEE5CE; @@ -42,7 +42,7 @@ body { -webkit-column-gap : 0.9cm; -moz-column-gap : 0.9cm; } -.phb3{ +.page{ .useColumns(); counter-increment : phb-page-numbers; position : relative; @@ -414,7 +414,7 @@ body { //***************************** // * SPELL LIST // *****************************/ -.phb3 .spellList{ +.page .spellList{ .useSansSerif(); column-count : 4; column-span : all; @@ -440,7 +440,7 @@ body { //***************************** // * WIDE // *****************************/ -.phb3 .wide{ +.page .wide{ column-span : all; -webkit-column-span : all; -moz-column-span : all; @@ -448,7 +448,7 @@ body { //***************************** // * CLASS TABLE // *****************************/ -.phb3 .classTable{ +.page .classTable{ margin-top : 25px; margin-bottom : 40px; border-collapse : separate; @@ -467,7 +467,7 @@ body { //************************************ // * DESCRIPTIVE TEXT BOX // ************************************/ -.phb3 .descriptive{ +.page .descriptive{ display : block-inline; margin-bottom : 1em; background-color : #faf7ea; @@ -495,13 +495,13 @@ body { letter-spacing : -0.02em; } } -.phb3 pre+.descriptive{ +.page pre+.descriptive{ margin-top : 8px; } //***************************** // * TABLE OF CONTENTS // *****************************/ -.phb3 .toc{ +.page .toc{ -webkit-column-break-inside : avoid; page-break-inside : avoid; break-inside : avoid; @@ -565,7 +565,7 @@ body { //***************************** // * MUSTACHE DIVS/SPANS // *****************************/ -.phb3 { +.page { .block { break-inside : avoid; } @@ -580,7 +580,7 @@ body { //***************************** // * DEFINITION LISTS // *****************************/ -.phb3 { +.page { // dl { // margin-top: 10px; // } @@ -597,7 +597,7 @@ body { //***************************** // * BLANK LINE // *****************************/ -.phb3 { +.page { .blank { height: 0.75em; } diff --git a/client/homebrew/phbStyle/phb.styleLegacy.less b/themes/5ePhbLegacy.style.less similarity index 98% rename from client/homebrew/phbStyle/phb.styleLegacy.less rename to themes/5ePhbLegacy.style.less index 32fd8b95e..0f1cae7ec 100644 --- a/client/homebrew/phbStyle/phb.styleLegacy.less +++ b/themes/5ePhbLegacy.style.less @@ -1,6 +1,6 @@ -@import (less) './client/homebrew/phbStyle/phb.fontsLegacy.less'; -@import (less) './client/homebrew/phbStyle/phb.assets.less'; -@import (less) './client/homebrew/phbStyle/phb.depricated.less'; +@import (less) './themes/fonts/5e legacy/fonts.less'; +@import (less) './themes/assets/assets.less'; +@import (less) './themes/phb.depricated.less'; //Colors @background : #EEE5CE; @noteGreen : #e0e5c1; diff --git a/themes/assets/assets.less b/themes/assets/assets.less new file mode 100644 index 000000000..672e3261e --- /dev/null +++ b/themes/assets/assets.less @@ -0,0 +1,9 @@ +@footerAccentImage : data-uri('./themes/assets/footerAccent.png'); +@frameBorderImage : data-uri('./themes/assets/frameBorder.png'); +@backgroundImage : data-uri('./themes/assets/parchmentBackground.jpg'); +@redTriangleImage : data-uri('./themes/assets/redTriangle.png'); +@monsterBorderImageLegacy : data-uri('./themes/assets/monsterBorderLegacy.png'); +@noteBorderImage : data-uri('./themes/assets/noteBorder.png'); +@descriptiveBoxImage : data-uri('./themes/assets/descriptiveBorder.png'); +@monsterBlockBackground : data-uri('./themes/assets/parchmentBackgroundGrayscale.jpg'); +@monsterBorderImage : data-uri('./themes/assets/monsterBorderFancy.png'); diff --git a/client/homebrew/phbStyle/images/descriptiveBorder.png b/themes/assets/descriptiveBorder.png similarity index 100% rename from client/homebrew/phbStyle/images/descriptiveBorder.png rename to themes/assets/descriptiveBorder.png diff --git a/client/homebrew/phbStyle/images/footerAccent.png b/themes/assets/footerAccent.png similarity index 100% rename from client/homebrew/phbStyle/images/footerAccent.png rename to themes/assets/footerAccent.png diff --git a/client/homebrew/phbStyle/images/frameBorder.png b/themes/assets/frameBorder.png similarity index 100% rename from client/homebrew/phbStyle/images/frameBorder.png rename to themes/assets/frameBorder.png diff --git a/client/homebrew/phbStyle/images/monsterBorderFancy.png b/themes/assets/monsterBorderFancy.png similarity index 100% rename from client/homebrew/phbStyle/images/monsterBorderFancy.png rename to themes/assets/monsterBorderFancy.png diff --git a/client/homebrew/phbStyle/images/monsterBorderLegacy.png b/themes/assets/monsterBorderLegacy.png similarity index 100% rename from client/homebrew/phbStyle/images/monsterBorderLegacy.png rename to themes/assets/monsterBorderLegacy.png diff --git a/client/homebrew/phbStyle/images/noteBorder.png b/themes/assets/noteBorder.png similarity index 100% rename from client/homebrew/phbStyle/images/noteBorder.png rename to themes/assets/noteBorder.png diff --git a/client/homebrew/phbStyle/images/parchmentBackground.jpg b/themes/assets/parchmentBackground.jpg similarity index 100% rename from client/homebrew/phbStyle/images/parchmentBackground.jpg rename to themes/assets/parchmentBackground.jpg diff --git a/client/homebrew/phbStyle/images/parchmentBackgroundGrayscale.jpg b/themes/assets/parchmentBackgroundGrayscale.jpg similarity index 100% rename from client/homebrew/phbStyle/images/parchmentBackgroundGrayscale.jpg rename to themes/assets/parchmentBackgroundGrayscale.jpg diff --git a/client/homebrew/phbStyle/images/redTriangle.png b/themes/assets/redTriangle.png similarity index 100% rename from client/homebrew/phbStyle/images/redTriangle.png rename to themes/assets/redTriangle.png diff --git a/client/homebrew/phbStyle/fonts/legacy/Bookinsanity Bold Italic.woff2 b/themes/fonts/5e legacy/Bookinsanity Bold Italic.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Bookinsanity Bold Italic.woff2 rename to themes/fonts/5e legacy/Bookinsanity Bold Italic.woff2 diff --git a/client/homebrew/phbStyle/fonts/legacy/Bookinsanity Bold.woff2 b/themes/fonts/5e legacy/Bookinsanity Bold.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Bookinsanity Bold.woff2 rename to themes/fonts/5e legacy/Bookinsanity Bold.woff2 diff --git a/client/homebrew/phbStyle/fonts/legacy/Bookinsanity Italic.woff2 b/themes/fonts/5e legacy/Bookinsanity Italic.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Bookinsanity Italic.woff2 rename to themes/fonts/5e legacy/Bookinsanity Italic.woff2 diff --git a/client/homebrew/phbStyle/fonts/legacy/Bookinsanity.woff2 b/themes/fonts/5e legacy/Bookinsanity.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Bookinsanity.woff2 rename to themes/fonts/5e legacy/Bookinsanity.woff2 diff --git a/client/homebrew/phbStyle/fonts/legacy/Mr Eaves Small Caps.woff2 b/themes/fonts/5e legacy/Mr Eaves Small Caps.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Mr Eaves Small Caps.woff2 rename to themes/fonts/5e legacy/Mr Eaves Small Caps.woff2 diff --git a/client/homebrew/phbStyle/fonts/legacy/Scaly Sans Caps.woff2 b/themes/fonts/5e legacy/Scaly Sans Caps.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Scaly Sans Caps.woff2 rename to themes/fonts/5e legacy/Scaly Sans Caps.woff2 diff --git a/client/homebrew/phbStyle/fonts/legacy/Scaly Sans.woff2 b/themes/fonts/5e legacy/Scaly Sans.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Scaly Sans.woff2 rename to themes/fonts/5e legacy/Scaly Sans.woff2 diff --git a/client/homebrew/phbStyle/fonts/legacy/Solbera Imitation.woff2 b/themes/fonts/5e legacy/Solbera Imitation.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/legacy/Solbera Imitation.woff2 rename to themes/fonts/5e legacy/Solbera Imitation.woff2 diff --git a/client/homebrew/phbStyle/phb.fontsLegacy.less b/themes/fonts/5e legacy/fonts.less similarity index 62% rename from client/homebrew/phbStyle/phb.fontsLegacy.less rename to themes/fonts/5e legacy/fonts.less index a4043047f..0c47c8e7e 100644 --- a/client/homebrew/phbStyle/phb.fontsLegacy.less +++ b/themes/fonts/5e legacy/fonts.less @@ -1,25 +1,25 @@ /* Main Font, serif */ @font-face { font-family: BookSanity; - src: url('../fonts/legacy/Bookinsanity.woff2'); + src: url('../fonts/5e legacy/Bookinsanity.woff2'); font-weight: normal; font-style: normal; } @font-face { font-family: BookSanity; - src: url('../fonts/legacy/Bookinsanity Bold.woff2'); + src: url('../fonts/5e legacy/Bookinsanity Bold.woff2'); font-weight: bold; font-style: normal; } @font-face { font-family: BookSanity; - src: url('../fonts/legacy/Bookinsanity Italic.woff2'); + src: url('../fonts/5e legacy/Bookinsanity Italic.woff2'); font-weight: normal; font-style: italic; } @font-face { font-family: BookSanity; - src: url('../fonts/legacy/Bookinsanity Bold Italic.woff2'); + src: url('../fonts/5e legacy/Bookinsanity Bold Italic.woff2'); font-weight: bold; font-style: italic; } @@ -27,13 +27,13 @@ /* Notes and Tables, sans-serif */ @font-face { font-family: ScalySans; - src: url('../fonts/legacy/Scaly Sans.woff2'); + src: url('../fonts/5e legacy/Scaly Sans.woff2'); font-weight: normal; font-style: normal; } @font-face { font-family: ScalySansSmallCaps; - src: url('../fonts/legacy/Scaly Sans Caps.woff2'); + src: url('../fonts/5e legacy/Scaly Sans Caps.woff2'); font-weight: normal; font-style: normal; } @@ -41,7 +41,7 @@ /* Headers */ @font-face { font-family: MrJeeves; - src: url('../fonts/legacy/Mr Eaves Small Caps.woff2'); + src: url('../fonts/5e legacy/Mr Eaves Small Caps.woff2'); font-weight: normal; font-style: normal; } @@ -49,7 +49,7 @@ /* Fancy Drop Cap */ @font-face { font-family: Solberry; - src: url('../fonts/legacy/Solbera Imitation.woff2'); + src: url('../fonts/5e legacy/Solbera Imitation.woff2'); font-weight: normal; font-style: normal; } diff --git a/client/homebrew/phbStyle/fonts/v3/Bookinsanity Bold Italic.woff2 b/themes/fonts/5e/Bookinsanity Bold Italic.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Bookinsanity Bold Italic.woff2 rename to themes/fonts/5e/Bookinsanity Bold Italic.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Bookinsanity Bold.woff2 b/themes/fonts/5e/Bookinsanity Bold.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Bookinsanity Bold.woff2 rename to themes/fonts/5e/Bookinsanity Bold.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Bookinsanity Italic.woff2 b/themes/fonts/5e/Bookinsanity Italic.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Bookinsanity Italic.woff2 rename to themes/fonts/5e/Bookinsanity Italic.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Bookinsanity Semibold Italic.woff2 b/themes/fonts/5e/Bookinsanity Semibold Italic.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Bookinsanity Semibold Italic.woff2 rename to themes/fonts/5e/Bookinsanity Semibold Italic.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Bookinsanity.woff2 b/themes/fonts/5e/Bookinsanity.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Bookinsanity.woff2 rename to themes/fonts/5e/Bookinsanity.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Mr Eaves Small Caps.woff2 b/themes/fonts/5e/Mr Eaves Small Caps.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Mr Eaves Small Caps.woff2 rename to themes/fonts/5e/Mr Eaves Small Caps.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Scaly Sans Bold Italic.woff2 b/themes/fonts/5e/Scaly Sans Bold Italic.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Scaly Sans Bold Italic.woff2 rename to themes/fonts/5e/Scaly Sans Bold Italic.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Scaly Sans Bold.woff2 b/themes/fonts/5e/Scaly Sans Bold.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Scaly Sans Bold.woff2 rename to themes/fonts/5e/Scaly Sans Bold.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Scaly Sans Caps.woff2 b/themes/fonts/5e/Scaly Sans Caps.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Scaly Sans Caps.woff2 rename to themes/fonts/5e/Scaly Sans Caps.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Scaly Sans Italic.woff2 b/themes/fonts/5e/Scaly Sans Italic.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Scaly Sans Italic.woff2 rename to themes/fonts/5e/Scaly Sans Italic.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Scaly Sans.woff2 b/themes/fonts/5e/Scaly Sans.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Scaly Sans.woff2 rename to themes/fonts/5e/Scaly Sans.woff2 diff --git a/client/homebrew/phbStyle/fonts/v3/Solbera Imitation Tweak.woff2 b/themes/fonts/5e/Solbera Imitation Tweak.woff2 similarity index 100% rename from client/homebrew/phbStyle/fonts/v3/Solbera Imitation Tweak.woff2 rename to themes/fonts/5e/Solbera Imitation Tweak.woff2 diff --git a/client/homebrew/phbStyle/phb.fonts.less b/themes/fonts/5e/fonts.less similarity index 63% rename from client/homebrew/phbStyle/phb.fonts.less rename to themes/fonts/5e/fonts.less index 855f3cca2..7cd1c9652 100644 --- a/client/homebrew/phbStyle/phb.fonts.less +++ b/themes/fonts/5e/fonts.less @@ -1,25 +1,25 @@ /* Main Font, serif */ @font-face { font-family: BookInsanityRemake; - src: url('../fonts/v3/Bookinsanity.woff2'); + src: url('../fonts/5e/Bookinsanity.woff2'); font-weight: normal; font-style: normal; } @font-face { font-family: BookInsanityRemake; - src: url('../fonts/v3/Bookinsanity Bold.woff2'); + src: url('../fonts/5e/Bookinsanity Bold.woff2'); font-weight: bold; font-style: normal; } @font-face { font-family: BookInsanityRemake; - src: url('../fonts/v3/Bookinsanity Italic.woff2'); + src: url('../fonts/5e/Bookinsanity Italic.woff2'); font-weight: normal; font-style: italic; } @font-face { font-family: BookInsanityRemake; - src: url('../fonts/v3/Bookinsanity Bold Italic.woff2'); + src: url('../fonts/5e/Bookinsanity Bold Italic.woff2'); font-weight: bold; font-style: italic; } @@ -27,31 +27,31 @@ /* Notes and Tables, sans-serif */ @font-face { font-family: ScalySansRemake; - src: url('../fonts/v3/Scaly Sans.woff2'); + src: url('../fonts/5e/Scaly Sans.woff2'); font-weight: normal; font-style: normal; } @font-face { font-family: ScalySansRemake; - src: url('../fonts/v3/Scaly Sans Bold.woff2'); + src: url('../fonts/5e/Scaly Sans Bold.woff2'); font-weight: bold; font-style: normal; } @font-face { font-family: ScalySansRemake; - src: url('../fonts/v3/Scaly Sans Italic.woff2'); + src: url('../fonts/5e/Scaly Sans Italic.woff2'); font-weight: normal; font-style: italic; } @font-face { font-family: ScalySansRemake; - src: url('../fonts/v3/Scaly Sans Bold Italic.woff2'); + src: url('../fonts/5e/Scaly Sans Bold Italic.woff2'); font-weight: bold; font-style: italic; } @font-face { font-family: ScalySansSmallCapsRemake; - src: url('../fonts/v3/Scaly Sans Caps.woff2'); + src: url('../fonts/5e/Scaly Sans Caps.woff2'); font-weight: normal; font-style: normal; } @@ -59,15 +59,15 @@ /* Headers */ @font-face { font-family: MrEavesRemake; - src: url('../fonts/v3/Mr Eaves Small Caps.woff2'); + src: url('../fonts/5e/Mr Eaves Small Caps.woff2'); font-weight: normal; font-style: normal; } /* Fancy Drop Cap */ @font-face { - font-family: SolberaImitationRemake; //Tweaked v3 version - src: url('../fonts/v3/Solbera Imitation Tweak.woff2'); + font-family: SolberaImitationRemake; //Tweaked 5e version + src: url('../fonts/5e/Solbera Imitation Tweak.woff2'); font-weight: normal; font-style: normal; } diff --git a/client/homebrew/phbStyle/phb.depricated.less b/themes/phb.depricated.less similarity index 100% rename from client/homebrew/phbStyle/phb.depricated.less rename to themes/phb.depricated.less