From 8f7d6a3eb5ba32db5e37fd69bea9b54add4a80e2 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sat, 14 Aug 2021 23:21:13 -0400 Subject: [PATCH] Update color, snippet positioning, added into v3 Image and BackgroundImage --- .../editor/snippetbar/snippets/snippets.js | 18 ++++++++++++++---- .../snippetbar/snippetsLegacy/snippets.js | 2 +- themes/5ePhb.style.less | 16 +++++++++------- themes/5ePhbLegacy.style.less | 16 +++++++++------- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js index ba0f477b7..76e444bdd 100644 --- a/client/homebrew/editor/snippetbar/snippets/snippets.js +++ b/client/homebrew/editor/snippetbar/snippets/snippets.js @@ -51,13 +51,23 @@ module.exports = [ name : 'Image', icon : 'fas fa-image', gen : dedent` - ![cat warrior](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:325px} - Credit: Kyounghwan Kim` + ![cat warrior](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:325px,mix-blend-mode:multiply} + + {{artist,position:relative,top:-230px,left:-100px,margin-bottom:-30px + ##### Cat Warrior + [Kyoung Hwan Kim](https://www.artstation.com/tahra) + }}` }, { name : 'Background Image', icon : 'fas fa-tree', - gen : `![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,top:50px,right:30px,width:280px}` + gen : dedent` + ![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,top:50px,right:30px,width:280px} + + {{artist,top:90px,right:30px + ##### Homebrew Mug + [naturalcrit](https://homebrew.naturalcrit.com) + }}` }, { name : 'QR Code', @@ -203,7 +213,7 @@ module.exports = [ icon : 'fas fa-signature', gen : function(){ return dedent` - {{artist,top:10px,left:10px + {{artist,top:90px,right:30px ##### Starry Night [Van Gogh](https://www.vangoghmuseum.nl/en) }} diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js b/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js index 677b0e826..69f8e1597 100644 --- a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js +++ b/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js @@ -174,7 +174,7 @@ module.exports = [ { name : 'Artist Credit', icon : 'fas fa-signature', - gen : '
\n' + + gen : '
\n' + '##### Starry Night\n' + '[Van Gogh](https://www.vangoghmuseum.nl/en)\n' + '
\n' diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index 04b0e7418..613d66efa 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -2,12 +2,13 @@ @import (less) './themes/assets/assets.less'; //Colors -@background : #EEE5CE; -@noteGreen : #e0e5c1; -@headerUnderline : #c9ad6a; -@horizontalRule : #9c2b1b; -@headerText : #58180D; -@monsterStatBackground : #EEDBAB; +@background : #EEE5CE; // Light parchment +@noteGreen : #e0e5c1; // Pastel green +@headerUnderline : #c9ad6a; // Gold +@horizontalRule : #9c2b1b; // Maroon +@headerText : #58180D; // Dark maroon +@monsterStatBackground : #EEDBAB; // Light orange parchment +@captionText : #766649; // Brown @page { margin: 0; } body { counter-reset : phb-page-numbers; @@ -271,6 +272,7 @@ body { text-align : center; font-family : WalterTurncoat; font-size : 0.27cm; + color : @captionText; p, p + p { margin : unset; text-indent : unset; @@ -281,7 +283,7 @@ body { font-family : WalterTurncoat; } a{ - color : black; + color : @captionText; text-decoration : unset; &:hover { text-decoration :underline; diff --git a/themes/5ePhbLegacy.style.less b/themes/5ePhbLegacy.style.less index bb6c570d9..17e11260a 100644 --- a/themes/5ePhbLegacy.style.less +++ b/themes/5ePhbLegacy.style.less @@ -2,12 +2,13 @@ @import (less) './themes/assets/assets.less'; @import (less) './themes/phb.depricated.less'; //Colors -@background : #EEE5CE; -@noteGreen : #e0e5c1; -@headerUnderline : #c9ad6a; -@horizontalRule : #9c2b1b; -@headerText : #58180D; -@monsterStatBackground : #FDF1DC; +@background : #EEE5CE; // Light parchment +@noteGreen : #e0e5c1; // Pastel green +@headerUnderline : #c9ad6a; // Gold +@horizontalRule : #9c2b1b; // Maroon +@headerText : #58180D; // Dark maroon +@monsterStatBackground : #FDF1DC; // Lighter parchment +@captionText : #766649; // Brown @page { margin: 0; } body { counter-reset : phb-page-numbers; @@ -455,6 +456,7 @@ body { text-align : center; font-family : WalterTurncoat; font-size : 0.27cm; + color : @captionText; p, p + p { margin : unset; text-indent : unset; @@ -465,7 +467,7 @@ body { font-family : WalterTurncoat; } a{ - color : black; + color : @captionText; text-decoration : unset; &:hover { text-decoration : underline;