diff --git a/src/style/atoms/_colours.scss b/src/style/atoms/_colours.scss index a352d9b1..25c572ee 100644 --- a/src/style/atoms/_colours.scss +++ b/src/style/atoms/_colours.scss @@ -34,6 +34,9 @@ $tab-background-color: #fff8; $dice-box-shadow: rgba(0, 0, 0, 0.25); $pill-box-shadow: rgba(0, 0, 0, 0.3); +$tab-shadow: rgba(0, 0, 0, 0.3); +$tab-pane-shadow: rgba(0, 0, 0, 0.3); + $attribute-die-border-color: #000; $attribute-die-color: #F00; diff --git a/src/style/atoms/_fonts.scss b/src/style/atoms/_fonts.scss new file mode 100644 index 00000000..832342a1 --- /dev/null +++ b/src/style/atoms/_fonts.scss @@ -0,0 +1,21 @@ +@font-face { + font-family: "Andalus"; + src: url("../../assets/fonts/andlso.ttf"); +} + +@font-face { + font-family: "Gentium"; + src: url("../../assets/fonts/GenBasR.ttf"); +} + +@font-face { + font-family: "Gentium"; + src: url("../../assets/fonts/GenBasI.ttf"); + font-style: italic; +} + +@font-face { + font-family: "Gentium"; + src: url("../../assets/fonts/GenBasB.ttf"); + font-weight: bold; +} \ No newline at end of file diff --git a/src/style/atoms/_numbers.scss b/src/style/atoms/_numbers.scss index e79d87d1..7b8faefa 100644 --- a/src/style/atoms/_numbers.scss +++ b/src/style/atoms/_numbers.scss @@ -16,6 +16,14 @@ $dice-box-inset: 4px; $dice-box-blur-radius: 4px; $dice-box-border-width: 1px; +$tab-shadow-right: 1px; +$tab-shadow-bottom: 0; +$tab-shadow-blur-radius: 0; + +$tab-pane-shadow-right: 1px; +$tab-pane-shadow-bottom: 1px; +$tab-pane-shadow-blur-radius: 0; + $pill-box-inset: 2px; $pill-box-blur-radius: 4px; diff --git a/src/style/atoms/_typography.scss b/src/style/atoms/_typography.scss new file mode 100644 index 00000000..550bf4cf --- /dev/null +++ b/src/style/atoms/_typography.scss @@ -0,0 +1,16 @@ +.application.sheet.dsa41 { + + --font-body: Gentium, sans-serif; + + label, + .sheet-tabs.tabs a { + font-family: Gentium, sans-serif; + font-weight: bold; + } + + .editor.prosemirror.active, .editor.prosemirror.inactive { + font-family: Gentium, sans-serif; + } + +} + diff --git a/src/style/molecules/_tabs.scss b/src/style/molecules/_tabs.scss index cfc7b9ec..9a42f929 100644 --- a/src/style/molecules/_tabs.scss +++ b/src/style/molecules/_tabs.scss @@ -74,11 +74,13 @@ border-top: numbers.$tab-border-width solid colours.$tab-border-color; border-right: numbers.$tab-border-width solid colours.$tab-border-color; border-bottom: 0; - top: numbers.$tab-border-width*2; + top: numbers.$tab-border-width; background: assets.$tab-background; position: relative; z-index: 2; + box-shadow: numbers.$tab-shadow-right numbers.$tab-shadow-bottom numbers.$tab-shadow-blur-radius colours.$tab-shadow; + span { } @@ -91,6 +93,8 @@ section.tab { border: numbers.$tab-border-width solid colours.$tab-border-color; background: assets.$tab-pane-background; + box-shadow: numbers.$tab-pane-shadow-right numbers.$tab-pane-shadow-bottom numbers.$tab-pane-shadow-blur-radius colours.$tab-pane-shadow; + flex: 1; & > div { diff --git a/src/style/styles.scss b/src/style/styles.scss index eb843ead..b34105ce 100644 --- a/src/style/styles.scss +++ b/src/style/styles.scss @@ -1,3 +1,5 @@ +@use "atoms/fonts"; +@use "atoms/typography"; @use "atoms/svg"; @use "molecules/rollable"; @use "molecules/lists"; diff --git a/src/templates/item/skill/tab-description.hbs b/src/templates/item/skill/tab-description.hbs index 960cc9a0..321866d1 100644 --- a/src/templates/item/skill/tab-description.hbs +++ b/src/templates/item/skill/tab-description.hbs @@ -4,8 +4,6 @@ data-group="{{tabs.description.group}}"> {{!-- Tab content here --}}
- -