Fix brew styles overwriting each other. (#1230)

naturalcrit · Feb 5, 2021 · c642a35 · c642a35
1 parent 2fe3533
commit c642a35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 155 deletions.
diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -168,7 +168,7 @@ const BrewRenderer = createClass({
 	        : null}
 
 				<Frame initialContent={this.state.initialContent} style={{ width: '100%', height: '100%', visibility: this.state.visibility }} contentDidMount={this.frameDidMount}>
-					<div className={cx('brewRenderer', this.state.renderer)}
+					<div className={'brewRenderer'}
 						onScroll={this.handleScroll}
 						style={{ height: this.state.height }}>
 

diff --git a/client/homebrew/brewRenderer/brewRenderer.less b/client/homebrew/brewRenderer/brewRenderer.less
@@ -1,6 +1,6 @@
 @import (multiple, less) 'shared/naturalcrit/styles/reset.less';
-@import (multiple, less) './client/homebrew/phbStyle/phb.styleLegacy.less';
-@import (multiple, less) './client/homebrew/phbStyle/phb.style.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;

diff --git a/client/homebrew/brewRenderer/brewRendererLegacy.jsx b/client/homebrew/brewRenderer/brewRendererLegacy.jsx