')){
const openTag = html.substring(0, html.indexOf('>')+1);
html = html.substring(html.indexOf('>')+1);
@@ -73,18 +79,21 @@ renderer.html = function (html) {
};
// Don't wrap {{ Spans alone on a line, or {{ Divs in tags
-renderer.paragraph = function(text){
+renderer.paragraph = function(token){
let match;
+ const text = this.parser.parseInline(token.tokens);
if(text.startsWith(')$/))
return `${match[1].trim() ? `${match[1]}
` : ''}{
+ const index = style.indexOf(':');
+ const [key, value] = [style.substring(0, index), style.substring(index + 1)];
+ styleObj[key.trim()] = value.replace(/"?([^"]*)"?/g, '$1').trim();
+ return styleObj;
+ }, {}) : null;
return {
id : id,
@@ -839,8 +848,8 @@ const extractHTMLStyleTags = (htmlString)=>{
const id = firstElementOnly.match(/id="([^"]*)"/)?.[1] || null;
const classes = firstElementOnly.match(/class="([^"]*)"/)?.[1] || null;
const styles = firstElementOnly.match(/style="([^"]*)"/)?.[1]
- ?.split(';').reduce((styleObj, style) => {
- if (style.trim() === '') return styleObj;
+ ?.split(';').reduce((styleObj, style)=>{
+ if(style.trim() === '') return styleObj;
const index = style.indexOf(':');
const [key, value] = [style.substring(0, index), style.substring(index + 1)];
styleObj[key.trim()] = value.trim();
@@ -850,7 +859,7 @@ const extractHTMLStyleTags = (htmlString)=>{
?.filter((attr)=>!attr.startsWith('class="') && !attr.startsWith('style="') && !attr.startsWith('id="'))
.reduce((obj, attr)=>{
const index = attr.indexOf('=');
- let [key, value] = [attr.substring(0, index), attr.substring(index + 1)];
+ const [key, value] = [attr.substring(0, index), attr.substring(index + 1)];
obj[key.trim()] = value.replace(/"/g, '');
return obj;
}, {}) || null;
@@ -863,7 +872,7 @@ const extractHTMLStyleTags = (htmlString)=>{
};
};
-const mergeHTMLTags = (originalTags, newTags) => {
+const mergeHTMLTags = (originalTags, newTags)=>{
return {
id : newTags.id || originalTags.id || null,
classes : [originalTags.classes, newTags.classes].join(' ').trim() || null,
diff --git a/shared/naturalcrit/nav/nav.jsx b/shared/naturalcrit/nav/nav.jsx
index d9b403239..50dff4c33 100644
--- a/shared/naturalcrit/nav/nav.jsx
+++ b/shared/naturalcrit/nav/nav.jsx
@@ -12,8 +12,8 @@ const Nav = {
displayName : 'Nav.base',
render : function(){
return
- {this.props.children}
- ;
+ {this.props.children}
+ ;
}
}),
logo : function(){
diff --git a/shared/naturalcrit/splitPane/splitPane.jsx b/shared/naturalcrit/splitPane/splitPane.jsx
index 1500c759f..4c77d81a5 100644
--- a/shared/naturalcrit/splitPane/splitPane.jsx
+++ b/shared/naturalcrit/splitPane/splitPane.jsx
@@ -29,8 +29,8 @@ const SplitPane = (props)=>{
const limitPosition = (x, min = 1, max = window.innerWidth - 13)=>Math.round(Math.min(max, Math.max(min, x)));
//when resizing, the divider should grow smaller if less space is given, then grow back if the space is restored, to the original position
- const handleResize = () =>setDividerPos(limitPosition(window.localStorage.getItem(storageKey), 0.1 * (window.innerWidth - 13), 0.9 * (window.innerWidth - 13)));
-
+ const handleResize = ()=>setDividerPos(limitPosition(window.localStorage.getItem(storageKey), 0.1 * (window.innerWidth - 13), 0.9 * (window.innerWidth - 13)));
+
const handleUp =(e)=>{
e.preventDefault();
if(isDragging) {
diff --git a/shared/naturalcrit/splitPane/splitPane.less b/shared/naturalcrit/splitPane/splitPane.less
index 8b61097be..80a8695af 100644
--- a/shared/naturalcrit/splitPane/splitPane.less
+++ b/shared/naturalcrit/splitPane/splitPane.less
@@ -21,8 +21,8 @@
background-color : #BBBBBB;
.dots {
display : table-cell;
- text-align : center;
vertical-align : middle;
+ text-align : center;
i {
display : block !important;
margin : 10px 0px;
diff --git a/shared/naturalcrit/styles/animations.less b/shared/naturalcrit/styles/animations.less
index 69aac3e09..5757df151 100644
--- a/shared/naturalcrit/styles/animations.less
+++ b/shared/naturalcrit/styles/animations.less
@@ -3,127 +3,127 @@
@defaultEasing : ease;
//Animates all properties on an element
-.animateAll(@duration : @defaultDuration, @easing : @defaultEasing){
- -webkit-transition: all @duration @easing;
- -moz-transition: all @duration @easing;
- -o-transition: all @duration @easing;
- transition: all @duration @easing;
+.animateAll(@duration : @defaultDuration, @easing : @defaultEasing) {
+ -webkit-transition : all @duration @easing;
+ -moz-transition : all @duration @easing;
+ -o-transition : all @duration @easing;
+ transition : all @duration @easing;
}
//Animates Specific property
-.animate(@prop, @duration : @defaultDuration, @easing : @defaultEasing){
- -webkit-transition: @prop @duration @easing;
- -moz-transition: @prop @duration @easing;
- -o-transition: @prop @duration @easing;
- transition: @prop @duration @easing;
+.animate(@prop, @duration : @defaultDuration, @easing : @defaultEasing) {
+ -webkit-transition : @prop @duration @easing;
+ -moz-transition : @prop @duration @easing;
+ -o-transition : @prop @duration @easing;
+ transition : @prop @duration @easing;
}
-.animateMany(...){
+.animateMany(...) {
@value: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`;
- -webkit-transition-property: @value;
- -moz-transition-property: @value;
- -o-transition-property: @value;
- transition-property: @value;
+ -webkit-transition-property : @value;
+ -moz-transition-property : @value;
+ -o-transition-property : @value;
+ transition-property : @value;
.animateDuration();
.animateEasing();
}
-.animateDuration(@duration : @defaultDuration){
- -webkit-transition-duration: @duration;
- -moz-transition-duration: @duration;
- -o-transition-duration: @duration;
- transition-duration: @duration;
+.animateDuration(@duration : @defaultDuration) {
+ -webkit-transition-duration : @duration;
+ -moz-transition-duration : @duration;
+ -o-transition-duration : @duration;
+ transition-duration : @duration;
}
-.animateEasing(@easing : @defaultEasing){
- -webkit-transition-timing-function: @easing;
- -moz-transition-timing-function: @easing;
- -o-transition-timing-function: @easing;
- transition-timing-function: @easing;
+.animateEasing(@easing : @defaultEasing) {
+ -webkit-transition-timing-function : @easing;
+ -moz-transition-timing-function : @easing;
+ -o-transition-timing-function : @easing;
+ transition-timing-function : @easing;
}
.transition (@prop, @duration: @defaultDuration) {
- -webkit-transition: @prop @duration, -webkit-transform @duration;
- -moz-transition: @prop @duration, -moz-transform @duration;
- -o-transition: @prop @duration, -o-transform @duration;
- -ms-transition: @prop @duration, -ms-transform @duration;
- transition: @prop @duration, transform @duration;
+ -webkit-transition : @prop @duration, -webkit-transform @duration;
+ -moz-transition : @prop @duration, -moz-transform @duration;
+ -o-transition : @prop @duration, -o-transform @duration;
+ -ms-transition : @prop @duration, -ms-transform @duration;
+ transition : @prop @duration, transform @duration;
}
.transform (@transform) {
- -webkit-transform: @transform;
- -moz-transform: @transform;
- -o-transform: @transform;
- -ms-transform: @transform;
- transform: @transform;
+ -webkit-transform : @transform;
+ -moz-transform : @transform;
+ -o-transform : @transform;
+ -ms-transform : @transform;
+ transform : @transform;
}
-.delay(@delay){
- animation-delay:@delay;
- -webkit-animation-delay:@delay;
- transition-delay:@delay;
- -webkit-transition-delay:@delay;
+.delay(@delay) {
+ -webkit-transition-delay : @delay;
+ transition-delay : @delay;
+ -webkit-animation-delay : @delay;
+ animation-delay : @delay;
}
-.keep(){
- -webkit-animation-fill-mode:forwards;
- -moz-animation-fill-mode:forwards;
- -ms-animation-fill-mode:forwards;
- -o-animation-fill-mode:forwards;
- animation-fill-mode:forwards;
+.keep() {
+ -webkit-animation-fill-mode : forwards;
+ -moz-animation-fill-mode : forwards;
+ -ms-animation-fill-mode : forwards;
+ -o-animation-fill-mode : forwards;
+ animation-fill-mode : forwards;
}
-.sequentialDelay(@delayInc : 0.2s, @initialDelay : 0s){
- &:nth-child(1){.delay(0*@delayInc + @initialDelay)}
- &:nth-child(2){.delay(1*@delayInc + @initialDelay)}
- &:nth-child(3){.delay(2*@delayInc + @initialDelay)}
- &:nth-child(4){.delay(3*@delayInc + @initialDelay)}
- &:nth-child(5){.delay(4*@delayInc + @initialDelay)}
- &:nth-child(6){.delay(5*@delayInc + @initialDelay)}
- &:nth-child(7){.delay(6*@delayInc + @initialDelay)}
- &:nth-child(8){.delay(7*@delayInc + @initialDelay)}
- &:nth-child(9){.delay(8*@delayInc + @initialDelay)}
- &:nth-child(10){.delay(9*@delayInc + @initialDelay)}
- &:nth-child(11){.delay(10*@delayInc + @initialDelay)}
- &:nth-child(12){.delay(11*@delayInc + @initialDelay)}
- &:nth-child(13){.delay(12*@delayInc + @initialDelay)}
- &:nth-child(14){.delay(13*@delayInc + @initialDelay)}
- &:nth-child(15){.delay(14*@delayInc + @initialDelay)}
- &:nth-child(16){.delay(15*@delayInc + @initialDelay)}
- &:nth-child(17){.delay(16*@delayInc + @initialDelay)}
- &:nth-child(18){.delay(17*@delayInc + @initialDelay)}
- &:nth-child(19){.delay(18*@delayInc + @initialDelay)}
- &:nth-child(20){.delay(19*@delayInc + @initialDelay)}
+.sequentialDelay(@delayInc : 0.2s, @initialDelay : 0s) {
+ &:nth-child(1) {.delay(0*@delayInc + @initialDelay); }
+ &:nth-child(2) {.delay(1*@delayInc + @initialDelay); }
+ &:nth-child(3) {.delay(2*@delayInc + @initialDelay); }
+ &:nth-child(4) {.delay(3*@delayInc + @initialDelay); }
+ &:nth-child(5) {.delay(4*@delayInc + @initialDelay); }
+ &:nth-child(6) {.delay(5*@delayInc + @initialDelay); }
+ &:nth-child(7) {.delay(6*@delayInc + @initialDelay); }
+ &:nth-child(8) {.delay(7*@delayInc + @initialDelay); }
+ &:nth-child(9) {.delay(8*@delayInc + @initialDelay); }
+ &:nth-child(10) {.delay(9*@delayInc + @initialDelay); }
+ &:nth-child(11) {.delay(10*@delayInc + @initialDelay); }
+ &:nth-child(12) {.delay(11*@delayInc + @initialDelay); }
+ &:nth-child(13) {.delay(12*@delayInc + @initialDelay); }
+ &:nth-child(14) {.delay(13*@delayInc + @initialDelay); }
+ &:nth-child(15) {.delay(14*@delayInc + @initialDelay); }
+ &:nth-child(16) {.delay(15*@delayInc + @initialDelay); }
+ &:nth-child(17) {.delay(16*@delayInc + @initialDelay); }
+ &:nth-child(18) {.delay(17*@delayInc + @initialDelay); }
+ &:nth-child(19) {.delay(18*@delayInc + @initialDelay); }
+ &:nth-child(20) {.delay(19*@delayInc + @initialDelay); }
}
-.createFrames(@name, @from, @to){
+.createFrames(@name, @from, @to) {
@frames: {
from { @from(); }
to { @to(); }
};
- @-webkit-keyframes @name {@frames();}
- @-moz-keyframes @name {@frames();}
- @-ms-keyframes @name {@frames();}
- @-o-keyframes @name {@frames();}
- @keyframes @name {@frames();}
+ @-webkit-keyframes @name {@frames();}
+ @-moz-keyframes @name {@frames();}
+ @-ms-keyframes @name {@frames();}
+ @-o-keyframes @name {@frames();}
+ @keyframes @name {@frames();}
}
-.createAnimation(@name, @duration : @defaultDuration, @easing : @defaultEasing){
- -webkit-animation-name: @name;
- -moz-animation-name: @name;
- -ms-animation-name: @name;
- animation-name: @name;
- -webkit-animation-duration: @duration;
- -moz-animation-duration: @duration;
- -ms-animation-duration: @duration;
- animation-duration: @duration;
- -webkit-animation-timing-function: @easing;
- -moz-animation-timing-function: @easing;
- -ms-animation-timing-function: @easing;
- animation-timing-function: @easing;
+.createAnimation(@name, @duration : @defaultDuration, @easing : @defaultEasing) {
+ -webkit-animation-name : @name;
+ -moz-animation-name : @name;
+ -ms-animation-name : @name;
+ animation-name : @name;
+ -webkit-animation-duration : @duration;
+ -moz-animation-duration : @duration;
+ -ms-animation-duration : @duration;
+ animation-duration : @duration;
+ -webkit-animation-timing-function : @easing;
+ -moz-animation-timing-function : @easing;
+ -ms-animation-timing-function : @easing;
+ animation-timing-function : @easing;
}
@@ -132,82 +132,82 @@
Standard Animations
****************************/
-.fadeIn(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeIn(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeIn; @duration; @easing);
.createFrames(fadeIn,
- { opacity : 0; },
+ { opacity : 0; },
{ opacity : 1; }
);
}
-.fadeInDown(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeInDown(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeInDown; @duration; @easing);
.createFrames(fadeInDown,
- { opacity : 0; .transform(translateY(20px));},
+ { opacity : 0; .transform(translateY(20px));},
{ opacity : 1; .transform(translateY(0px));}
);
}
-.fadeInTop(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeInTop(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeInTop; @duration; @easing);
.createFrames(fadeInTop,
- { opacity : 0; .transform(translateY(-20px)); },
+ { opacity : 0; .transform(translateY(-20px)); },
{ opacity : 1; .transform(translateY(0px));}
);
}
-.fadeInLeft(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeInLeft(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeInLeft; @duration; @easing);
.createFrames(fadeInLeft,
- { opacity: 0; .transform(translateX(-20px));},
+ { opacity: 0; .transform(translateX(-20px));},
{ opacity: 1; .transform(translateX(0));}
);
}
-.fadeInRight(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeInRight(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeInRight; @duration; @easing);
.createFrames(fadeInRight,
- { opacity: 0; .transform(translateX(20px));},
+ { opacity: 0; .transform(translateX(20px));},
{ opacity: 1; .transform(translateX(0));}
);
}
-.fadeOut(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeOut(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeOut; @duration; @easing);
.createFrames(fadeOut,
- { opacity : 1; },
+ { opacity : 1; },
{ opacity : 0; }
);
}
-.fadeOutDown(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeOutDown(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeOutDown; @duration; @easing);
.createFrames(fadeOutDown,
- { opacity : 1; .transform(translateY(0)); visibility: visible;},
+ { opacity : 1; .transform(translateY(0)); visibility: visible;},
{ opacity : 0; .transform(translateY(20px)); visibility: hidden;}
);
}
-.fadeOutTop(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeOutTop(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeOutTop; @duration; @easing);
.createFrames(fadeOutTop,
- { opacity : 1; .transform(translateY(0)); },
+ { opacity : 1; .transform(translateY(0)); },
{ opacity : 0; .transform(translateY(-20px)); }
);
}
-.fadeOutLeft(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeOutLeft(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeOutLeft; @duration; @easing);
.createFrames(fadeOutLeft,
- { opacity : 1; .transform(translateX(0));},
+ { opacity : 1; .transform(translateX(0));},
{ opacity : 0; .transform(translateX(-20px));}
);
}
-.fadeOutRight(@duration : @defaultDuration, @easing : @defaultEasing){
+.fadeOutRight(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(fadeOutRight; @duration; @easing);
.createFrames(fadeOutRight,
- { opacity : 1; .transform(translateX(0));},
+ { opacity : 1; .transform(translateX(0));},
{ opacity : 0; .transform(translateX(20px));}
);
}
@@ -219,50 +219,50 @@
Fun Animations
****************************/
-.spin(@duration : @defaultDuration, @easing : @defaultEasing){
+.spin(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(spin, @duration, @easing);
- .spinKeyFrames(){
+ .spinKeyFrames() {
from { .transform(rotate(0deg)); }
- to { .transform(rotate(360deg)); }
+ to { .transform(rotate(360deg)); }
}
@-webkit-keyframes spin {.spinKeyFrames();}
- @-moz-keyframes spin {.spinKeyFrames();}
- @-ms-keyframes spin {.spinKeyFrames();}
- @-o-keyframes spin {.spinKeyFrames();}
- @keyframes spin {.spinKeyFrames();}
+ @-moz-keyframes spin {.spinKeyFrames();}
+ @-ms-keyframes spin {.spinKeyFrames();}
+ @-o-keyframes spin {.spinKeyFrames();}
+ @keyframes spin {.spinKeyFrames();}
}
-.bounce(@duration : @defaultDuration, @easing : @defaultEasing){
+.bounce(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(bounce, @duration, @easing);
- .bounceKeyFrames(){
+ .bounceKeyFrames() {
0%, 20%, 50%, 80%, 100% { .transform(translateY(0));}
40% { .transform(translateY(-30px));}
60% { .transform(translateY(-15px));}
}
@-webkit-keyframes bounce {.bounceKeyFrames();}
- @-moz-keyframes bounce {.bounceKeyFrames();}
- @-ms-keyframes bounce {.bounceKeyFrames();}
- @-o-keyframes bounce {.bounceKeyFrames();}
- @keyframes bounce {.bounceKeyFrames();}
+ @-moz-keyframes bounce {.bounceKeyFrames();}
+ @-ms-keyframes bounce {.bounceKeyFrames();}
+ @-o-keyframes bounce {.bounceKeyFrames();}
+ @keyframes bounce {.bounceKeyFrames();}
}
-.pulse(@duration : @defaultDuration, @easing : @defaultEasing){
+.pulse(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(pulse, @duration, @easing);
- .pulseKeyFrames(){
- 0% { .transform(scale(1));}
- 50% { .transform(scale(1.4));}
+ .pulseKeyFrames() {
+ 0% { .transform(scale(1));}
+ 50% { .transform(scale(1.4));}
100% { .transform(scale(1));}
}
@-webkit-keyframes pulse {.pulseKeyFrames();}
- @-moz-keyframes pulse {.pulseKeyFrames();}
- @-ms-keyframes pulse {.pulseKeyFrames();}
- @-o-keyframes pulse {.pulseKeyFrames();}
- @keyframes pulse {.pulseKeyFrames();}
+ @-moz-keyframes pulse {.pulseKeyFrames();}
+ @-ms-keyframes pulse {.pulseKeyFrames();}
+ @-o-keyframes pulse {.pulseKeyFrames();}
+ @keyframes pulse {.pulseKeyFrames();}
}
-.rubberBand(@duration : @defaultDuration, @easing : @defaultEasing){
+.rubberBand(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(rubberBand, @duration, @easing);
- .rubberBandKeyFrames(){
+ .rubberBandKeyFrames() {
0% {.transform(scale(1));}
30% {.transform(scaleX(1.25) scaleY(0.75));}
40% {.transform(scaleX(0.75) scaleY(1.25));}
@@ -270,32 +270,32 @@
100% {.transform(scale(1));}
}
@-webkit-keyframes rubberBand {.rubberBandKeyFrames();}
- @-moz-keyframes rubberBand {.rubberBandKeyFrames();}
- @-ms-keyframes rubberBand {.rubberBandKeyFrames();}
- @-o-keyframes rubberBand {.rubberBandKeyFrames();}
- @keyframes rubberBand {.rubberBandKeyFrames();}
+ @-moz-keyframes rubberBand {.rubberBandKeyFrames();}
+ @-ms-keyframes rubberBand {.rubberBandKeyFrames();}
+ @-o-keyframes rubberBand {.rubberBandKeyFrames();}
+ @keyframes rubberBand {.rubberBandKeyFrames();}
}
-.shake(@duration : @defaultDuration, @easing : @defaultEasing){
+.shake(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(shake, @duration, @easing);
- .shakeKeyFrames(){
+ .shakeKeyFrames() {
0%, 100% {.transform( translateX(0));}
10%, 30%, 50%, 70%, 90% {.transform( translateX(-10px));}
20%, 40%, 60%, 80% {.transform( translateX(10px));}
}
@-webkit-keyframes shake {.shakeKeyFrames();}
- @-moz-keyframes shake {.shakeKeyFrames();}
- @-ms-keyframes shake {.shakeKeyFrames();}
- @-o-keyframes shake {.shakeKeyFrames();}
- @keyframes shake {.shakeKeyFrames();}
+ @-moz-keyframes shake {.shakeKeyFrames();}
+ @-ms-keyframes shake {.shakeKeyFrames();}
+ @-o-keyframes shake {.shakeKeyFrames();}
+ @keyframes shake {.shakeKeyFrames();}
}
-.swing(@duration : @defaultDuration, @easing : @defaultEasing){
- -webkit-transform-origin: top center;
- -ms-transform-origin: top center;
- transform-origin: top center;
+.swing(@duration : @defaultDuration, @easing : @defaultEasing) {
+ -webkit-transform-origin : top center;
+ -ms-transform-origin : top center;
+ transform-origin : top center;
.createAnimation(swing, @duration, @easing);
- .swingKeyFrames(){
+ .swingKeyFrames() {
20% {.transform(rotate(15deg));}
40% {.transform(rotate(-10deg));}
60% {.transform(rotate(5deg));}
@@ -303,18 +303,18 @@
100% {.transform(rotate(0deg));}
}
@-webkit-keyframes swing {.swingKeyFrames();}
- @-moz-keyframes swing {.swingKeyFrames();}
- @-ms-keyframes swing {.swingKeyFrames();}
- @-o-keyframes swing {.swingKeyFrames();}
- @keyframes swing {.swingKeyFrames();}
+ @-moz-keyframes swing {.swingKeyFrames();}
+ @-ms-keyframes swing {.swingKeyFrames();}
+ @-o-keyframes swing {.swingKeyFrames();}
+ @keyframes swing {.swingKeyFrames();}
}
-.twist(@duration : @defaultDuration, @easing : @defaultEasing){
- -webkit-transform-origin: center center;
- -ms-transform-origin: center center;
- transform-origin: center center;
+.twist(@duration : @defaultDuration, @easing : @defaultEasing) {
+ -webkit-transform-origin : center center;
+ -ms-transform-origin : center center;
+ transform-origin : center center;
.createAnimation(swing, @duration, @easing);
- .swingKeyFrames(){
+ .swingKeyFrames() {
20% {.transform(rotate(15deg));}
40% {.transform(rotate(-10deg));}
60% {.transform(rotate(5deg));}
@@ -322,15 +322,15 @@
100% {.transform(rotate(0deg));}
}
@-webkit-keyframes swing {.swingKeyFrames();}
- @-moz-keyframes swing {.swingKeyFrames();}
- @-ms-keyframes swing {.swingKeyFrames();}
- @-o-keyframes swing {.swingKeyFrames();}
- @keyframes swing {.swingKeyFrames();}
+ @-moz-keyframes swing {.swingKeyFrames();}
+ @-ms-keyframes swing {.swingKeyFrames();}
+ @-o-keyframes swing {.swingKeyFrames();}
+ @keyframes swing {.swingKeyFrames();}
}
-.wobble(@duration : @defaultDuration, @easing : @defaultEasing){
+.wobble(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(wobble, @duration, @easing);
- .wobbleKeyFrames(){
+ .wobbleKeyFrames() {
0% {.transform(translateX(0%));}
15% {.transform(translateX(-25%) rotate(-5deg));}
30% {.transform(translateX(20%) rotate(3deg));}
@@ -340,22 +340,22 @@
100% {.transform(translateX(0%));}
}
@-webkit-keyframes wobble {.wobbleKeyFrames();}
- @-moz-keyframes wobble {.wobbleKeyFrames();}
- @-ms-keyframes wobble {.wobbleKeyFrames();}
- @-o-keyframes wobble {.wobbleKeyFrames();}
- @keyframes wobble {.wobbleKeyFrames();}
+ @-moz-keyframes wobble {.wobbleKeyFrames();}
+ @-ms-keyframes wobble {.wobbleKeyFrames();}
+ @-o-keyframes wobble {.wobbleKeyFrames();}
+ @keyframes wobble {.wobbleKeyFrames();}
}
-.popIn(@duration : @defaultDuration, @easing : @defaultEasing){
+.popIn(@duration : @defaultDuration, @easing : @defaultEasing) {
.createAnimation(popIn, @duration, @easing);
- .popInKeyFrames(){
- 0% { .transform(scale(0));}
- 70% { .transform(scale(1.4));}
+ .popInKeyFrames() {
+ 0% { .transform(scale(0));}
+ 70% { .transform(scale(1.4));}
100% { .transform(scale(1));}
}
@-webkit-keyframes popIn {.popInKeyFrames();}
- @-moz-keyframes popIn {.popInKeyFrames();}
- @-ms-keyframes popIn {.popInKeyFrames();}
- @-o-keyframes popIn {.popInKeyFrames();}
- @keyframes popIn {.popInKeyFrames();}
+ @-moz-keyframes popIn {.popInKeyFrames();}
+ @-ms-keyframes popIn {.popInKeyFrames();}
+ @-o-keyframes popIn {.popInKeyFrames();}
+ @keyframes popIn {.popInKeyFrames();}
}
diff --git a/shared/naturalcrit/styles/colors.less b/shared/naturalcrit/styles/colors.less
index 30a7610a2..c096b9b4f 100644
--- a/shared/naturalcrit/styles/colors.less
+++ b/shared/naturalcrit/styles/colors.less
@@ -23,47 +23,47 @@
@grey : #7F8C8D;
#backgroundColors {
- &.tealLight{ background-color : @tealLight };
- &.teal{ background-color : @teal };
- &.greenLight{ background-color : @greenLight };
- &.green{ background-color : @green };
- &.blueLight{ background-color : @blueLight };
- &.blue{ background-color : @blue };
- &.purpleLight{ background-color : @purpleLight };
- &.purple{ background-color : @purple };
- &.steelLight{ background-color : @steelLight };
- &.steel{ background-color : @steel };
- &.yellowLight{ background-color : @yellowLight };
- &.yellow{ background-color : @yellow };
- &.orangeLight{ background-color : @orangeLight };
- &.orange{ background-color : @orange };
- &.redLight{ background-color : @redLight };
- &.red{ background-color : @red };
- &.silverLight{ background-color : @silverLight };
- &.silver{ background-color : @silver };
- &.greyLight{ background-color : @greyLight };
- &.grey{ background-color : @grey };
+ &.tealLight { background-color : @tealLight; };
+ &.teal { background-color : @teal; };
+ &.greenLight { background-color : @greenLight; };
+ &.green { background-color : @green; };
+ &.blueLight { background-color : @blueLight; };
+ &.blue { background-color : @blue; };
+ &.purpleLight { background-color : @purpleLight; };
+ &.purple { background-color : @purple; };
+ &.steelLight { background-color : @steelLight; };
+ &.steel { background-color : @steel; };
+ &.yellowLight { background-color : @yellowLight; };
+ &.yellow { background-color : @yellow; };
+ &.orangeLight { background-color : @orangeLight; };
+ &.orange { background-color : @orange; };
+ &.redLight { background-color : @redLight; };
+ &.red { background-color : @red; };
+ &.silverLight { background-color : @silverLight; };
+ &.silver { background-color : @silver; };
+ &.greyLight { background-color : @greyLight; };
+ &.grey { background-color : @grey; };
}
#backgroundColorsHover {
- &.tealLight:hover{ background-color : @tealLight };
- &.teal:hover{ background-color : @teal };
- &.greenLight:hover{ background-color : @greenLight };
- &.green:hover{ background-color : @green };
- &.blueLight:hover{ background-color : @blueLight };
- &.blue:hover{ background-color : @blue };
- &.purpleLight:hover{ background-color : @purpleLight };
- &.purple:hover{ background-color : @purple };
- &.steelLight:hover{ background-color : @steelLight };
- &.steel:hover{ background-color : @steel };
- &.yellowLight:hover{ background-color : @yellowLight };
- &.yellow:hover{ background-color : @yellow };
- &.orangeLight:hover{ background-color : @orangeLight };
- &.orange:hover{ background-color : @orange };
- &.redLight:hover{ background-color : @redLight };
- &.red:hover{ background-color : @red };
- &.silverLight:hover{ background-color : @silverLight };
- &.silver:hover{ background-color : @silver };
- &.greyLight:hover{ background-color : @greyLight };
- &.grey:hover{ background-color : @grey };
+ &.tealLight:hover { background-color : @tealLight; };
+ &.teal:hover { background-color : @teal; };
+ &.greenLight:hover { background-color : @greenLight; };
+ &.green:hover { background-color : @green; };
+ &.blueLight:hover { background-color : @blueLight; };
+ &.blue:hover { background-color : @blue; };
+ &.purpleLight:hover { background-color : @purpleLight; };
+ &.purple:hover { background-color : @purple; };
+ &.steelLight:hover { background-color : @steelLight; };
+ &.steel:hover { background-color : @steel; };
+ &.yellowLight:hover { background-color : @yellowLight; };
+ &.yellow:hover { background-color : @yellow; };
+ &.orangeLight:hover { background-color : @orangeLight; };
+ &.orange:hover { background-color : @orange; };
+ &.redLight:hover { background-color : @redLight; };
+ &.red:hover { background-color : @red; };
+ &.silverLight:hover { background-color : @silverLight; };
+ &.silver:hover { background-color : @silver; };
+ &.greyLight:hover { background-color : @greyLight; };
+ &.grey:hover { background-color : @grey; };
}
\ No newline at end of file
diff --git a/shared/naturalcrit/styles/core.less b/shared/naturalcrit/styles/core.less
index 3248269c5..02db5db18 100644
--- a/shared/naturalcrit/styles/core.less
+++ b/shared/naturalcrit/styles/core.less
@@ -12,37 +12,31 @@
font-family : 'CodeBold';
src : data-uri('naturalcrit/styles/CODE Bold.otf') format('opentype');
}
-html,body, #reactRoot{
+html,body, #reactRoot {
height : 100vh;
min-height : 100vh;
margin : 0;
font-family : 'Open Sans', sans-serif;
}
-*{
- box-sizing : border-box;
-}
-.colorButton(@backgroundColor : @green){
+* { box-sizing : border-box; }
+.colorButton(@backgroundColor : @green) {
.animate(background-color);
display : inline-block;
padding : 0.6em 1.2em;
- cursor : pointer;
- background-color : @backgroundColor;
font-family : 'Open Sans', sans-serif;
font-size : 0.8em;
font-weight : 800;
color : white;
- text-decoration : none;
text-transform : uppercase;
- border : none;
+ text-decoration : none;
+ cursor : pointer;
outline : none;
- &:hover{
- background-color : darken(@backgroundColor, 5%);
- }
- &:active{
- background-color : darken(@backgroundColor, 10%);
- }
- &:disabled{
+ background-color : @backgroundColor;
+ border : none;
+ &:hover { background-color : darken(@backgroundColor, 5%); }
+ &:active { background-color : darken(@backgroundColor, 10%); }
+ &:disabled {
+ cursor : not-allowed;
background-color : @silver !important;
- cursor:not-allowed;
}
}
diff --git a/shared/naturalcrit/styles/elements.less b/shared/naturalcrit/styles/elements.less
index e7f8b05f5..ca4574f26 100644
--- a/shared/naturalcrit/styles/elements.less
+++ b/shared/naturalcrit/styles/elements.less
@@ -1,86 +1,76 @@
@containerWidth : 1000px;
-html, body{
+html, body {
position : relative;
height : 100%;
min-height : 100%;
- background-color : #eee;
font-family : 'Lato', sans-serif;
color : @copyGrey;
+ background-color : #EEEEEE;
}
-.container{
+.container {
position : relative;
max-width : @containerWidth;
- margin : 0 auto;
padding-right : 20px;
padding-left : 20px;
+ margin : 0 auto;
}
-h1{
+h1 {
margin-top : 10px;
margin-bottom : 15px;
font-size : 2em;
}
-h2{
+h2 {
margin-top : 10px;
margin-bottom : 15px;
font-size : 1.5em;
font-weight : 900;
}
-h3{
+h3 {
margin-top : 5px;
margin-bottom : 7px;
font-size : 1em;
font-weight : 900;
}
-p{
+p {
margin-bottom : 1em;
font-size : 16px;
- color : @copyGrey;
line-height : 1.5em;
+ color : @copyGrey;
}
-code{
- background-color : #F8F8F8;
- font-family : 'Courier', mono;
+code {
+ font-family : 'Courier', "mono";
color : black;
white-space : pre;
+ background-color : #F8F8F8;
}
-a{
- color : inherit;
-}
-strong{
- font-weight : bold;
-}
-button{
+a { color : inherit; }
+strong { font-weight : bold; }
+button {
.button();
}
-.button(@backgroundColor : @green){
+.button(@backgroundColor : @green) {
.animate(background-color);
display : inline-block;
padding : 0.6em 1.2em;
- cursor : pointer;
- background-color : @backgroundColor;
- font-family : "Lato", Helvetica, Arial, sans-serif;
+ font-family : 'Lato', "Helvetica", "Arial", sans-serif;
font-size : 15px;
color : white;
text-decoration : none;
- border : none;
- outline : none;
- &:hover{
- background-color : darken(@backgroundColor, 5%);
- }
- &:active{
- background-color : darken(@backgroundColor, 10%);
- }
- &:disabled{
- background-color : @silver !important;
- }
-}
-.iconButton(@backgroundColor : @green){
- padding : 0.6em;
cursor : pointer;
+ outline : none;
background-color : @backgroundColor;
+ border : none;
+ &:hover { background-color : darken(@backgroundColor, 5%); }
+ &:active { background-color : darken(@backgroundColor, 10%); }
+ &:disabled { background-color : @silver !important; }
+}
+.iconButton(@backgroundColor : @green) {
+ padding : 0.6em;
font-size : 14px;
color : white;
text-align : center;
+ cursor : pointer;
+ background-color : @backgroundColor;
}
\ No newline at end of file
diff --git a/shared/naturalcrit/styles/reset.less b/shared/naturalcrit/styles/reset.less
index df5564a21..21e07a1c0 100644
--- a/shared/naturalcrit/styles/reset.less
+++ b/shared/naturalcrit/styles/reset.less
@@ -1,33 +1,23 @@
-:where(html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,button,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video){
- border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0
+:where(html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,button,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video) {padding : 0;margin : 0;font : inherit;font-size : 100%;vertical-align : baseline;
+ border : 0;
}
-:where(article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section){
- display:block
-}
+:where(article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section) { display : block; }
-:where(body){
- line-height:1
-}
+:where(body) { line-height : 1; }
-:where(ol,ul){
- list-style:none
-}
+:where(ol,ul) { list-style : none; }
-:where(blockquote,q){
- quotes:none
-}
+:where(blockquote,q) { quotes : none; }
-:where(blockquote:before,blockquote:after,q:before,q:after){
- content:none
-}
+:where(blockquote::before,blockquote::after,q::before,q::after) { content : none; }
-:where(table){
- border-collapse:collapse;border-spacing:0
+:where(table) {border-spacing : 0;
+ border-collapse : collapse;
}
:where(button) {
- background-color: unset;
- text-transform: unset;
- color: unset;
+ color : unset;
+ text-transform : unset;
+ background-color : unset;
}
diff --git a/shared/naturalcrit/styles/tooltip.less b/shared/naturalcrit/styles/tooltip.less
index 078cfd0c1..b21439486 100644
--- a/shared/naturalcrit/styles/tooltip.less
+++ b/shared/naturalcrit/styles/tooltip.less
@@ -2,116 +2,115 @@
@tooltipColor : #383838;
@arrowSize : 6px;
@arrowPosition : 18px;
-[data-tooltip]{
+[data-tooltip] {
.tooltip(attr(data-tooltip));
}
-[data-tooltip-top]{
+[data-tooltip-top] {
.tooltipTop(attr(data-tooltip-top));
}
-[data-tooltip-bottom]{
+[data-tooltip-bottom] {
.tooltipBottom(attr(data-tooltip-bottom));
}
-[data-tooltip-left]{
+[data-tooltip-left] {
.tooltipLeft(attr(data-tooltip-left));
}
-[data-tooltip-right]{
+[data-tooltip-right] {
.tooltipRight(attr(data-tooltip-right));
}
-.tooltip(@content){
+.tooltip(@content) {
.tooltipBottom(@content);
}
-.tooltipTop(@content){
+.tooltipTop(@content) {
.tooltipBase(@content);
- &:before {
+ &::before {
margin-bottom : -@arrowSize * 2;
border-top-color : @tooltipColor;
}
- &:after{ margin-left: -18px; }
- &:before, &:after{
+ &::after { margin-left : -18px; }
+ &::before, &::after {
bottom : 100%;
left : 50%;
}
- &:hover:after, &:hover:before, &:focus:after, &:focus:before {
+ &:hover::after, &:hover::before, &:focus::after, &:focus::before {
.transform(translateY(-(@arrowSize + 2)));
}
}
-.tooltipBottom(@content){
+.tooltipBottom(@content) {
.tooltipBase(@content);
- &:before {
+ &::before {
margin-top : -@arrowSize * 2;
border-bottom-color : @tooltipColor;
}
- &:after{ margin-left: -18px; }
- &:before, &:after{
+ &::after { margin-left : -18px; }
+ &::before, &::after {
top : 100%;
left : 50%;
}
- &:hover:after, &:hover:before, &:focus:after, &:focus:before {
+ &:hover::after, &:hover::before, &:focus::after, &:focus::before {
.transform(translateY(@arrowSize + 2));
}
}
-.tooltipLeft(@content){
+.tooltipLeft(@content) {
.tooltipBase(@content);
- &:before {
+ &::before {
margin-right : -@arrowSize * 2;
margin-bottom : -@arrowSize;
border-left-color : @tooltipColor;
}
- &:after{ margin-bottom: -14px;}
- &:before, &:after {
+ &::after { margin-bottom : -14px;}
+ &::before, &::after {
right : 100%;
bottom : 50%;
}
- &:hover:after, &:hover:before, &:focus:after, &:focus:before {
+ &:hover::after, &:hover::before, &:focus::after, &:focus::before {
.transform(translateX(-(@arrowSize + 2)));
}
}
-.tooltipRight(@content){
+.tooltipRight(@content) {
.tooltipBase(@content);
- &:before {
+ &::before {
margin-bottom : -@arrowSize;
margin-left : -@arrowSize * 2;
border-right-color : @tooltipColor;
}
- &:after{ margin-bottom: -14px;}
- &:before, &:after {
+ &::after { margin-bottom : -14px;}
+ &::before, &::after {
bottom : 50%;
left : 100%;
}
- &:hover:after, &:hover:before, &:focus:after, &:focus:before {
+ &:hover::after, &:hover::before, &:focus::after, &:focus::before {
.transform(translateX(@arrowSize + 2));
}
}
-.tooltipShow(){
-}
-.tooltipBase(@content){
+.tooltipShow(){ }
+.tooltipBase(@content) {
//position: relative;
- &:before, &:after{
+ &::before, &::after {
.animateAll();
position : absolute;
z-index : 1000000;
- opacity : 0;
pointer-events : none;
+ opacity : 0;
}
//Arrow
- &:before{
- content : '';
+ &::before {
z-index : 1000001;
+ content : '';
background : transparent;
border : @arrowSize solid transparent;
}
//Box
- &:after{
- content : @content;
+ &::after {
visibility : hidden;
padding : 8px 10px;
- background : @tooltipColor;
font-size : 12px;
- color : white;
line-height : 12px;
+ color : white;
white-space : nowrap;
+ content : @content;
+ background : @tooltipColor;
}
- &:hover:before, &:hover:after {
+ &:hover::before, &:hover::after {
visibility : visible;
opacity : 1;
}
diff --git a/tests/markdown/basic.test.js b/tests/markdown/basic.test.js
index e5feec0b3..aaa2adf58 100644
--- a/tests/markdown/basic.test.js
+++ b/tests/markdown/basic.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+
import Markdown from 'naturalcrit/markdown.js';
diff --git a/tests/markdown/definition-lists.test.js b/tests/markdown/definition-lists.test.js
index 4c754db48..144dad880 100644
--- a/tests/markdown/definition-lists.test.js
+++ b/tests/markdown/definition-lists.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+
import Markdown from 'naturalcrit/markdown.js';
@@ -92,12 +92,12 @@ describe('Multiline Definition Lists', ()=>{
test('Multiline Definition Term must have at least one non-empty Definition', function() {
const source = 'Term 1\n::';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Term 1
\nTerm 1
\n
\n
`);
});
test('Multiline Definition List must have at least one non-newline character after ::', function() {
const source = 'Term 1\n::\nDefinition 1\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Term 1
\nDefinition 1
`);
+ expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Term 1
\n
\n
\nDefinition 1
`);
});
});
diff --git a/tests/markdown/hard-breaks.test.js b/tests/markdown/hard-breaks.test.js
index fe646eac9..63bfaef9c 100644
--- a/tests/markdown/hard-breaks.test.js
+++ b/tests/markdown/hard-breaks.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+
import Markdown from 'naturalcrit/markdown.js';
@@ -6,37 +6,37 @@ describe('Hard Breaks', ()=>{
test('Single Break', function() {
const source = ':\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`
`);
});
test('Double Break', function() {
const source = '::\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`
\n
`);
});
test('Triple Break', function() {
const source = ':::\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`
\n
\n
`);
});
test('Many Break', function() {
const source = '::::::::::\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`
\n
\n
\n
\n
\n
\n
\n
\n
\n
`);
});
test('Multiple sets of Breaks', function() {
const source = ':::\n:::\n:::';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`
\n
\n
\n
\n
\n
\n
\n
\n
`);
});
test('Break directly between two paragraphs', function() {
const source = 'Line 1\n::\nLine 2';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Line 1
\nLine 2
`);
+ expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Line 1
\n
\n
\nLine 2
`);
});
test('Ignored inside a code block', function() {
diff --git a/tests/markdown/non-breaking-spaces.test.js b/tests/markdown/non-breaking-spaces.test.js
index e682de07a..64567b8ae 100644
--- a/tests/markdown/non-breaking-spaces.test.js
+++ b/tests/markdown/non-breaking-spaces.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+
import Markdown from 'naturalcrit/markdown.js';
diff --git a/tests/markdown/paragraph-justification.test.js b/tests/markdown/paragraph-justification.test.js
index 48b311e85..7876f5a26 100644
--- a/tests/markdown/paragraph-justification.test.js
+++ b/tests/markdown/paragraph-justification.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+
import Markdown from 'naturalcrit/markdown.js';
diff --git a/tests/markdown/variables.test.js b/tests/markdown/variables.test.js
index 41259da7e..4c91d7d00 100644
--- a/tests/markdown/variables.test.js
+++ b/tests/markdown/variables.test.js
@@ -410,4 +410,29 @@ describe('Regression Tests', ()=>{
const rendered = Markdown.render(source).trimReturns();
expect(rendered).toBe('title 1 title 2 title 3 title 4 foo Ipsum ) )
');
});
+
+ it('Handle Extra spaces in image alt-text 1', function(){
+ const source='';
+ const rendered = Markdown.render(source).trimReturns();
+ expect(rendered).toBe('
');
+ });
+
+ it('Handle Extra spaces in image alt-text 2', function(){
+ const source='';
+ const rendered = Markdown.render(source).trimReturns();
+ expect(rendered).toBe('
');
+ });
+
+ it('Handle Extra spaces in image alt-text 3', function(){
+ const source='';
+ const rendered = Markdown.render(source).trimReturns();
+ expect(rendered).toBe('
');
+ });
+
+ it('Handle Extra spaces in image alt-text 4', function(){
+ const source='{height=20%,width=20%}';
+ const rendered = Markdown.render(source).trimReturns();
+ expect(rendered).toBe('
');
+ });
+
});
\ No newline at end of file
diff --git a/themes/Legacy/5ePHB/style.less b/themes/Legacy/5ePHB/style.less
index 4ebfbf840..56d1bed94 100644
--- a/themes/Legacy/5ePHB/style.less
+++ b/themes/Legacy/5ePHB/style.less
@@ -9,26 +9,22 @@
@headerText : #58180D; // Dark maroon
@monsterStatBackground : #FDF1DC; // Lighter parchment
@captionText : #766649; // Brown
-@page { margin: 0; }
-body {
- counter-reset : phb-page-numbers;
-}
-*{
- -webkit-print-color-adjust : exact;
-}
-.useSansSerif(){
- font-family : ScalySans;
- em{
- font-family : ScalySans;
+@page { margin : 0; }
+body { counter-reset : phb-page-numbers; }
+* { -webkit-print-color-adjust : exact; }
+.useSansSerif() {
+ font-family : "ScalySans";
+ em {
+ font-family : "ScalySans";
font-style : italic;
}
- strong{
- font-family : ScalySans;
+ strong {
+ font-family : "ScalySans";
font-weight : 800;
letter-spacing : -0.02em;
}
}
-.useColumns(@multiplier : 1){
+.useColumns(@multiplier : 1) {
column-count : 2;
column-fill : auto;
column-gap : 1cm;
@@ -40,21 +36,21 @@ body {
-webkit-column-gap : 1cm;
-moz-column-gap : 1cm;
}
-.phb, .page{
+.phb, .page {
.useColumns();
- counter-increment : phb-page-numbers;
position : relative;
z-index : 15;
box-sizing : border-box;
- overflow : hidden;
- height : 279.4mm;
width : 215.9mm;
+ height : 279.4mm;
padding : 1.0cm 1.7cm;
padding-bottom : 1.5cm;
+ overflow : hidden;
+ font-family : "BookSanity";
+ font-size : 0.317cm;
+ counter-increment : phb-page-numbers;
background-color : @background;
background-image : @backgroundImage;
- font-family : BookSanity;
- font-size : 0.317cm;
text-rendering : optimizeLegibility;
page-break-before : always;
page-break-after : always;
@@ -63,199 +59,175 @@ body {
contain-intrinsic-size : auto none;
}
-.phb{
+.phb {
//*****************************
// * BASE
// *****************************/
- p{
+ p {
padding-bottom : 0.8em;
line-height : 1.269em;
- &+p{
- margin-top : -0.8em;
- }
+ & + p { margin-top : -0.8em; }
}
- ul{
- margin-bottom : 0.8em;
+ ul {
padding-left : 1.4em;
+ margin-bottom : 0.8em;
line-height : 1.269em;
list-style-position : outside;
list-style-type : disc;
}
- ol{
- margin-bottom : 0.8em;
+ ol {
padding-left : 1.4em;
+ margin-bottom : 0.8em;
line-height : 1.269em;
list-style-position : outside;
list-style-type : decimal;
}
//Indents after p or lists
- p+p, ul+p, ol+p{
- text-indent : 1em;
- }
- img{
- z-index : -1;
- }
- strong{
+ p + p, ul + p, ol + p { text-indent : 1em; }
+ img { z-index : -1; }
+ strong {
font-weight : bold;
letter-spacing : 0.03em;
}
- em{
- font-style : italic;
- }
- sup{
+ em { font-style : italic; }
+ sup {
+ font-size : smaller;
+ line-height : 0;
vertical-align : super;
- font-size : smaller;
- line-height : 0;
}
- sub{
- vertical-align : sub;
+ sub {
font-size : smaller;
line-height : 0;
+ vertical-align : sub;
}
//*****************************
// * HEADERS
// *****************************/
- h1,h2,h3,h4{
+ h1,h2,h3,h4 {
margin-top : 0.2em;
margin-bottom : 0.2em;
- font-family : MrJeeves;
+ font-family : "MrJeeves";
font-weight : 800;
color : @headerText;
}
- h1{
+ h1 {
column-span : all;
font-size : 0.987cm;
-webkit-column-span : all;
-moz-column-span : all;
- &+p::first-letter{
+ & + p::first-letter {
float : left;
- font-family : Solberry;
+ font-family : "Solberry";
font-size : 10em;
- color : #222;
line-height : 0.795em;
+ color : #222222;
}
}
- h2{
- font-size : 0.705cm;
- }
- h3{
+ h2 { font-size : 0.705cm; }
+ h3 {
font-size : 0.529cm;
border-bottom : 2px solid @headerUnderline;
}
- h4{
+ h4 {
margin-bottom : 0.00em;
font-size : 0.458cm;
}
- h5{
+ h5 {
margin-bottom : 0.2em;
- font-family : ScalySansSmallCaps;
+ font-family : "ScalySansSmallCaps";
font-size : 0.423cm;
font-weight : 900;
}
//*****************************
// * TABLE
// *****************************/
- table{
+ table {
.useSansSerif();
width : 100%;
margin-bottom : 1em;
font-size : 10pt;
- thead{
- display: table-row-group;
+ thead {
+ display : table-row-group;
font-weight : 800;
- th{
- vertical-align : bottom;
- padding-bottom : 0.3em;
+ th {
padding-right : 0.1em;
+ padding-bottom : 0.3em;
padding-left : 0.1em;
+ vertical-align : bottom;
}
}
- tbody{
- tr{
- td{
- padding : 0.3em 0.1em;
- }
- &:nth-child(odd){
- background-color : @noteGreen;
- }
+ tbody {
+ tr {
+ td { padding : 0.3em 0.1em; }
+ &:nth-child(odd) { background-color : @noteGreen; }
}
}
}
//*****************************
// * NOTE
// *****************************/
- blockquote{
+ blockquote {
.useSansSerif();
box-sizing : border-box;
- margin-bottom : 1em;
padding : 5px 10px;
+ margin-bottom : 1em;
background-color : @noteGreen;
border-style : solid;
border-width : 11px;
border-image : @noteBorderImage 11;
border-image-outset : 9px 0px;
- box-shadow : 1px 4px 14px #888;
- p, ul{
+ box-shadow : 1px 4px 14px #888888;
+ p, ul {
font-size : 0.352cm;
line-height : 1.083em;
}
}
//If a note starts a column, give it space at the top to render border
- pre+blockquote, h2+blockquote, h3+blockquote, h4+blockquote, h5+blockquote {
- margin-top : 13px;
- }
+ pre + blockquote, h2 + blockquote, h3 + blockquote, h4 + blockquote, h5 + blockquote { margin-top : 13px; }
//*****************************
// * MONSTER STAT BLOCK
// *****************************/
- hr+blockquote{
+ hr+blockquote {
position : relative;
padding-top : 15px;
background-color : @monsterStatBackground;
border-style : solid;
border-width : 10px;
border-image : @monsterBorderImageLegacy 10;
- h2{
+ h2 {
margin-top : -8px;
margin-bottom : 0px;
- &+p{
- padding-bottom : 0px;
- }
+ & + p { padding-bottom : 0px; }
}
- h3{
- font-family : ScalySans;
- font-weight : 400;
+ h3 {
+ font-family : "ScalySans";
+ font-weight : normal;
border-bottom : 1px solid @headerText;
}
- hr+ul{
- color : @headerText;
- }
- ul{
+ hr + ul { color : @headerText; }
+ ul {
.useSansSerif();
padding-left : 1em;
font-size : 0.352cm;
}
// Monster Ability table
- hr+table{
+ hr + table {
margin : 0;
background-color : transparent;
border-style : none;
border-image : none;
- tbody{
- tr:nth-child(odd), tr:nth-child(even){
- background-color : transparent;
- }
+ tbody {
+ tr:nth-child(odd), tr:nth-child(even) { background-color : transparent; }
}
}
- table{
- color : @headerText;
- }
- p+p{
- margin-top : 0em;
+ table { color : @headerText; }
+ p + p {
padding-bottom : 0.5em;
+ margin-top : 0em;
text-indent : 0em;
}
//Triangle dividers
- hr{
+ hr {
visibility : visible;
height : 6px;
margin : 4px 0px;
@@ -265,100 +237,90 @@ body {
}
}
//Full Width
- hr+hr+blockquote{
+ hr + hr + blockquote {
.useColumns(0.96);
column-fill : balance;
}
//*****************************
// * FOOTER
// *****************************/
- &:after{
- content : "";
+ &:after {
position : absolute;
bottom : 0px;
left : 0px;
z-index : 100;
- height : 50px;
width : 100%;
+ height : 50px;
+ content : '';
background-image : @footerAccentImage;
background-size : cover;
}
- &:nth-child(even){
- &:after{
- transform : scaleX(-1);
- }
- .pageNumber{
- left : 2px;
- }
- .footnote{
+ &:nth-child(even) {
+ &::after { transform : scaleX(-1); }
+ .pageNumber { left : 2px; }
+ .footnote {
left : 80px;
text-align : left;
}
}
- .pageNumber{
+ .pageNumber {
position : absolute;
right : 2px;
bottom : 22px;
width : 50px;
font-size : 0.9em;
- color : #c9ad6a;
+ color : #C9AD6A;
text-align : center;
- &.auto::after {
- content : counter(phb-page-numbers);
- }
+ &.auto::after { content : counter(phb-page-numbers); }
}
- .footnote{
+ .footnote {
position : absolute;
right : 80px;
bottom : 32px;
z-index : 150;
width : 200px;
font-size : 0.8em;
- color : #c9ad6a;
+ color : #C9AD6A;
text-align : right;
}
//*****************************
// * EXTRAS
// *****************************/
- hr{
+ hr {
visibility : hidden;
margin : 0px;
}
//Modified unorder list, used in spells
- hr+ul{
- margin-bottom : 0.5em;
+ hr + ul {
padding-left : 1em;
+ margin-bottom : 0.5em;
text-indent : -1em;
list-style-type : none;
}
//Column Break
- pre, code{
+ pre, code {
visibility : hidden;
-webkit-column-break-after : always;
break-after : always;
-moz-column-break-after : always;
}
//Avoid breaking up
- p,blockquote,table{
+ p,blockquote,table {
z-index : 15;
-webkit-column-break-inside : avoid;
page-break-inside : avoid;
break-inside : avoid;
}
//Better spacing for spell blocks
- h4+p+hr+ul{
- margin-top : -0.5em
- }
+ h4 + p + hr + ul { margin-top : -0.5em; }
//Text indent right after table
- table+p{
- text-indent : 1em;
- }
+ table + p { text-indent : 1em; }
// Nested lists
- ul ul,ol ol,ul ol,ol ul{
+ ul ul,ol ol,ul ol,ol ul {
margin-bottom : 0px;
margin-left : 1.5em;
}
- li{
+ li {
-webkit-column-break-inside : avoid;
page-break-inside : avoid;
break-inside : avoid;
@@ -367,89 +329,81 @@ body {
//*****************************
// * SPELL LIST
// *****************************/
-.phb .spellList{
+.phb .spellList {
.useSansSerif();
column-count : 4;
- column-span : all;
-webkit-column-span : all;
-moz-column-span : all;
- ul+h5{
- margin-top : 15px;
- }
- p, ul{
+ column-span : all;
+ ul + h5 { margin-top : 15px; }
+ p, ul {
font-size : 0.352cm;
line-height : 1.263em;
}
- ul{
- margin-bottom : 0.5em;
+ ul {
padding-left : 1em;
+ margin-bottom : 0.5em;
text-indent : -1em;
list-style-type : none;
+ break-inside : auto;
-webkit-column-break-inside : auto;
page-break-inside : auto;
- break-inside : auto;
}
}
//*****************************
// * WIDE
// *****************************/
-.phb .wide{
- column-span : all;
+.phb .wide {
-webkit-column-span : all;
-moz-column-span : all;
+ column-span : all;
}
//*****************************
// * CLASS TABLE
// *****************************/
-.phb .classTable{
+.phb .classTable {
margin-top : 25px;
margin-bottom : 40px;
border-collapse : separate;
background-color : white;
border : initial;
border-style : solid;
+ border-image-source : @frameBorderImage;
+ border-image-slice : 150 200 150 200;
+ border-image-width : 47px;
border-image-outset : 25px 17px;
border-image-repeat : stretch;
- border-image-slice : 150 200 150 200;
- border-image-source : @frameBorderImage;
- border-image-width : 47px;
- h5{
- margin-bottom : 10px;
- }
+ h5 { margin-bottom : 10px; }
}
//************************************
// * DESCRIPTIVE TEXT BOX
// ************************************/
-.phb .descriptive{
+.phb .descriptive {
margin-bottom : 1em;
- background-color : #faf7ea;
- font-family : ScalySans;
+ font-family : "ScalySans";
+ background-color : #FAF7EA;
border-style : solid;
border-width : 7px;
border-image : @descriptiveBoxImage 12 stretch;
border-image-outset : 4px;
- box-shadow : 0px 0px 6px #faf7ea;
- p{
+ box-shadow : 0px 0px 6px #FAF7EA;
+ p {
display : block;
padding-bottom : 0px;
line-height : 1.47em;
}
- p + p {
- padding-top : .8em;
- }
+ p + p { padding-top : 0.8em; }
em {
- font-family : ScalySans;
+ font-family : "ScalySans";
font-style : italic;
}
strong {
- font-family : ScalySans;
+ font-family : "ScalySans";
font-weight : 800;
letter-spacing : -0.02em;
}
}
-.phb pre+.descriptive{
- margin-top : 8px;
-}
+.phb pre + .descriptive { margin-top : 8px; }
//*****************************
// * ARTIST CREDIT BLOCK
@@ -457,47 +411,41 @@ body {
.phb {
.artist {
position : absolute;
- text-align : center;
- font-family : WalterTurncoat;
+ font-family : "WalterTurncoat";
font-size : 0.27cm;
color : @captionText;
+ text-align : center;
p, p + p {
margin : unset;
- text-indent : unset;
line-height : 0.941em;
+ text-indent : unset;
}
- h5 {
+ h5 {
+ font-family : "WalterTurncoat";
font-size : 1.3em;
- font-family : WalterTurncoat;
}
- a{
+ a {
color : inherit;
text-decoration : unset;
- &:hover {
- text-decoration : underline;
- }
+ &:hover { text-decoration : underline; }
}
}
}
//*****************************
// * TABLE OF CONTENTS
// *****************************/
-.phb .toc{
+.phb .toc {
-webkit-column-break-inside : avoid;
page-break-inside : avoid;
break-inside : avoid;
- a{
+ a {
color : black;
text-decoration : none;
- &:hover{
- text-decoration : underline;
- }
+ &:hover { text-decoration : underline; }
}
- ul{
+ ul {
padding-left : 0;
list-style-type : none;
}
- &>ul>li{
- margin-bottom : 10px;
- }
+ & > ul > li { margin-bottom : 10px; }
}
diff --git a/themes/V3/5eDMG/snippets.js b/themes/V3/5eDMG/snippets.js
index 636befb60..bad5e8e6a 100644
--- a/themes/V3/5eDMG/snippets.js
+++ b/themes/V3/5eDMG/snippets.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+
module.exports = [
];
diff --git a/themes/V3/5eDMG/style.less b/themes/V3/5eDMG/style.less
index 2ced98312..cbc3fa890 100644
--- a/themes/V3/5eDMG/style.less
+++ b/themes/V3/5eDMG/style.less
@@ -7,37 +7,29 @@
}
.page {
- background-image : url(/assets/DMG_background.png);
+ background-image : url("/assets/DMG_background.png");
background-size : cover;
- /*TABLES WITHIN NOTES*/
- .note table tbody tr:nth-child(odd) {
- background:#fff;
- }
+ /* TABLES WITHIN NOTES */
+ .note table tbody tr:nth-child(odd) { background : #FFFFFF; }
- /*DROP CAP*/
+ /* DROP CAP */
h1 + p::first-letter {
- background-image: unset;
- color:black;
+ color : black;
+ background-image : unset;
}
- .quote p:first-child::first-line {
- all: unset;
+ .quote p:first-child::first-line { all : unset; }
+
+ &::after {
+ height : 58px;
+ background-image : url("/assets/DMG_footerAccent.png");
}
- &:after {
- background-image : url(/assets/DMG_footerAccent.png);
- height: 58px;
- }
-
- .footnote {
- bottom : 40px;
- }
+ .footnote { bottom : 40px; }
}
.page:has(.partCover) {
- .partCover {
- background-image: @partCoverHeaderDMG;
- }
+ .partCover { background-image : @partCoverHeaderDMG; }
}
diff --git a/themes/V3/5ePHB/snippets/monsterblock.gen.js b/themes/V3/5ePHB/snippets/monsterblock.gen.js
index e61c206f0..dffb59d04 100644
--- a/themes/V3/5ePHB/snippets/monsterblock.gen.js
+++ b/themes/V3/5ePHB/snippets/monsterblock.gen.js
@@ -148,7 +148,7 @@ const genAction = function(){
'Turnbuckle Roll'
]);
- return `***${name}.*** *Melee Weapon Attack:* +4 to hit, reach 5ft., one target. *Hit* 5 (1d6 + 2) `;
+ return `***${name}.*** *Melee Weapon Attack:* +4 to hit, reach 5 ft., one target. *Hit:* 5 (1d6 + 2) `;
};
@@ -161,8 +161,8 @@ module.exports = {
*${getType()}, ${getAlignment()}*
___
**Armor Class** :: ${_.random(10, 20)} (chain mail, shield)
- **Hit Points** :: ${_.random(1, 150)}(1d4 + 5)
- **Speed** :: ${_.random(0, 50)}ft.
+ **Hit Points** :: ${_.random(1, 150)} (1d4 + 5)
+ **Speed** :: ${_.random(0, 50)} ft.
___
| STR | DEX | CON | INT | WIS | CHA |
|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less
index 5eebcb12e..93cfdf719 100644
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -305,12 +305,12 @@
margin-left : -0.16cm;
background-color : var(--HB_Color_MonsterStatBackground);
background-image : @monsterBlockBackground;
- background-blend-mode : overlay;
border-style : solid;
border-width : 7px 6px;
border-image : @monsterBorderImage 14 round;
border-image-outset : 0px 2px;
box-shadow : 1px 4px 14px #888888;
+ background-blend-mode : overlay;
}
position : relative;
@@ -335,9 +335,9 @@
//Triangle dividers
hr {
+ visibility : visible;
height : 6px;
margin : 0.12cm 0cm;
- visibility : visible;
background-image : @redTriangleImage;
background-size : 100% 100%;
border : none;
@@ -355,8 +355,8 @@
}
.bonus {
- float: right;
- padding-right: 0.5em;
+ float : right;
+ padding-right : 0.5em;
}
// Monster Ability table
@@ -456,8 +456,8 @@
// * EXTRAS
// *****************************/
hr {
- margin : 0px;
visibility : hidden;
+ margin : 0px;
}
//Text indent right after table
table + p { text-indent : 1em; }
@@ -525,10 +525,10 @@
content : '';
background-image : @classTableDecoration,
@classTableDecoration;
- filter : drop-shadow(0px 0px 1px #C8C5C080);
background-repeat : no-repeat, no-repeat;
background-position : top, bottom;
background-size : contain, contain;
+ filter : drop-shadow(0px 0px 1px #C8C5C080);
transform : translateY(-50%) translateX(-50%);
}
&.decoration.wide::before {
@@ -545,39 +545,40 @@
columns : 1;
text-align : center;
&::after { display : none; }
+ .frontCover { position : absolute; }
h1 {
- margin-top : 1.2cm;
- margin-bottom : 0;
- font-family : 'NodestoCapsCondensed';
- font-size : 2.245cm;
- font-weight : normal;
- line-height : 1.9cm;
- color : white;
- text-shadow : unset;
- text-transform : uppercase;
- -webkit-text-stroke: 0.2cm black;
- paint-order:stroke;
+ margin-top : 1.55cm;
+ margin-bottom : 0;
+ font-family : 'NodestoCapsCondensed';
+ font-size : 2.245cm;
+ font-weight : normal;
+ line-height : 1.9cm;
+ color : white;
+ text-transform : uppercase;
+ text-shadow : unset;
+ -webkit-text-stroke : 0.2cm black;
+ paint-order : stroke;
}
h2 {
- font-family : 'NodestoCapsCondensed';
- font-size : 0.85cm;
- font-weight : normal;
- color : white;
- letter-spacing : 0.1cm;
- -webkit-text-stroke: 0.14cm black;
- paint-order:stroke;
+ font-family : 'NodestoCapsCondensed';
+ font-size : 0.85cm;
+ font-weight : normal;
+ color : white;
+ letter-spacing : 0.1cm;
+ -webkit-text-stroke : 0.14cm black;
+ paint-order : stroke;
}
hr {
position : relative;
display : block;
+ visibility : visible;
width : 12cm;
height : 0.5cm;
margin : auto;
- visibility : visible;
background-image : @horizontalRule;
- filter : drop-shadow(0 0 3px black);
background-size : 100% 100%;
border : none;
+ filter : drop-shadow(0 0 3px black);
}
.banner {
position : absolute;
@@ -600,19 +601,19 @@
filter : drop-shadow(2px 2px 2px black);
}
.footnote {
- position : absolute;
- right : 0;
- bottom : 1.3cm;
- left : 0;
- width : 70%;
- margin-right : auto;
- margin-left : auto;
- font-family : 'Overpass';
- font-size : 0.496cm;
- color : white;
- text-align : center;
- -webkit-text-stroke: 0.1cm black;
- paint-order:stroke;
+ position : absolute;
+ right : 0;
+ bottom : 1.3cm;
+ left : 0;
+ width : 70%;
+ margin-right : auto;
+ margin-left : auto;
+ font-family : 'Overpass';
+ font-size : 0.496cm;
+ color : white;
+ text-align : center;
+ -webkit-text-stroke : 0.1cm black;
+ paint-order : stroke;
}
.logo {
position : absolute;
@@ -620,9 +621,7 @@
right : 0;
left : 0;
filter : drop-shadow(0 0 0.075cm black);
- img {
- height : 2cm;
- }
+ img { height : 2cm; }
}
}
// *****************************
@@ -632,8 +631,9 @@
columns : 1;
text-align : center;
&::after { display : none; }
+ .insideCover { position : absolute; }
h1 {
- margin-top : 1.2cm;
+ margin-top : 1.55cm;
margin-bottom : 0;
font-family : 'NodestoCapsCondensed';
font-size : 2.1cm;
@@ -650,10 +650,10 @@
hr {
position : relative;
display : block;
+ visibility : visible;
width : 12cm;
height : 0.5cm;
margin : auto;
- visibility : visible;
background-image : @horizontalRule;
background-size : 100% 100%;
border : none;
@@ -664,19 +664,17 @@
bottom : 1cm;
left : 0;
height : 2cm;
- img {
- height : 2cm;
- }
+ img { height : 2cm; }
}
}
// *****************************
// * BACK COVER
// *****************************/
.page:has(.backCover) {
- padding : 2.25cm 1.3cm 2cm 1.3cm;
- color : #FFFFFF;
- columns : 1;
+ padding : 2.25cm 1.3cm 2cm 1.3cm;
line-height : 1.4em;
+ color : #FFFFFF;
+ columns : 1;
&::after { display : none; }
.columnWrapper { width : 7.6cm; }
.backCover {
@@ -687,6 +685,7 @@
background-repeat : no-repeat;
background-size : contain;
}
+ .blank { height : 1.4em; }
h1 {
margin-bottom : 0.3cm;
font-family : 'NodestoCapsCondensed';
@@ -704,12 +703,12 @@
height : 100%;
}
hr {
+ visibility : visible;
width : 4.5cm;
height : 0.53cm;
margin-top : 1.1cm;
margin-right : auto;
margin-left : auto;
- visibility : visible;
background-image : @horizontalRule;
background-size : 100% 100%;
border : none;
@@ -802,7 +801,7 @@ h6,
.page:has(.insideCover),
.monster,
.noToC,
-.toc { --TOC: exclude; }
+.toc { --TOC : exclude; }
// Brew level default inclusion changes.
@@ -812,34 +811,32 @@ h6,
// Block level inclusion changes
// These include either a single (include) or a range (depth)
-.tocIncludeH1 h1 {--TOC: include; }
-.tocIncludeH2 h2 {--TOC: include; }
-.tocIncludeH3 h3 {--TOC: include; }
-.tocIncludeH4 h4 {--TOC: include; }
-.tocIncludeH5 h5 {--TOC: include; }
-.tocIncludeH6 h6 {--TOC: include; }
+.tocIncludeH1 h1 {--TOC : include; }
+.tocIncludeH2 h2 {--TOC : include; }
+.tocIncludeH3 h3 {--TOC : include; }
+.tocIncludeH4 h4 {--TOC : include; }
+.tocIncludeH5 h5 {--TOC : include; }
+.tocIncludeH6 h6 {--TOC : include; }
-.tocDepthH2 :is(h1, h2) {--TOC: include; }
-.tocDepthH3 :is(h1, h2, h3) {--TOC: include; }
-.tocDepthH4 :is(h1, h2, h3, h4) {--TOC: include; }
-.tocDepthH5 :is(h1, h2, h3, h4, h5) {--TOC: include; }
-.tocDepthH6 :is(h1, h2, h3, h4, h5, h6) {--TOC: include; }
+.tocDepthH2 :is(h1, h2) {--TOC : include; }
+.tocDepthH3 :is(h1, h2, h3) {--TOC : include; }
+.tocDepthH4 :is(h1, h2, h3, h4) {--TOC : include; }
+.tocDepthH5 :is(h1, h2, h3, h4, h5) {--TOC : include; }
+.tocDepthH6 :is(h1, h2, h3, h4, h5, h6) {--TOC : include; }
// Block level exclusion changes
// These exclude a single block level
-.tocExcludeH1 h1 {--TOC: exclude; }
-.tocExcludeH2 h2 {--TOC: exclude; }
-.tocExcludeH3 h3 {--TOC: exclude; }
-.tocExcludeH4 h4 {--TOC: exclude; }
-.tocExcludeH5 h5 {--TOC: exclude; }
-.tocExcludeH6 h6 {--TOC: exclude; }
+.tocExcludeH1 h1 {--TOC : exclude; }
+.tocExcludeH2 h2 {--TOC : exclude; }
+.tocExcludeH3 h3 {--TOC : exclude; }
+.tocExcludeH4 h4 {--TOC : exclude; }
+.tocExcludeH5 h5 {--TOC : exclude; }
+.tocExcludeH6 h6 {--TOC : exclude; }
.page:has(.partCover) {
- --TOC: exclude;
- & h1 {
- --TOC: include;
- }
- }
+ --TOC : exclude;
+ & h1 { --TOC : include; }
+}
.page {
&:has(.toc)::after { display : none; }
@@ -905,9 +902,7 @@ h6,
.useColumns(0.96, @fillMode: balance);
}
}
- .toc.wide li {
- break-inside: auto;
- }
+ .toc.wide li { break-inside : auto; }
}
// *****************************
@@ -932,9 +927,7 @@ h6,
.page h1 + * { margin-top : 0; }
-.page .descriptive.wide + * {
- margin-top: 0;
-}
+.page .descriptive.wide + * { margin-top : 0; }
//*****************************
// * RUNE TABLE
@@ -949,8 +942,8 @@ h6,
width : 1.3cm;
height : 1.3cm;
font-weight : normal;
- text-transform : uppercase;
vertical-align : middle;
+ text-transform : uppercase;
outline : 1px solid #000000;
}
th {
diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js
index e92e757cf..380daa37a 100644
--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -438,6 +438,15 @@ module.exports = [
icon : 'fas fa-print',
view : 'style',
snippets : [
+ {
+ name : 'US Letter Page Size',
+ icon : 'far fa-file',
+ gen : dedent`/* US Letter Page Size */
+ .page {
+ width : 215.9mm; /* 8.5in */
+ height : 279.4mm; /* 11in */
+ }\n\n`,
+ },
{
name : 'A3 Page Size',
icon : 'far fa-file',
diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
index 1a22db6a7..9f2bd498e 100644
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -21,9 +21,9 @@ body { counter-reset : page-numbers 0; }
// *****************************/
.page {
.block {
- break-inside : avoid;
display : inline-block;
width : 100%;
+ break-inside : avoid;
img { z-index : 0; }
}
.inline-block {
@@ -58,8 +58,8 @@ body { counter-reset : page-numbers 0; }
content-visibility : auto;
contain-intrinsic-size : auto none;
}
- //*****************************
- // * BASE
+//*****************************
+// * BASE
// *****************************/
.page {
p {
@@ -120,7 +120,7 @@ body { counter-reset : page-numbers 0; }
// * CODE BLOCKS
// ************************************/
code {
- font-family : 'Courier New', "Courier", monospace;
+ font-family : 'Courier New', 'Courier', monospace;
overflow-wrap : break-word;
white-space : pre-wrap;
}
@@ -133,10 +133,10 @@ body { counter-reset : page-numbers 0; }
// * EXTRAS
// *****************************/
.columnSplit {
- margin-top : 0;
visibility : hidden;
- -webkit-column-break-after : always;
+ margin-top : 0;
break-after : always;
+ -webkit-column-break-after : always;
-moz-column-break-after : always;
& + * { margin-top : 0; }
}
@@ -199,11 +199,11 @@ body { counter-reset : page-numbers 0; }
background-color : var(--HB_Color_WatercolorStain); /* default color */
background-size : cover;
-webkit-mask-image : var(--wc);
- -webkit-mask-size : contain;
- -webkit-mask-repeat : no-repeat;
mask-image : var(--wc);
- mask-size : contain;
+ -webkit-mask-repeat : no-repeat;
mask-repeat : no-repeat;
+ -webkit-mask-size : contain;
+ mask-size : contain;
--wc : @watercolor1; /* default image */
}
@@ -231,15 +231,15 @@ body { counter-reset : page-numbers 0; }
height : 200%;
background-image : var(--checkerboard);
background-size : 20px;
- transform : translateY(50%) translateX(-50%) rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
-webkit-mask-image : var(--wc), var(--revealer);
- -webkit-mask-repeat : repeat-x;
- -webkit-mask-size : 50%; //Scale only X to fit page width, leave height at aspect ratio, designed to hang off the edge
- -webkit-mask-position : 50% calc(50% - var(--offset));
mask-image : var(--wc);
+ -webkit-mask-repeat : repeat-x;
mask-repeat : repeat-x;
- mask-size : 50%;
+ -webkit-mask-position : 50% calc(50% - var(--offset));
mask-position : 50% calc(50% - var(--offset));
+ -webkit-mask-size : 50%; //Scale only X to fit page width, leave height at aspect ratio, designed to hang off the edge
+ mask-size : 50%;
+ transform : translateY(50%) translateX(-50%) rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
--rotation : 0;
--revealer : none;
--checkerboard : none;
@@ -276,19 +276,19 @@ body { counter-reset : page-numbers 0; }
}
&.revealImage {
--revealer : linear-gradient(0deg, rgba(0,0,0,0.2) 0%, rgba(0,0,0,0.2));
- --checkerboard : url("/assets/waterColorMasks/missingImage.png"); //shows any masked regions not filled by image
+ --checkerboard : url('/assets/waterColorMasks/missingImage.png'); //shows any masked regions not filled by image
}
}
.imageMaskEdge {
- &1 { --wc : url("/assets/waterColorMasks/edge/0001.webp"); }
- &2 { --wc : url("/assets/waterColorMasks/edge/0002.webp"); }
- &3 { --wc : url("/assets/waterColorMasks/edge/0003.webp"); }
- &4 { --wc : url("/assets/waterColorMasks/edge/0004.webp"); }
- &5 { --wc : url("/assets/waterColorMasks/edge/0005.webp"); }
- &6 { --wc : url("/assets/waterColorMasks/edge/0006.webp"); }
- &7 { --wc : url("/assets/waterColorMasks/edge/0007.webp"); }
- &8 { --wc : url("/assets/waterColorMasks/edge/0008.webp"); }
+ &1 { --wc : url('/assets/waterColorMasks/edge/0001.webp'); }
+ &2 { --wc : url('/assets/waterColorMasks/edge/0002.webp'); }
+ &3 { --wc : url('/assets/waterColorMasks/edge/0003.webp'); }
+ &4 { --wc : url('/assets/waterColorMasks/edge/0004.webp'); }
+ &5 { --wc : url('/assets/waterColorMasks/edge/0005.webp'); }
+ &6 { --wc : url('/assets/waterColorMasks/edge/0006.webp'); }
+ &7 { --wc : url('/assets/waterColorMasks/edge/0007.webp'); }
+ &8 { --wc : url('/assets/waterColorMasks/edge/0008.webp'); }
}
[class*='imageMaskCenter'] {
@@ -296,15 +296,15 @@ body { counter-reset : page-numbers 0; }
left : calc(var(--offsetX));
width : 100%;
height : 100%;
- transform : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
-webkit-mask-image : var(--wc), var(--revealer);
- -webkit-mask-repeat : no-repeat;
- -webkit-mask-size : 100% 100%; //Scale both dimensions to fit page size
- -webkit-mask-position : 0% 0%;
mask-image : var(--wc), var(--revealer);
+ -webkit-mask-repeat : no-repeat;
mask-repeat : no-repeat;
- mask-size : 100% 100%; //Scale both dimensions to fit page size
+ -webkit-mask-position : 0% 0%;
mask-position : 50% 50%;
+ -webkit-mask-size : 100% 100%; //Scale both dimensions to fit page size
+ mask-size : 100% 100%; //Scale both dimensions to fit page size
+ transform : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
& > p:has(img) {
position : absolute;
@@ -321,23 +321,23 @@ body { counter-reset : page-numbers 0; }
}
.imageMaskCenter {
- &1 { --wc : url("/assets/waterColorMasks/center/0001.webp"); }
- &2 { --wc : url("/assets/waterColorMasks/center/0002.webp"); }
- &3 { --wc : url("/assets/waterColorMasks/center/0003.webp"); }
- &4 { --wc : url("/assets/waterColorMasks/center/0004.webp"); }
- &5 { --wc : url("/assets/waterColorMasks/center/0005.webp"); }
- &6 { --wc : url("/assets/waterColorMasks/center/0006.webp"); }
- &7 { --wc : url("/assets/waterColorMasks/center/0007.webp"); }
- &8 { --wc : url("/assets/waterColorMasks/center/0008.webp"); }
- &9 { --wc : url("/assets/waterColorMasks/center/0009.webp"); }
- &10 { --wc : url("/assets/waterColorMasks/center/0010.webp"); }
- &11 { --wc : url("/assets/waterColorMasks/center/0011.webp"); }
- &12 { --wc : url("/assets/waterColorMasks/center/0012.webp"); }
- &13 { --wc : url("/assets/waterColorMasks/center/0013.webp"); }
- &14 { --wc : url("/assets/waterColorMasks/center/0014.webp"); }
- &15 { --wc : url("/assets/waterColorMasks/center/0015.webp"); }
- &16 { --wc : url("/assets/waterColorMasks/center/0016.webp"); }
- &special { --wc : url("/assets/waterColorMasks/center/special.webp"); }
+ &1 { --wc : url('/assets/waterColorMasks/center/0001.webp'); }
+ &2 { --wc : url('/assets/waterColorMasks/center/0002.webp'); }
+ &3 { --wc : url('/assets/waterColorMasks/center/0003.webp'); }
+ &4 { --wc : url('/assets/waterColorMasks/center/0004.webp'); }
+ &5 { --wc : url('/assets/waterColorMasks/center/0005.webp'); }
+ &6 { --wc : url('/assets/waterColorMasks/center/0006.webp'); }
+ &7 { --wc : url('/assets/waterColorMasks/center/0007.webp'); }
+ &8 { --wc : url('/assets/waterColorMasks/center/0008.webp'); }
+ &9 { --wc : url('/assets/waterColorMasks/center/0009.webp'); }
+ &10 { --wc : url('/assets/waterColorMasks/center/0010.webp'); }
+ &11 { --wc : url('/assets/waterColorMasks/center/0011.webp'); }
+ &12 { --wc : url('/assets/waterColorMasks/center/0012.webp'); }
+ &13 { --wc : url('/assets/waterColorMasks/center/0013.webp'); }
+ &14 { --wc : url('/assets/waterColorMasks/center/0014.webp'); }
+ &15 { --wc : url('/assets/waterColorMasks/center/0015.webp'); }
+ &16 { --wc : url('/assets/waterColorMasks/center/0016.webp'); }
+ &special { --wc : url('/assets/waterColorMasks/center/special.webp'); }
}
@@ -346,15 +346,15 @@ body { counter-reset : page-numbers 0; }
left : calc(-50% + var(--offsetX));
width : 200%;
height : 200%;
- transform : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
-webkit-mask-image : var(--wc), var(--revealer);
- -webkit-mask-repeat : no-repeat;
- -webkit-mask-size : 100% 100%; //Scale both dimensions to fit page size
- -webkit-mask-position : 50% 50%;
mask-image : var(--wc), var(--revealer);
+ -webkit-mask-repeat : no-repeat;
mask-repeat : no-repeat;
- mask-size : 100% 100%; //Scale both dimensions to fit page size
+ -webkit-mask-position : 50% 50%;
mask-position : 50% 50%;
+ -webkit-mask-size : 100% 100%; //Scale both dimensions to fit page size
+ mask-size : 100% 100%; //Scale both dimensions to fit page size
+ transform : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
& > p:has(img) {
bottom : 25%;
left : 25%;
@@ -367,43 +367,43 @@ body { counter-reset : page-numbers 0; }
}
}
.imageMaskCorner {
- &1 { --wc : url("/assets/waterColorMasks/corner/0001.webp"); }
- &2 { --wc : url("/assets/waterColorMasks/corner/0002.webp"); }
- &3 { --wc : url("/assets/waterColorMasks/corner/0003.webp"); }
- &4 { --wc : url("/assets/waterColorMasks/corner/0004.webp"); }
- &5 { --wc : url("/assets/waterColorMasks/corner/0005.webp"); }
- &6 { --wc : url("/assets/waterColorMasks/corner/0006.webp"); }
- &7 { --wc : url("/assets/waterColorMasks/corner/0007.webp"); }
- &8 { --wc : url("/assets/waterColorMasks/corner/0008.webp"); }
- &9 { --wc : url("/assets/waterColorMasks/corner/0009.webp"); }
- &10 { --wc : url("/assets/waterColorMasks/corner/0010.webp"); }
- &11 { --wc : url("/assets/waterColorMasks/corner/0011.webp"); }
- &12 { --wc : url("/assets/waterColorMasks/corner/0012.webp"); }
- &13 { --wc : url("/assets/waterColorMasks/corner/0013.webp"); }
- &14 { --wc : url("/assets/waterColorMasks/corner/0014.webp"); }
- &15 { --wc : url("/assets/waterColorMasks/corner/0015.webp"); }
- &16 { --wc : url("/assets/waterColorMasks/corner/0016.webp"); }
- &17 { --wc : url("/assets/waterColorMasks/corner/0017.webp"); }
- &18 { --wc : url("/assets/waterColorMasks/corner/0018.webp"); }
- &19 { --wc : url("/assets/waterColorMasks/corner/0019.webp"); }
- &20 { --wc : url("/assets/waterColorMasks/corner/0020.webp"); }
- &21 { --wc : url("/assets/waterColorMasks/corner/0021.webp"); }
- &22 { --wc : url("/assets/waterColorMasks/corner/0022.webp"); }
- &23 { --wc : url("/assets/waterColorMasks/corner/0023.webp"); }
- &24 { --wc : url("/assets/waterColorMasks/corner/0024.webp"); }
- &25 { --wc : url("/assets/waterColorMasks/corner/0025.webp"); }
- &26 { --wc : url("/assets/waterColorMasks/corner/0026.webp"); }
- &27 { --wc : url("/assets/waterColorMasks/corner/0027.webp"); }
- &28 { --wc : url("/assets/waterColorMasks/corner/0028.webp"); }
- &29 { --wc : url("/assets/waterColorMasks/corner/0029.webp"); }
- &30 { --wc : url("/assets/waterColorMasks/corner/0030.webp"); }
- &31 { --wc : url("/assets/waterColorMasks/corner/0031.webp"); }
- &32 { --wc : url("/assets/waterColorMasks/corner/0032.webp"); }
- &33 { --wc : url("/assets/waterColorMasks/corner/0033.webp"); }
- &34 { --wc : url("/assets/waterColorMasks/corner/0034.webp"); }
- &35 { --wc : url("/assets/waterColorMasks/corner/0035.webp"); }
- &36 { --wc : url("/assets/waterColorMasks/corner/0036.webp"); }
- &37 { --wc : url("/assets/waterColorMasks/corner/0037.webp"); }
+ &1 { --wc : url('/assets/waterColorMasks/corner/0001.webp'); }
+ &2 { --wc : url('/assets/waterColorMasks/corner/0002.webp'); }
+ &3 { --wc : url('/assets/waterColorMasks/corner/0003.webp'); }
+ &4 { --wc : url('/assets/waterColorMasks/corner/0004.webp'); }
+ &5 { --wc : url('/assets/waterColorMasks/corner/0005.webp'); }
+ &6 { --wc : url('/assets/waterColorMasks/corner/0006.webp'); }
+ &7 { --wc : url('/assets/waterColorMasks/corner/0007.webp'); }
+ &8 { --wc : url('/assets/waterColorMasks/corner/0008.webp'); }
+ &9 { --wc : url('/assets/waterColorMasks/corner/0009.webp'); }
+ &10 { --wc : url('/assets/waterColorMasks/corner/0010.webp'); }
+ &11 { --wc : url('/assets/waterColorMasks/corner/0011.webp'); }
+ &12 { --wc : url('/assets/waterColorMasks/corner/0012.webp'); }
+ &13 { --wc : url('/assets/waterColorMasks/corner/0013.webp'); }
+ &14 { --wc : url('/assets/waterColorMasks/corner/0014.webp'); }
+ &15 { --wc : url('/assets/waterColorMasks/corner/0015.webp'); }
+ &16 { --wc : url('/assets/waterColorMasks/corner/0016.webp'); }
+ &17 { --wc : url('/assets/waterColorMasks/corner/0017.webp'); }
+ &18 { --wc : url('/assets/waterColorMasks/corner/0018.webp'); }
+ &19 { --wc : url('/assets/waterColorMasks/corner/0019.webp'); }
+ &20 { --wc : url('/assets/waterColorMasks/corner/0020.webp'); }
+ &21 { --wc : url('/assets/waterColorMasks/corner/0021.webp'); }
+ &22 { --wc : url('/assets/waterColorMasks/corner/0022.webp'); }
+ &23 { --wc : url('/assets/waterColorMasks/corner/0023.webp'); }
+ &24 { --wc : url('/assets/waterColorMasks/corner/0024.webp'); }
+ &25 { --wc : url('/assets/waterColorMasks/corner/0025.webp'); }
+ &26 { --wc : url('/assets/waterColorMasks/corner/0026.webp'); }
+ &27 { --wc : url('/assets/waterColorMasks/corner/0027.webp'); }
+ &28 { --wc : url('/assets/waterColorMasks/corner/0028.webp'); }
+ &29 { --wc : url('/assets/waterColorMasks/corner/0029.webp'); }
+ &30 { --wc : url('/assets/waterColorMasks/corner/0030.webp'); }
+ &31 { --wc : url('/assets/waterColorMasks/corner/0031.webp'); }
+ &32 { --wc : url('/assets/waterColorMasks/corner/0032.webp'); }
+ &33 { --wc : url('/assets/waterColorMasks/corner/0033.webp'); }
+ &34 { --wc : url('/assets/waterColorMasks/corner/0034.webp'); }
+ &35 { --wc : url('/assets/waterColorMasks/corner/0035.webp'); }
+ &36 { --wc : url('/assets/waterColorMasks/corner/0036.webp'); }
+ &37 { --wc : url('/assets/waterColorMasks/corner/0037.webp'); }
}
}
@@ -437,6 +437,11 @@ body { counter-reset : page-numbers 0; }
margin-bottom : 1em;
& + * { margin-top : 0; }
}
+ .blank {
+ height : 1em;
+ margin-top : 0;
+ & + * { margin-top : 0; }
+ }
}
//*****************************
@@ -461,8 +466,8 @@ body { counter-reset : page-numbers 0; }
height : 1.5cm;
margin : 0 auto;
background-color : black;
- -webkit-mask : url("/assets/naturalCritLogoWhite.svg") center / contain no-repeat;
- mask : url("/assets/naturalCritLogoWhite.svg") center / contain no-repeat;
+ -webkit-mask : url('/assets/naturalCritLogoWhite.svg') center / contain no-repeat;
+ mask : url('/assets/naturalCritLogoWhite.svg') center / contain no-repeat;
}
.homebreweryIcon.red { background-color : red; }
.homebreweryIcon.gold { background-image : linear-gradient(to top left, brown 22.5%, gold 40%, white 60%, gold 67.5%, brown 82.5%); }
@@ -486,12 +491,8 @@ body { counter-reset : page-numbers 0; }
.pageNumber { left : 30px; }
}
- .resetCounting {
- counter-set : page-numbers 1;
- }
+ .resetCounting { counter-set : page-numbers 1; }
- &:not(:has(.skipCounting)) {
- counter-increment : page-numbers;
- }
+ &:not(:has(.skipCounting)) { counter-increment : page-numbers; }
}
diff --git a/themes/V3/Journal/snippets.js b/themes/V3/Journal/snippets.js
index 636befb60..bad5e8e6a 100644
--- a/themes/V3/Journal/snippets.js
+++ b/themes/V3/Journal/snippets.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+
module.exports = [
];
diff --git a/themes/V3/Journal/style.less b/themes/V3/Journal/style.less
index b8ed3ce8f..bddefb749 100644
--- a/themes/V3/Journal/style.less
+++ b/themes/V3/Journal/style.less
@@ -11,47 +11,35 @@
--HB_Color_WatercolorStain : #BBAD82; // Light brown
}
-.useSansSerif(){
- font-family : PermanentMarker;
+.useSansSerif() {
+ font-family : "PermanentMarker";
font-size : 0.3cm;
line-height : 1.2em;
color : var(--HB_Color_Text2);
- p,dl,ul,ol {
- line-height : 1.2em;
- }
- ul, ol {
- padding-left : 1em;
- }
- em{
- font-style : italic;
- }
- strong{
- font-weight : 800;
+ p,dl,ul,ol { line-height : 1.2em; }
+ ul, ol { padding-left : 1em; }
+ em { font-style : italic; }
+ strong {
font-size : 1.1em;
+ font-weight : 800;
}
- h5 + * {
- margin-top : 0.1cm;
- }
-}
-.useColumns(@multiplier : 1, @fillMode: balance){
- column-gap : 0.5cm;
+ h5 + * { margin-top : 0.1cm; }
}
+.useColumns(@multiplier : 1, @fillMode: balance) { column-gap : 0.5cm; }
-.page{
- background-size : 200% 100%;
- background-repeat : no-repeat;
- filter : drop-shadow(1px 4px 14px black);
- background-image : url(/assets/Journal/Background1.webp);
+.page {
padding : 2.1cm 1.9cm 1.7cm 3.8cm;
- &:nth-of-type(2n + 1) {
- background-position : left;
- }
+ background-image : url("/assets/Journal/Background1.webp");
+ background-repeat : no-repeat;
+ background-size : 200% 100%;
+ filter : drop-shadow(1px 4px 14px black);
+ &:nth-of-type(2n + 1) { background-position : left; }
&:nth-of-type(2n) {
- background-position : right;
padding : 2.1cm 3.9cm 1.7cm 1.8cm;
+ background-position : right;
}
&:nth-of-type(2) {
- background-image : url(/assets/Journal/Background2.webp); //Only first page should show ribbon
+ background-image : url("/assets/Journal/Background2.webp"); //Only first page should show ribbon
}
& .columnWrapper {
@@ -59,167 +47,137 @@
}
}
- //*****************************
- // * BASE
+//*****************************
+// * BASE
// *****************************/
-.page{
- color : var(--HB_Color_Text);
- font-family : ReenieBeanie;
+.page {
+ font-family : "ReenieBeanie";
font-size : 0.53cm;
line-height : 0.8em;
- p + * {
- margin-top : 0.325cm;
- }
- p + p{
- margin-top : 0;
- }
- ul{
- margin-bottom : 0.8em;
- }
- ol{
- margin-bottom : 0.8em;
- }
- em{
+ color : var(--HB_Color_Text);
+ p + * { margin-top : 0.325cm; }
+ p + p { margin-top : 0; }
+ ul { margin-bottom : 0.8em; }
+ ol { margin-bottom : 0.8em; }
+ em {
+ font-style : unset;
text-decoration : underline;
- font-style : unset;
- }
- del{
- text-decoration-style: double;
}
+ del { text-decoration-style : double; }
//Indents after p or lists
- p+p, ul+p, ol+p{
- text-indent : 1em;
- }
+ p + p, ul + p, ol + p { text-indent : 1em; }
//*****************************
// * HEADERS
// *****************************/
- h1,h2,h3,h4,h5{
- font-family : FrederickaTheGreat;
+ h1,h2,h3,h4,h5 {
+ font-family : "FrederickaTheGreat";
font-weight : unset;
color : var(--HB_Color_HeaderText);
}
- h1{
+ h1 {
margin-bottom : 0.18cm; //Margin-bottom only because this is WIDE
font-size : 0.89cm;
- line-height : 1em;
font-variant : small-caps;
- &+p::first-letter{
+ line-height : 1em;
+ & + p::first-letter {
float : left;
- font-family : FrederickaTheGreat;
- line-height : 1em;
- font-size : 1.9em;
- padding-left : 40px; //Allow background color to extend into margins
- margin-top : -0.3cm;
- margin-bottom : -20px;
- margin-left : -40px;
- margin-right : 0.1em;
padding-top : 0.3em;
padding-bottom : 2px;
+ padding-left : 40px; //Allow background color to extend into margins
+ margin-top : -0.3cm;
+ margin-right : 0.1em;
+ margin-bottom : -20px;
+ margin-left : -40px;
+ font-family : "FrederickaTheGreat";
+ font-size : 1.9em;
+ line-height : 1em;
}
- &+p::first-line{
- font-variant : small-caps;
- }
+ & + p::first-line { font-variant : small-caps; }
}
- h2{
+ h2 {
font-size : 0.62cm;
line-height : 0.988em; //Font is misaligned. Shift up slightly
}
- h3{
+ h3 {
+ margin-left : -0.9em;
font-size : 0.575cm;
line-height : 0.995em; //Font is misaligned. Shift up slightly
- margin-left : -0.9em;
}
- h4{
+ h4 {
+ padding-bottom : 5px;
font-size : 0.55cm;
line-height : 0.971em; //Font is misaligned. Shift up slightly
color : var(--HB_Color_Text);
- padding-bottom : 5px;
- transform:rotate(0deg);
- &:nth-of-type(2n) {
- transform:rotate(1deg);
- }
- &:nth-of-type(3n) {
- transform:rotate(-1.5deg);
- }
+ transform : rotate(0deg);
+ &:nth-of-type(2n) { transform : rotate(1deg); }
+ &:nth-of-type(3n) { transform : rotate(-1.5deg); }
}
- h5{
- font-family : PermanentMarker;
+ h5 {
+ font-family : "PermanentMarker";
font-size : 0.4cm;
- color : var(--HB_Color_Text2);
font-weight : bold;
line-height : 0.951em; //Font is misaligned. Shift up slightly
- & + * {
- margin-top : 0.2cm;
- }
+ color : var(--HB_Color_Text2);
+ & + * { margin-top : 0.2cm; }
}
//*****************************
// * TABLE
// *****************************/
- table{
+ table {
.useSansSerif();
- & + * {
- margin-top : 0.325cm;
- }
- thead{
- th{
- vertical-align : bottom;
+ & + * { margin-top : 0.325cm; }
+ thead {
+ th {
padding : 0.14em 0;
+ vertical-align : bottom;
}
}
- tbody{
- tr{
- td{
- padding : 0.14em 0;
- }
- &:nth-child(odd){
- background-image : linear-gradient(to left, #41212100, #41212122, #41212100);
- }
+ tbody {
+ tr {
+ td { padding : 0.14em 0; }
+ &:nth-child(odd) { background-image : linear-gradient(to left, #41212100, #41212122, #41212100); }
}
}
}
//*****************************
// * NOTE
// *****************************/
- .note{
+ .note {
.useSansSerif();
+ padding : 0.2cm;
+ background-image : url("/assets/Journal/HashMarks.png"),
+ linear-gradient(to bottom right, #FF000000, #A36A4E14, #41212100);
+ background-repeat : no-repeat;
+ background-position : center;
+ background-size : 120% 120%;
border-style : solid;
border-width : 1px;
- border-image-source : url(/assets/Journal/Border1.png);
+ border-image-source : url("/assets/Journal/Border1.png");
border-image-slice : 18 18 18 18;
border-image-width : 6px 6px 6px 6px;
border-image-outset : 5px 5px 5px 5px;
border-image-repeat : stretch stretch;
- background-image : url(/assets/Journal/HashMarks.png),
- linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
- background-size : 120% 120%;
- background-repeat : no-repeat;
- background-position : center;
- padding : 0.2cm;
:where(&) {
margin-top : 9px; //Prevent top border getting cut off on colbreak
}
- & + * {
- margin-top : 0.45cm;
- }
- h5 {
- font-size : 0.375cm;
- }
- p{
- padding-bottom : 0px;
- }
- :last-child {
- margin-bottom : 0;
- }
+ & + * { margin-top : 0.45cm; }
+ h5 { font-size : 0.375cm; }
+ p { padding-bottom : 0px; }
+ :last-child { margin-bottom : 0; }
}
//************************************
// * DESCRIPTIVE TEXT BOX
// ************************************/
- * + .descriptive {
- margin-top : 0.6cm;
- }
- .descriptive{
+ * + .descriptive { margin-top : 0.6cm; }
+ .descriptive {
.useSansSerif();
+ padding : 0.2cm;
+ background-image : url("/assets/Journal/HashMarks.png"),
+ linear-gradient(to bottom right, #FF000000, #41212114, #41212100);
+ background-repeat : no-repeat;
+ background-position : center;
+ background-size : 120% 120%;
border-style : solid;
border-width : 1px;
border-image-source : url('/assets/Journal/Border2.png');
@@ -227,27 +185,13 @@
border-image-width : 20px;
border-image-outset : 16px 20px 16px 20px;
border-image-repeat : stretch stretch;
- background-image : url(/assets/Journal/HashMarks.png),
- linear-gradient(to bottom right, #ff000000, #41212114, #41212100);
- background-size : 120% 120%;
- background-repeat : no-repeat;
- background-position : center;
- padding : 0.2cm;
:where(&) {
margin-top : 4px; //Prevent top border getting cut off on colbreak
}
- & + * {
- margin-top : 0.45cm;
- }
- h5 {
- font-size : 0.375cm;
- }
- p{
- padding-bottom : 0px;
- }
- :last-child {
- margin-bottom : 0;
- }
+ & + * { margin-top : 0.45cm; }
+ h5 { font-size : 0.375cm; }
+ p { padding-bottom : 0px; }
+ :last-child { margin-bottom : 0; }
}
//*****************************
// * Images Snippets
@@ -257,25 +201,23 @@
.artist {
position : absolute;
width : auto;
- text-align : center;
- font-family : WalterTurncoat;
+ font-family : "WalterTurncoat";
font-size : 0.27cm;
color : var(--HB_Color_CaptionText);
+ text-align : center;
p, p + p {
margin : unset;
- text-indent : unset;
line-height : 1em;
+ text-indent : unset;
}
- h5 {
+ h5 {
+ font-family : "WalterTurncoat";
font-size : 1.3em;
- font-family : WalterTurncoat;
}
- a{
+ a {
color : inherit;
text-decoration : unset;
- &:hover {
- text-decoration : underline;
- }
+ &:hover { text-decoration : underline; }
}
}
@@ -285,6 +227,10 @@
.monster {
.useSansSerif();
&.frame {
+ padding : 0.2cm;
+ background-image : url('/assets/Journal/HashMarks.png'),
+ linear-gradient(to bottom right, #FF000000, #A36A4E14, #41212100);
+ background-size : 100%;
border-style : solid;
border-width : 7px 6px;
border-image-source : url('/assets/Journal/Border3.png');
@@ -292,33 +238,29 @@
border-image-width : 15px 20px 15px 20px;
border-image-outset : 12px 12px 12px 12px;
border-image-repeat : stretch round;
- background-image : url('/assets/Journal/HashMarks.png'),
- linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
background-blend-mode : screen multiply;
- background-size : 100%;
- padding : 0.2cm;
}
-
- color: var(--HB_Color_Text);
position : relative;
padding : 0px;
margin-bottom : 0.325cm;
+ color : var(--HB_Color_Text);
+
//Headers
- h2{
+ h2 {
+ margin : 0;
font-size : 0.62cm;
line-height : 1em;
- margin : 0;
- &+p {
+ & + p {
margin-bottom : 0; //Monster size and type subtext
}
}
- h3{
+ h3 {
+ padding-bottom : 0.05cm;
margin-left : 0;
font-variant : small-caps;
- padding-bottom : 0.05cm;
}
- hr{
+ hr {
visibility : visible;
height : 6px;
margin : 0.12cm 0cm;
@@ -330,24 +272,18 @@
}
// Monster Ability table
- hr + table:first-of-type{
+ hr + table:first-of-type {
margin : 0;
- column-span : none;
- background-image : none;
+ color : inherit;
+ background-image : none;
border-style : none;
border-image : none;
- color : inherit;
- tr {
- background-image : none;
- }
- td,th {
- padding: 0px;
- }
+ column-span : none;
+ tr { background-image : none; }
+ td,th { padding : 0px; }
}
- :last-child {
- margin-bottom : 0;
- }
+ :last-child { margin-bottom : 0; }
strong, em {
font-style : normal;
@@ -356,29 +292,27 @@
}
//Full Width
- .monster.wide{
+ .monster.wide {
.useColumns(0.96, @fillMode: balance);
}
//*****************************
// * FOOTER
// *****************************/
- &:nth-child(odd){
- .pageNumber{
- left : 3cm;
- }
- .footnote{
+ &:nth-child(odd) {
+ .pageNumber { left : 3cm; }
+ .footnote {
left : 4.5cm;
text-align : left;
}
}
- .pageNumber{
- font-family : FrederickaTheGreat;
+ .pageNumber {
right : 3cm;
bottom : 1.25cm;
+ font-family : "FrederickaTheGreat";
color : var(--HB_Color_HeaderText);
}
- .footnote{
+ .footnote {
position : absolute;
right : 4.5cm;
bottom : 1.25cm;
@@ -391,154 +325,134 @@
//************************************
// * CODE BLOCKS
// ************************************/
- code{
- font-size : 0.3cm;
+ code {
padding : 0px 4px;
- color : var(--HB_Color_Text);
+ font-size : 0.3cm;
vertical-align : middle;
- background-color : #faf7ea;
+ color : var(--HB_Color_Text);
+ background-color : #FAF7EA;
border-radius : 4px;
}
- pre code{
+ pre code {
+ padding : 0.15cm;
+ margin-bottom : 2px;
border-style : solid;
border-width : 1px;
+ border-radius : 12px;
border-image : @codeBorderImage 26 stretch;
border-image-width : 10px;
border-image-outset : 2px;
- border-radius : 12px;
- margin-bottom : 2px;
- padding : 0.15cm;
.page :where(&) {
margin-top : 2px; //Prevent top border getting cut off on colbreak
}
- & + * {
- margin-top : 0.325cm;
- }
+ & + * { margin-top : 0.325cm; }
}
//*****************************
// * EXTRAS
// *****************************/
- hr{
+ hr {
visibility : hidden;
- border : none;
margin : 0px;
+ border : none;
}
//Text indent right after table
- table+p{
- text-indent : 1em;
- }
+ table + p { text-indent : 1em; }
a, a:visited, a:hover {
- color: var(--HB_Color_Text);
- transition:all 1s ease;
- }
- a:hover {
- color:red;
+ color : var(--HB_Color_Text);
+ transition : all 1s ease;
}
+ a:hover { color : red; }
}
//*****************************
// * SPELL LIST
// *****************************/
-.page .spellList{
+.page .spellList {
.useSansSerif();
- font-family : PermanentMarker;
+ font-family : "PermanentMarker";
column-count : 2;
- ul+h5{
- margin-top : 15px;
- }
- ul{
- margin-bottom : 0.5em;
+ ul + h5 { margin-top : 15px; }
+ ul {
padding-left : 1em;
+ margin-bottom : 0.5em;
text-indent : -1em;
list-style-type : none;
+ break-inside : auto;
-webkit-column-break-inside : auto;
page-break-inside : auto;
- break-inside : auto;
- }
- &.wide{
- column-count : 4;
}
+ &.wide { column-count : 4; }
}
//*****************************
// * CLASS TABLE
// *****************************/
-.page .classTable{
- th[colspan]:not([rowspan]) {
- white-space : nowrap;
- }
- h5 + table{
- margin-top : 0.2cm;
- }
+.page .classTable {
+ th[colspan]:not([rowspan]) { white-space : nowrap; }
+ h5 + table { margin-top : 0.2cm; }
}
//*****************************
// * TABLE OF CONTENTS
// *****************************/
-.page .toc{
+.page .toc {
-webkit-column-break-inside : avoid;
page-break-inside : avoid;
break-inside : avoid;
h1 {
- text-align : center;
margin-bottom : 0.3cm;
+ text-align : center;
}
- a{
+ a {
display : inline;
color : inherit;
text-decoration : none;
- &:hover{
- text-decoration : underline;
- }
+ &:hover { text-decoration : underline; }
}
h4 {
margin-top : 0.2cm;
line-height : 0.4cm;
- & + ul li {
- line-height: 1.2em;
- }
+ & + ul li { line-height : 1.2em; }
}
- ul{
+ ul {
padding-left : 0;
list-style-type : none;
li + li h3 {
margin-top : 0.26cm;
- line-height : 1em
- }
- h3 span:first-child::after {
- border : none;
+ line-height : 1em;
}
+ h3 span:first-child::after { border : none; }
span {
display : table-cell;
&:first-child {
- position : relative;
- overflow : hidden;
+ position : relative;
+ overflow : hidden;
&::after {
- content : "";
position : absolute;
bottom : 0.08cm;
- margin-left : 0.06cm; /* Spacing before dot leaders */
width : 100%;
- border-bottom : 0.05cm dotted #000;
+ margin-left : 0.06cm; /* Spacing before dot leaders */
+ content : '';
+ border-bottom : 0.05cm dotted #000000;
}
}
&:last-child {
- font-family : ReenieBeanie;
- font-size : 0.34cm;
- font-weight : normal;
- color : black;
- text-align : right;
- vertical-align : bottom; /* Keep page number bottom-aligned */
width : 1%;
padding-left : 0.06cm; /* Spacing after dot leaders */
- /*white-space : nowrap; /* Uncomment if needed */
+ font-family : "ReenieBeanie";
+ font-size : 0.34cm;
+ font-weight : normal;
+ vertical-align : bottom; /* Keep page number bottom-aligned */
+ color : black;
+ text-align : right;
+ /* white-space : nowrap; /* Uncomment if needed */
}
}
- ul { /*List indent*/
+ ul { /* List indent */
margin-left : 1em;
}
}
- &.wide{
+ &.wide {
.useColumns(0.96, @fillMode: balance);
}
}
@@ -546,6 +460,4 @@
//*****************************
// * WIDE
// *****************************/
-.page .wide {
- margin-bottom : 0.45cm;
-}
+.page .wide { margin-bottom : 0.45cm; }
diff --git a/themes/codeMirror/customEditorStyles.less b/themes/codeMirror/customEditorStyles.less
index 367eaec33..8c48c1b43 100644
--- a/themes/codeMirror/customEditorStyles.less
+++ b/themes/codeMirror/customEditorStyles.less
@@ -1,88 +1,83 @@
.editor .codeEditor .CodeMirror {
- // Themes with dark backgrounds
- &.cm-s-3024-night,
- &.cm-s-abbott,
- &.cm-s-abcdef,
- &.cm-s-ambiance,
- &.cm-s-ayu-dark,
- &.cm-s-ayu-mirage,
- &.cm-s-base16-dark,
- &.cm-s-bespin,
- &.cm-s-blackboard,
- &.cm-s-cobalt,
- &.cm-s-colorforth,
- &.cm-s-darcula,
- &.cm-s-dracula,
- &.cm-s-duotone-dark,
- &.cm-s-erlang-dark,
- &.cm-s-gruvbox-dark,
- &.cm-s-hopscotch,
- &.cm-s-icecoder,
- &.cm-s-isotope,
- &.cm-s-lesser-dark,
- &.cm-s-liquibyte,
- &.cm-s-lucario,
- &.cm-s-material,
- &.cm-s-material-darker,
- &.cm-s-material-ocean,
- &.cm-s-material-palenight,
- &.cm-s-mbo,
- &.cm-s-midnight,
- &.cm-s-monokai,
- &.cm-s-moxer,
- &.cm-s-night,
- &.cm-s-nord,
- &.cm-s-oceanic-next,
- &.cm-s-panda-syntax,
- &.cm-s-paraiso-dark,
- &.cm-s-pastel-on-dark,
- &.cm-s-railscasts,
- &.cm-s-rubyblue,
- &.cm-s-seti,
- &.cm-s-shadowfox,
- &.cm-s-the-matrix,
- &.cm-s-tomorrow-night-bright,
- &.cm-s-tomorrow-night-eighties,
- &.cm-s-twilight,
- &.cm-s-vibrant-ink,
- &.cm-s-xq-dark,
- &.cm-s-yonce,
- &.cm-s-zenburn
- {
- .CodeMirror-code {
- .block:not(.cm-comment) {
- color: magenta;
- }
- .columnSplit {
- color: black;
- background-color: rgba(35,153,153,0.5);
- }
- .pageLine {
- background-color: rgba(255,255,255,0.5);
- & ~ pre.CodeMirror-line {
- color: black;
- }
- }
- }
- }
- // Themes with light backgrounds
- &.cm-s-default,
- &.cm-s-3024-day,
- &.cm-s-ambiance-mobile,
- &.cm-s-base16-light,
- &.cm-s-duotone-light,
- &.cm-s-eclipse,
- &.cm-s-elegant,
- &.cm-s-juejin,
- &.cm-s-neat,
- &.cm-s-neo,
- &.cm-s-paraiso-lightm
- &.cm-s-solarized,
- &.cm-s-ssms,
- &.cm-s-ttcn,
- &.cm-s-xq-light,
- &.cm-s-yeti {
- // Future styling for themes with light backgrounds
- --dummyVar: 'currently unused';
- }
+ // Themes with dark backgrounds
+ &.cm-s-3024-night,
+ &.cm-s-abbott,
+ &.cm-s-abcdef,
+ &.cm-s-ambiance,
+ &.cm-s-ayu-dark,
+ &.cm-s-ayu-mirage,
+ &.cm-s-base16-dark,
+ &.cm-s-bespin,
+ &.cm-s-blackboard,
+ &.cm-s-cobalt,
+ &.cm-s-colorforth,
+ &.cm-s-darcula,
+ &.cm-s-dracula,
+ &.cm-s-duotone-dark,
+ &.cm-s-erlang-dark,
+ &.cm-s-gruvbox-dark,
+ &.cm-s-hopscotch,
+ &.cm-s-icecoder,
+ &.cm-s-isotope,
+ &.cm-s-lesser-dark,
+ &.cm-s-liquibyte,
+ &.cm-s-lucario,
+ &.cm-s-material,
+ &.cm-s-material-darker,
+ &.cm-s-material-ocean,
+ &.cm-s-material-palenight,
+ &.cm-s-mbo,
+ &.cm-s-midnight,
+ &.cm-s-monokai,
+ &.cm-s-moxer,
+ &.cm-s-night,
+ &.cm-s-nord,
+ &.cm-s-oceanic-next,
+ &.cm-s-panda-syntax,
+ &.cm-s-paraiso-dark,
+ &.cm-s-pastel-on-dark,
+ &.cm-s-railscasts,
+ &.cm-s-rubyblue,
+ &.cm-s-seti,
+ &.cm-s-shadowfox,
+ &.cm-s-the-matrix,
+ &.cm-s-tomorrow-night-bright,
+ &.cm-s-tomorrow-night-eighties,
+ &.cm-s-twilight,
+ &.cm-s-vibrant-ink,
+ &.cm-s-xq-dark,
+ &.cm-s-yonce,
+ &.cm-s-zenburn {
+ .CodeMirror-code {
+ .block:not(.cm-comment) { color : magenta; }
+ .columnSplit {
+ color : black;
+ background-color : rgba(35,153,153,0.5);
+ }
+ .pageLine {
+ background-color : rgba(255,255,255,0.5);
+ & ~ pre.CodeMirror-line { color : black; }
+ }
+ }
+ }
+ // Themes with light backgrounds
+ &.cm-s-default,
+ &.cm-s-3024-day,
+ &.cm-s-ambiance-mobile,
+ &.cm-s-base16-light,
+ &.cm-s-duotone-light,
+ &.cm-s-eclipse,
+ &.cm-s-elegant,
+ &.cm-s-juejin,
+ &.cm-s-neat,
+ &.cm-s-neo,
+ &.cm-s-paraiso-lightm
+ &.cm-s-solarized,
+ &.cm-s-ssms,
+ &.cm-s-ttcn,
+ &.cm-s-xq-light,
+ &.cm-s-yeti {
+ // Future styling for themes with light backgrounds
+ --dummyVar : 'currently unused';
+ }
}
diff --git a/themes/fonts/5e legacy/fonts.less b/themes/fonts/5e legacy/fonts.less
index d4c10c456..680e395ec 100644
--- a/themes/fonts/5e legacy/fonts.less
+++ b/themes/fonts/5e legacy/fonts.less
@@ -1,61 +1,61 @@
/* Main Font, serif */
@font-face {
- font-family: BookSanity;
- src: url('../../../fonts/5e legacy/Bookinsanity.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "BookSanity";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e legacy/Bookinsanity.woff2');
}
@font-face {
- font-family: BookSanity;
- src: url('../../../fonts/5e legacy/Bookinsanity Bold.woff2');
- font-weight: bold;
- font-style: normal;
+ font-family : "BookSanity";
+ font-style : normal;
+ font-weight : bold;
+ src : url('../../../fonts/5e legacy/Bookinsanity Bold.woff2');
}
@font-face {
- font-family: BookSanity;
- src: url('../../../fonts/5e legacy/Bookinsanity Italic.woff2');
- font-weight: normal;
- font-style: italic;
+ font-family : "BookSanity";
+ font-style : italic;
+ font-weight : normal;
+ src : url('../../../fonts/5e legacy/Bookinsanity Italic.woff2');
}
@font-face {
- font-family: BookSanity;
- src: url('../../../fonts/5e legacy/Bookinsanity Bold Italic.woff2');
- font-weight: bold;
- font-style: italic;
+ font-family : "BookSanity";
+ font-style : italic;
+ font-weight : bold;
+ src : url('../../../fonts/5e legacy/Bookinsanity Bold Italic.woff2');
}
/* Notes and Tables, sans-serif */
@font-face {
- font-family: ScalySans;
- src: url('../../../fonts/5e legacy/Scaly Sans.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "ScalySans";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e legacy/Scaly Sans.woff2');
}
@font-face {
- font-family: ScalySansSmallCaps;
- src: url('../../../fonts/5e legacy/Scaly Sans Caps.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "ScalySansSmallCaps";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e legacy/Scaly Sans Caps.woff2');
}
@font-face {
- font-family: WalterTurncoat;
- src: url('../../../fonts/5e legacy/WalterTurncoat-Regular.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "WalterTurncoat";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e legacy/WalterTurncoat-Regular.woff2');
}
/* Headers */
@font-face {
- font-family: MrJeeves;
- src: url('../../../fonts/5e legacy/Mr Eaves Small Caps.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "MrJeeves";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e legacy/Mr Eaves Small Caps.woff2');
}
/* Fancy Drop Cap */
@font-face {
- font-family: Solberry;
- src: url('../../../fonts/5e legacy/Solbera Imitation.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "Solberry";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e legacy/Solbera Imitation.woff2');
}
diff --git a/themes/fonts/5e/fonts.less b/themes/fonts/5e/fonts.less
index c028b06f9..eec5c418f 100644
--- a/themes/fonts/5e/fonts.less
+++ b/themes/fonts/5e/fonts.less
@@ -1,143 +1,143 @@
/* Main Font, serif */
@font-face {
- font-family: BookInsanityRemake;
- src: url('../../../fonts/5e/Bookinsanity.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "BookInsanityRemake";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Bookinsanity.woff2');
}
@font-face {
- font-family: BookInsanityRemake;
- src: url('../../../fonts/5e/Bookinsanity Bold.woff2');
- font-weight: bold;
- font-style: normal;
+ font-family : "BookInsanityRemake";
+ font-style : normal;
+ font-weight : bold;
+ src : url('../../../fonts/5e/Bookinsanity Bold.woff2');
}
@font-face {
- font-family: BookInsanityRemake;
- src: url('../../../fonts/5e/Bookinsanity Italic.woff2');
- font-weight: normal;
- font-style: italic;
+ font-family : "BookInsanityRemake";
+ font-style : italic;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Bookinsanity Italic.woff2');
}
@font-face {
- font-family: BookInsanityRemake;
- src: url('../../../fonts/5e/Bookinsanity Bold Italic.woff2');
- font-weight: bold;
- font-style: italic;
+ font-family : "BookInsanityRemake";
+ font-style : italic;
+ font-weight : bold;
+ src : url('../../../fonts/5e/Bookinsanity Bold Italic.woff2');
}
/* Notes and Tables, sans-serif */
@font-face {
- font-family: ScalySansRemake;
- src: url('../../../fonts/5e/Scaly Sans.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "ScalySansRemake";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Scaly Sans.woff2');
}
@font-face {
- font-family: ScalySansRemake;
- src: url('../../../fonts/5e/Scaly Sans Bold.woff2');
- font-weight: bold;
- font-style: normal;
+ font-family : "ScalySansRemake";
+ font-style : normal;
+ font-weight : bold;
+ src : url('../../../fonts/5e/Scaly Sans Bold.woff2');
}
@font-face {
- font-family: ScalySansRemake;
- src: url('../../../fonts/5e/Scaly Sans Italic.woff2');
- font-weight: normal;
- font-style: italic;
+ font-family : "ScalySansRemake";
+ font-style : italic;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Scaly Sans Italic.woff2');
}
@font-face {
- font-family: ScalySansRemake;
- src: url('../../../fonts/5e/Scaly Sans Bold Italic.woff2');
- font-weight: bold;
- font-style: italic;
+ font-family : "ScalySansRemake";
+ font-style : italic;
+ font-weight : bold;
+ src : url('../../../fonts/5e/Scaly Sans Bold Italic.woff2');
}
@font-face {
- font-family: ScalySansSmallCapsRemake;
- src: url('../../../fonts/5e/Scaly Sans Caps.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "ScalySansSmallCapsRemake";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Scaly Sans Caps.woff2');
}
@font-face {
- font-family: WalterTurncoat;
- src: url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "WalterTurncoat";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
}
/* Headers */
@font-face {
- font-family: MrEavesRemake;
- src: url('../../../fonts/5e/Mr Eaves Small Caps.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "MrEavesRemake";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Mr Eaves Small Caps.woff2');
}
/* Fancy Drop Cap */
@font-face {
- font-family: SolberaImitationRemake; //Tweaked 5e version
- src: url('../../../fonts/5e/Solbera Imitation Tweak.woff2');
- font-weight: 100 1000;
- font-style: normal;
- font-style: italic;
+ font-family : "SolberaImitationRemake"; //Tweaked 5e version
+ font-style : normal;
+ font-style : italic;
+ font-weight : 100 1000;
+ src : url('../../../fonts/5e/Solbera Imitation Tweak.woff2');
}
/* Cover Page */
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../../../fonts/5e/Nodesto Caps Condensed.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "NodestoCapsCondensed";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Nodesto Caps Condensed.woff2');
}
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../../../fonts/5e/Nodesto Caps Condensed Bold.woff2');
- font-weight: bold;
- font-style: normal;
+ font-family : "NodestoCapsCondensed";
+ font-style : normal;
+ font-weight : bold;
+ src : url('../../../fonts/5e/Nodesto Caps Condensed Bold.woff2');
}
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../../../fonts/5e/Nodesto Caps Condensed Italic.woff2');
- font-weight: normal;
- font-style: italic;
+ font-family : "NodestoCapsCondensed";
+ font-style : italic;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Nodesto Caps Condensed Italic.woff2');
}
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../../../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
- font-weight: bold;
- font-style: italic;
+ font-family : "NodestoCapsCondensed";
+ font-style : italic;
+ font-weight : bold;
+ src : url('../../../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
}
@font-face {
- font-family: NodestoCapsWide;
- src: url('../../../fonts/5e/Nodesto Caps Wide.woff2');
- font-weight: normal;
- font-style: normal
+ font-family : "NodestoCapsWide";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/Nodesto Caps Wide.woff2');
}
@font-face {
- font-family: Overpass;
- src: url('../../../fonts/5e/Overpass Medium.woff2');
- font-weight: 500;
- font-style: normal;
+ font-family : "Overpass";
+ font-style : normal;
+ font-weight : 500;
+ src : url('../../../fonts/5e/Overpass Medium.woff2');
}
@font-face {
- font-family: Davek;
- src: url('../../../fonts/5e/Davek.woff2');
- font-weight: 500;
- font-style: normal;
+ font-family : "Davek";
+ font-style : normal;
+ font-weight : 500;
+ src : url('../../../fonts/5e/Davek.woff2');
}
@font-face {
- font-family: Iokharic;
- src: url('../../../fonts/5e/Iokharic.woff2');
- font-weight: 500;
- font-style: normal;
+ font-family : "Iokharic";
+ font-style : normal;
+ font-weight : 500;
+ src : url('../../../fonts/5e/Iokharic.woff2');
}
@font-face {
- font-family: Rellanic;
- src: url('../../../fonts/5e/Rellanic.woff2');
- font-weight: 500;
- font-style: normal;
+ font-family : "Rellanic";
+ font-style : normal;
+ font-weight : 500;
+ src : url('../../../fonts/5e/Rellanic.woff2');
}
diff --git a/themes/fonts/Blank/fonts.less b/themes/fonts/Blank/fonts.less
index 4a3d2d1e8..6558c84b4 100644
--- a/themes/fonts/Blank/fonts.less
+++ b/themes/fonts/Blank/fonts.less
@@ -18,29 +18,29 @@ License:
*/
@font-face {
- font-family: Pagella;
- src: url('../../../fonts/Blank/texgyrepagella-regular.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "Pagella";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/Blank/texgyrepagella-regular.woff2');
}
@font-face {
- font-family: Pagella;
- src: url('../../../fonts/Blank/texgyrepagella-bold.woff2');
- font-weight: bold;
- font-style: normal;
+ font-family : "Pagella";
+ font-style : normal;
+ font-weight : bold;
+ src : url('../../../fonts/Blank/texgyrepagella-bold.woff2');
}
@font-face {
- font-family: Pagella;
- src: url('../../../fonts/Blank/texgyrepagella-italic.woff2');
- font-weight: normal;
- font-style: italic;
+ font-family : "Pagella";
+ font-style : italic;
+ font-weight : normal;
+ src : url('../../../fonts/Blank/texgyrepagella-italic.woff2');
}
@font-face {
- font-family: Pagella;
- src: url('../../../fonts/Blank/texgyrepagella-bolditalic.woff2');
- font-weight: bold;
- font-style: italic;
+ font-family : "Pagella";
+ font-style : italic;
+ font-weight : bold;
+ src : url('../../../fonts/Blank/texgyrepagella-bolditalic.woff2');
}
diff --git a/themes/fonts/Journal/fonts.less b/themes/fonts/Journal/fonts.less
index 703b594ba..20190c651 100644
--- a/themes/fonts/Journal/fonts.less
+++ b/themes/fonts/Journal/fonts.less
@@ -1,58 +1,58 @@
/* Main Font, serif */
@font-face {
- font-family: ReenieBeanie;
- src: url('../../../fonts/Journal/ReenieBeanie-Regular.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "ReenieBeanie";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/Journal/ReenieBeanie-Regular.woff2');
}
/* Notes and Tables, sans-serif */
@font-face {
- font-family: PermanentMarker;
- src: url('../../../fonts/Journal/PermanentMarker-Regular.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "PermanentMarker";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/Journal/PermanentMarker-Regular.woff2');
}
@font-face {
- font-family: WalterTurncoat;
- src: url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "WalterTurncoat";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
}
/* Headers */
@font-face {
- font-family: FrederickaTheGreat;
- src: url('../../../fonts/Journal/FrederickaTheGreat-Regular.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "FrederickaTheGreat";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../../../fonts/Journal/FrederickaTheGreat-Regular.woff2');
}
/* Cover Page */
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../fonts/5e/Nodesto Caps Condensed.woff2');
- font-weight: normal;
- font-style: normal;
+ font-family : "NodestoCapsCondensed";
+ font-style : normal;
+ font-weight : normal;
+ src : url('../fonts/5e/Nodesto Caps Condensed.woff2');
}
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../fonts/5e/Nodesto Caps Condensed Bold.woff2');
- font-weight: bold;
- font-style: normal;
+ font-family : "NodestoCapsCondensed";
+ font-style : normal;
+ font-weight : bold;
+ src : url('../fonts/5e/Nodesto Caps Condensed Bold.woff2');
}
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../fonts/5e/Nodesto Caps Condensed Italic.woff2');
- font-weight: normal;
- font-style: italic;
+ font-family : "NodestoCapsCondensed";
+ font-style : italic;
+ font-weight : normal;
+ src : url('../fonts/5e/Nodesto Caps Condensed Italic.woff2');
}
@font-face {
- font-family: NodestoCapsCondensed;
- src: url('../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
- font-weight: bold;
- font-style: italic;
+ font-family : "NodestoCapsCondensed";
+ font-style : italic;
+ font-weight : bold;
+ src : url('../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
}
diff --git a/themes/fonts/iconFonts/diceFont.less b/themes/fonts/iconFonts/diceFont.less
index ec80f132b..3b60093d0 100644
--- a/themes/fonts/iconFonts/diceFont.less
+++ b/themes/fonts/iconFonts/diceFont.less
@@ -13,8 +13,8 @@
font-weight : normal;
font-variant : normal;
line-height : 1;
- text-decoration : inherit;
text-transform : none;
+ text-decoration : inherit;
text-rendering : optimizeLegibility;
/* Better Font Rendering =========== */
diff --git a/themes/fonts/iconFonts/fontAwesome.js b/themes/fonts/iconFonts/fontAwesome.js
index f5f89e3aa..bf11a7c92 100644
--- a/themes/fonts/iconFonts/fontAwesome.js
+++ b/themes/fonts/iconFonts/fontAwesome.js
@@ -1,3 +1,5 @@
+/* eslint-disable max-lines */
+
const fontAwesome = {
// FONT-AWESOME SOLID
'fas_0' : 'fas fa-0',
diff --git a/themes/phb.depricated.less b/themes/phb.depricated.less
index 992dab35b..7cc574183 100644
--- a/themes/phb.depricated.less
+++ b/themes/phb.depricated.less
@@ -1,31 +1,31 @@
-.phb{
+.phb {
//Double hr for full width elements
- hr+hr+blockquote{
- column-span : all;
+ hr + hr + blockquote {
-webkit-column-span : all;
-moz-column-span : all;
+ column-span : all;
}
//*****************************
// * CLASS TABLE
// *****************************/
- hr+table{
+ hr+table {
+ padding-top : 10px;
margin-top : -5px;
margin-bottom : 50px;
- padding-top : 10px;
border-collapse : separate;
background-color : white;
border : initial;
border-style : solid;
+ border-image-source : @frameBorderImage;
+ border-image-slice : 150 200 150 200;
+ border-image-width : 47px;
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;
+ h5 + hr + table {
-webkit-column-span : all;
-moz-column-span : all;
+ column-span : all;
}
}
\ No newline at end of file
![\"where](\"http://i.imgur.com/hMna6G0.png\")