f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-05 01:32:47 +00:00
Code Wiki Activity

Merge branch 'master' into fixUndefinedCSS

Browse Source
This commit is contained in:
Trevor Buckner
2021-07-30 18:05:02 -04:00
committed by GitHub
parent 577a434e17 d02d51717d
commit 21223cbcd4
61 changed files with 962 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -181,7 +181,10 @@ const BrewRenderer = createClass({
</div>
: null}
<Frame initialContent={this.state.initialContent} style={{ width: '100%', height: '100%', visibility: this.state.visibility }} contentDidMount={this.frameDidMount}>
<Frame initialContent={this.state.initialContent}
head = <link href={`${this.props.renderer == 'legacy' ? '/themes/5ePhbLegacy.style.css' : '/themes/5ePhb.style.css'}`} rel='stylesheet'/>
style={{ width: '100%', height: '100%', visibility: this.state.visibility }}
contentDidMount={this.frameDidMount}>
<div className={'brewRenderer'}
onScroll={this.handleScroll}
style={{ height: this.state.height }}>
@@ -193,7 +196,7 @@ const BrewRenderer = createClass({
</div>
<div className='pages' ref='pages'>
{/* Apply CSS and render pages from Markdown tab */}
{/* Apply CSS from Style tab and render pages from Markdown tab */}
{this.state.isMounted
&&
<>

10
client/homebrew/brewRenderer/brewRenderer.less
View File

@@ -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;