0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-14 19:22:52 +00:00

PHB style should be fully scoped

This commit is contained in:
Scott Tolksdorf
2017-02-23 08:11:48 -05:00
parent 2f69ef3fe8
commit b20f4ffb46
10 changed files with 197 additions and 190 deletions

View File

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

View File

@@ -100,13 +100,13 @@ const OLD_BrewRenderer = React.createClass({
}, },
renderDummyPage : function(index){ renderDummyPage : function(index){
return <div className='phb old' id={`p${index + 1}`} key={index}> return <div className='phb v1' id={`p${index + 1}`} key={index}>
<i className='fa fa-spinner fa-spin' /> <i className='fa fa-spinner fa-spin' />
</div> </div>
}, },
renderPage : function(pageText, index){ renderPage : function(pageText, index){
return <div className='phb_old' id={`p${index + 1}`} dangerouslySetInnerHTML={{__html:Markdown.render(pageText)}} key={index} /> return <div className='phb v1' id={`p${index + 1}`} dangerouslySetInnerHTML={{__html:Markdown.render(pageText)}} key={index} />
}, },
renderPages : function(){ renderPages : function(){

View File

@@ -107,13 +107,13 @@ const BrewRenderer = React.createClass({
}, },
renderDummyPage : function(index){ renderDummyPage : function(index){
return <div className='phb' id={`p${index + 1}`} key={index}> return <div className='phb v1' id={`p${index + 1}`} key={index}>
<i className='fa fa-spinner fa-spin' /> <i className='fa fa-spinner fa-spin' />
</div> </div>
}, },
renderPage : function(pageText, index){ renderPage : function(pageText, index){
return <div className='phb' id={`p${index + 1}`} dangerouslySetInnerHTML={{__html:Markdown.render(pageText)}} key={index} /> return <div className='phb v1' id={`p${index + 1}`} dangerouslySetInnerHTML={{__html:Markdown.render(pageText)}} key={index} />
}, },
renderPages : function(){ renderPages : function(){

View File

@@ -1,5 +1,5 @@
@import (less) './client/homebrew/phbStyle/phb.style.less'; @import (less) './shared/homebrewery/phb_style/phb.style.less';
.pane{ .pane{
position : relative; position : relative;
} }

View File

Before

Width:  |  Height:  |  Size: 327 B

After

Width:  |  Height:  |  Size: 327 B

View File

Before

Width:  |  Height:  |  Size: 530 B

After

Width:  |  Height:  |  Size: 530 B

View File

Before

Width:  |  Height:  |  Size: 864 B

After

Width:  |  Height:  |  Size: 864 B

View File

@@ -1,8 +1,19 @@
@import (less) 'shared/naturalcrit/styles/reset.less'; @import (less) 'shared/naturalcrit/styles/reset.less';
@import (less) './client/homebrew/phbStyle/phb.fonts.css'; @import (less) './phb.fonts.css';
@import (less) './client/homebrew/phbStyle/phb.assets.less'; @import (less) './phb.assets.less';
@import (less) './client/homebrew/phbStyle/phb.depricated.less';
@media print {
.phb.v1{
.descriptive, blockquote{
box-shadow : none;
}
}
}
.phb.v1{
//Colors //Colors
@background : #EEE5CE; @background : #EEE5CE;
@noteGreen : #e0e5c1; @noteGreen : #e0e5c1;
@@ -13,10 +24,7 @@
@page { margin: 0; } @page { margin: 0; }
//TODO: Change
.brewRenderer {
counter-reset : phb-page-numbers;
}
.useSansSerif(){ .useSansSerif(){
font-family : ScalySans; font-family : ScalySans;
em{ em{
@@ -41,7 +49,6 @@
-webkit-column-gap : 1cm; -webkit-column-gap : 1cm;
-moz-column-gap : 1cm; -moz-column-gap : 1cm;
} }
.phb{
& *{ & *{
-webkit-print-color-adjust : exact; -webkit-print-color-adjust : exact;
} }
@@ -361,11 +368,11 @@
-webkit-column-break-inside : avoid; -webkit-column-break-inside : avoid;
column-break-inside : avoid; column-break-inside : avoid;
} }
}
//***************************** //*****************************
// * SPELL LIST // * SPELL LIST
// *****************************/ // *****************************/
.phb .spellList{ .spellList{
.useSansSerif(); .useSansSerif();
column-count : 4; column-count : 4;
column-span : all; column-span : all;
@@ -390,20 +397,16 @@
//***************************** //*****************************
// * PRINT // * PRINT
// *****************************/ // *****************************/
.phb.print{ &.print{
blockquote{ blockquote{
box-shadow : none; box-shadow : none;
} }
} }
@media print {
.phb .descriptive, .phb blockquote{
box-shadow : none;
}
}
//***************************** //*****************************
// * WIDE // * WIDE
// *****************************/ // *****************************/
.phb .wide{ .wide{
column-span : all; column-span : all;
-webkit-column-span : all; -webkit-column-span : all;
-moz-column-span : all; -moz-column-span : all;
@@ -411,7 +414,7 @@
//***************************** //*****************************
// * CLASS TABLE // * CLASS TABLE
// *****************************/ // *****************************/
.phb .classTable{ .classTable{
margin-top : 25px; margin-top : 25px;
margin-bottom : 40px; margin-bottom : 40px;
border-collapse : separate; border-collapse : separate;
@@ -430,7 +433,7 @@
//***************************** //*****************************
// * CLASS TABLE // * CLASS TABLE
// *****************************/ // *****************************/
.phb .descriptive{ .descriptive{
display : block-inline; display : block-inline;
margin-bottom : 1em; margin-bottom : 1em;
background-color : #faf7ea; background-color : #faf7ea;
@@ -458,13 +461,13 @@
letter-spacing : -0.02em; letter-spacing : -0.02em;
} }
} }
.phb pre+.descriptive{ pre+.descriptive{
margin-top : 8px; margin-top : 8px;
} }
//***************************** //*****************************
// * TABLE OF CONTENTS // * TABLE OF CONTENTS
// *****************************/ // *****************************/
.phb .toc{ .toc{
-webkit-column-break-inside : avoid; -webkit-column-break-inside : avoid;
column-break-inside : avoid; column-break-inside : avoid;
a{ a{
@@ -482,3 +485,40 @@
margin-bottom : 10px; 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;
}
}