diff --git a/fonts/Fondamento.ttf b/fonts/Fondamento.ttf new file mode 100644 index 00000000..a2bc80c7 Binary files /dev/null and b/fonts/Fondamento.ttf differ diff --git a/fonts/GrenzeGotisch-Bold.ttf b/fonts/GrenzeGotisch-Bold.ttf deleted file mode 100644 index 4ca63131..00000000 Binary files a/fonts/GrenzeGotisch-Bold.ttf and /dev/null differ diff --git a/fonts/GrenzeGotisch-Light.ttf b/fonts/GrenzeGotisch-Light.ttf deleted file mode 100644 index f0597f81..00000000 Binary files a/fonts/GrenzeGotisch-Light.ttf and /dev/null differ diff --git a/fonts/PirataOne.ttf b/fonts/PirataOne.ttf new file mode 100644 index 00000000..8d6d136b Binary files /dev/null and b/fonts/PirataOne.ttf differ diff --git a/styles/img/bg_sid_dark.jpg b/styles/img/bg_sid_dark.jpg new file mode 100644 index 00000000..c58535a1 Binary files /dev/null and b/styles/img/bg_sid_dark.jpg differ diff --git a/styles/img/testGraph.jpg b/styles/img/testGraph.jpg new file mode 100644 index 00000000..1d444940 Binary files /dev/null and b/styles/img/testGraph.jpg differ diff --git a/styles/img/testsid.jpg b/styles/img/testsid.jpg new file mode 100644 index 00000000..c95b8051 Binary files /dev/null and b/styles/img/testsid.jpg differ diff --git a/styles/img/ui/bg_control.jpg b/styles/img/ui/bg_control.jpg new file mode 100644 index 00000000..021c7f3e Binary files /dev/null and b/styles/img/ui/bg_control.jpg differ diff --git a/styles/img/ui/footer-button.png b/styles/img/ui/footer-button.png new file mode 100644 index 00000000..225a6959 Binary files /dev/null and b/styles/img/ui/footer-button.png differ diff --git a/styles/img/ui/hotkeybox-macro-list.png b/styles/img/ui/hotkeybox-macro-list.png new file mode 100644 index 00000000..54d170e3 Binary files /dev/null and b/styles/img/ui/hotkeybox-macro-list.png differ diff --git a/styles/img/ui/icon_sidebar_actor.svg b/styles/img/ui/icon_sidebar_actor.svg index bd82c75d..86087bae 100644 --- a/styles/img/ui/icon_sidebar_actor.svg +++ b/styles/img/ui/icon_sidebar_actor.svg @@ -5,7 +5,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/icon_sidebar_chat.svg b/styles/img/ui/icon_sidebar_chat.svg index 87f53423..d3fc0290 100644 --- a/styles/img/ui/icon_sidebar_chat.svg +++ b/styles/img/ui/icon_sidebar_chat.svg @@ -3,7 +3,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/icon_sidebar_compendium.svg b/styles/img/ui/icon_sidebar_compendium.svg index 715ced0d..336ebc7d 100644 --- a/styles/img/ui/icon_sidebar_compendium.svg +++ b/styles/img/ui/icon_sidebar_compendium.svg @@ -5,7 +5,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/icon_sidebar_fight.svg b/styles/img/ui/icon_sidebar_fight.svg index 695d427e..654f311d 100644 --- a/styles/img/ui/icon_sidebar_fight.svg +++ b/styles/img/ui/icon_sidebar_fight.svg @@ -5,7 +5,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/icon_sidebar_item.svg b/styles/img/ui/icon_sidebar_item.svg index 19b28fe3..5d598921 100644 --- a/styles/img/ui/icon_sidebar_item.svg +++ b/styles/img/ui/icon_sidebar_item.svg @@ -5,7 +5,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/icon_sidebar_journal.svg b/styles/img/ui/icon_sidebar_journal.svg index ceb251c8..9d70b68f 100644 --- a/styles/img/ui/icon_sidebar_journal.svg +++ b/styles/img/ui/icon_sidebar_journal.svg @@ -5,7 +5,7 @@ diff --git a/styles/img/ui/icon_sidebar_music.svg b/styles/img/ui/icon_sidebar_music.svg index ff565251..766044e2 100644 --- a/styles/img/ui/icon_sidebar_music.svg +++ b/styles/img/ui/icon_sidebar_music.svg @@ -5,7 +5,7 @@ diff --git a/styles/img/ui/icon_sidebar_rolltable.svg b/styles/img/ui/icon_sidebar_rolltable.svg index 41a4573c..547c4428 100644 --- a/styles/img/ui/icon_sidebar_rolltable.svg +++ b/styles/img/ui/icon_sidebar_rolltable.svg @@ -5,7 +5,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/icon_sidebar_scene.svg b/styles/img/ui/icon_sidebar_scene.svg index e24d49a8..6d171138 100644 --- a/styles/img/ui/icon_sidebar_scene.svg +++ b/styles/img/ui/icon_sidebar_scene.svg @@ -5,7 +5,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/icon_sidebar_settings.svg b/styles/img/ui/icon_sidebar_settings.svg index f332dedd..bfe100b8 100644 --- a/styles/img/ui/icon_sidebar_settings.svg +++ b/styles/img/ui/icon_sidebar_settings.svg @@ -5,7 +5,7 @@ @@ -375,38 +375,6 @@ c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06 C143.95,318.19,193.87,367.82,256.32,367.82z"/> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/styles/img/ui/players-border.png b/styles/img/ui/players-border.png new file mode 100644 index 00000000..ce67068e Binary files /dev/null and b/styles/img/ui/players-border.png differ diff --git a/styles/img/ui/sidebar_button-background_cyan.png b/styles/img/ui/sidebar_button-background_cyan.png new file mode 100644 index 00000000..f2e46eba Binary files /dev/null and b/styles/img/ui/sidebar_button-background_cyan.png differ diff --git a/styles/img/ui/sidebar_button-background_red.png b/styles/img/ui/sidebar_button-background_red.png new file mode 100644 index 00000000..986d95c4 Binary files /dev/null and b/styles/img/ui/sidebar_button-background_red.png differ diff --git a/styles/simple.css b/styles/simple.css index b55b3974..4f6fc739 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -8,43 +8,39 @@ src: url('../fonts/MedievalSharp.ttf') format("truetype"); } @font-face { - font-family: "GrenzeGotisch-Light"; - src: url('../fonts/GrenzeGotisch-Light.ttf') format("truetype"); - } - @font-face { - font-family: "GrenzeGotisch-Regular"; + font-family: "GrenzeGotisch"; src: url('../fonts/GrenzeGotisch-Regular.ttf') format("truetype"); } @font-face { - font-family: "GrenzeGotisch-Bold"; - src: url('../fonts/GrenzeGotisch-Bold.ttf') format("truetype"); + font-family: "Fondamento"; + src: url('../fonts/Fondamento.ttf') format("truetype"); } :root { /* =================== 1. ACTOR SHEET FONT STYLES =========== */ - --window-header-title-font-family: GrenzeGotisch-Bold; + --window-header-title-font-family: Gothic; --window-header-title-font-size: 1.5rem; --window-header-title-font-weight: normal; --window-header-title-color: #f5f5f5; - --major-button-font-family: GrenzeGotisch-Regular; - --major-button-font-size: 20px; + --major-button-font-family: Gothic; + --major-button-font-size: 1.25rem; --major-button-font-weight: normal; --major-button-color: #dadada; - --tab-header-font-family: GrenzeGotisch-Bold; - --tab-header-font-size: 14px; + --tab-header-font-family: Gothic; + --tab-header-font-size: 1rem; --tab-header-font-weight: 700; --tab-header-color: #403f3e; --tab-header-color-active: #4a0404; - --actor-input-font-family: GrenzeGotisch-Regular; - --actor-input-font-size: 10px; + --actor-input-font-family: Gothic; + --actor-input-font-size: 1rem; --actor-input-font-weight: 500; --actor-input-color: black; - --actor-label-font-family: GrenzeGotisch-Bold; - --actor-label-font-size: 10px; + --actor-label-font-family: Gothic; + --actor-label-font-size: 1rem; --actor-label-font-weight: 700; --actor-label-color: #464331c4; @@ -59,19 +55,23 @@ } /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/ -/* Global styles */ +/* Global styles & Font */ .window-app { - font-family: "GoudyAcc", sans-serif; + font-family: Gothic; text-align: justify; font-size: 14px; letter-spacing: 1px; } -.sheet header.sheet-header h1 input{font-family: "GoudyAcc", sans-serif;} -.window-app input {font-family: "GrenzeGotisch-Regular", sans-serif;} +/* Fonts */ +.sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list {font-family: "GoudyAcc"} +.sheet nav.sheet-tabs {font-family: "MedievalSharp";} +.window-app input, .foundryvtt-reve-de-dragon .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #scene-list .scene.nav-item, #navigation #nav-toggle { + font-family: "Gothic"; +} .window-header{ - background: rgba(0,0,0,0.75) url("bg_title.jpg") no-repeat left top; + background: rgba(0,0,0,0.75); } .window-app.sheet .window-content { @@ -89,6 +89,8 @@ cursor: pointer; } +table {border: 1px solid #7a7971;} + .grid, .grid-2col { display: grid; @@ -192,9 +194,6 @@ justify-content: space-between; } /* Styles limited to foundryvtt-reve-de-dragon sheets */ -.foundryvtt-reve-de-dragon .item-form { - font-family: "GrenzeGotisch-Regular"; -} .foundryvtt-reve-de-dragon .sheet-header { -webkit-box-flex: 0; @@ -354,11 +353,6 @@ /* ======================================== */ /* Sheet */ - -.sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-actions-bar {font-family: "GrenzeGotisch-Regular";} -.sheet header.sheet-header .flex-compteurs {text-align: right;} -.sheet header.sheet-header .resource-content {width: 3rem;} - .window-app.sheet .window-content .sheet-header{ background: #011d33 url("img/bg_header.jpg") no-repeat left top; color: rgba(255, 255, 255, 1); @@ -366,16 +360,18 @@ .window-app.sheet .window-content .sheet-header input[type="text"], .window-app.sheet .window-content .sheet-header input[type="number"], .window-app.sheet .window-content .sheet-header input[type="password"], .window-app.sheet .window-content .sheet-header input[type="date"], .window-app.sheet .window-content .sheet-header input[type="time"] { color: rgba(255, 255, 255, 0.75); + background: rgba(255, 255, 255, 0.05); + border: 0 none; + margin-bottom: 0.25rem; } .window-app .window-content, .window-app.sheet .window-content .sheet-body{ - background: #f5f4f1 url("img/bg_left.jpg") no-repeat left top; + background: rgb(245,245,240) url("img/bg_left.jpg") no-repeat left top; } section.sheet-body{padding: 0.25rem 0.5rem;} .sheet nav.sheet-tabs { - font-family: "MedievalSharp"; font-size: 0.75rem; font-weight: bold; height: 5rem; @@ -388,7 +384,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;} border-top: 0 none; border-bottom: 0 none; color: rgba(52, 52, 52, 0.95); - background: #f5f4f1 url("img/bg_menu.jpg") no-repeat left top; + background: rgb(245,245,240) url("img/bg_menu.jpg") no-repeat left top; } nav.sheet-tabs .item { @@ -416,22 +412,48 @@ section.sheet-body:after, section.sheet-body div:after { clear: both; } +.sheet header.sheet-header .flex-compteurs {text-align: right;} +.sheet header.sheet-header .resource-content {width: 2rem;} + +.ctn-vie span, .ctn-endu span, .ctn-fatigue span, .ctn-reve span { + display: inline-block; + text-align: left; + width: 2rem; +} + +#vie-plus, #vie-moins, #endurance-plus, #endurance-moins, #fatigue-plus, #fatigue-moins, #ptreve-actuel-plus, #ptreve-actuel-moins { + display: inline-block; + width: 1.25rem; + background: rgba(30, 25, 20, 1); + text-align: center; + border: 1px solid rgba(72, 46, 28, 1); + border-radius: 0.25rem; + line-height: 1.25rem; + color: rgba(255, 255, 255, 0.5); +} + +.window-app.sheet .window-content .tooltip:hover .tooltiptext { + top: 2rem; + left: 2rem; + margin: 0; + padding: 0.25rem; +} + +.window-app.sheet .window-content .carac-value, .window-app.sheet .window-content .competence-xp { + margin: 0.05rem; + flex-basis: 3rem; + text-align: center; +} + /* ======================================== */ /* Global UI elements */ -select { - font-family: "GrenzeGotisch-Regular", sans-serif; -} -button { - font-family: "GrenzeGotisch-Regular", sans-serif; -} - /* ======================================== */ .sheet-competence-img { width: 24px; height: 24px; flex-grow: 0; - margin-right: 4px; + margin-right: 0.25rem; } .competence-column { flex-direction: column; @@ -460,21 +482,21 @@ button { .sante-value, .competence-value { flex-grow: 0; - flex-basis: 64px; - margin-right: 4px; - margin-left: 4px; + flex-basis: 2rem; + margin-right: 0.25rem; + margin-left: 0.25rem; } .description-value { flex-grow: 0; - flex-basis: 128px; - margin-right: 4px; - margin-left: 4px; + flex-basis: 4rem; + margin-right: 0.25rem; + margin-left: 0.25rem; } .competence-xp { flex-grow: 0; - flex-basis: 64px; - margin-right: 4px; - margin-left: 4px; + flex-basis: 2rem; + margin-right: 0.25rem; + margin-left: 0.25rem; } .blessures-title { font-weight: bold; @@ -515,7 +537,6 @@ button { height: 25px; border: 1px solid #736953a6; border-left: none; - font-family: CaslonPro; font-weight: 500; font-size: 1rem; color: black; @@ -531,13 +552,14 @@ button { /* Fatigue CSS */ .table-fatigue { table-layout: fixed; - padding: 0 0; + padding: 0; + margin: 0; } .table-fatigue td { table-layout: fixed; width: 2px; height: 2px; - padding: 0 0; + padding: 0; } .table-fatigue .fatigue-used { background-color: DarkRed; @@ -560,15 +582,14 @@ button { /* ======================================== */ /* Sidebar CSS */ #sidebar { - font-family: "GrenzeGotisch-Regular", sans-serif; font-size: 1rem; - background: #f5f4f1 url("img/bg_sid.jpg") no-repeat right bottom; + background: rgb(245,245,240) url("img/bg_sid_dark.jpg") no-repeat right bottom; background-position: 100%; - color: rgba(0,0,0,0.75); + color: rgba(220,220,220,0.75); } #sidebar-tabs > .collapse, #chat-controls .chat-control-icon { - color: #ff6600; + color: rgba(220,220,220,0.75); text-shadow: 1px 1px 0 rgba(0,0,0,0.75); } @@ -584,21 +605,27 @@ button { } .chat-message { + background: rgba(220,220,210,0.5); font-size: 1rem; } +.chat-message.whisper { + background: rgba(220,220,210,0.75); + border: 2px solid #545469; +} + #sidebar-tabs { - flex: 0 0 32px; - box-sizing: border-box; - margin: 0 0 5px; - border-bottom: 1px solid #ff6600; - box-shadow: inset 0 0 2rem rgba(0,0,0,0.25); + flex: 0 0 32px; + box-sizing: border-box; + margin: 0 0 5px; + border-bottom: 1px solid rgba(0,0,0,0); + box-shadow: inset 0 0 2rem rgba(0,0,0,0.5); } #sidebar-tabs > .item.active { - border: 0 none; - background: rgba(255,255,255,0.5); - box-shadow: none; + border: 1px solid rgba(114,98,72,1); + background: rgba(30, 25, 20, 0.75); + box-shadow: 0 0 6px inset rgba(114,98,72,1); } #sidebar #sidebar-tabs i{ @@ -623,6 +650,87 @@ button { #sidebar #sidebar-tabs i.fa-atlas {background: url("img/ui/icon_sidebar_compendium.svg") no-repeat;} #sidebar #sidebar-tabs i.fa-cogs {background: url("img/ui/icon_sidebar_settings.svg") no-repeat;} +#combat #combat-controls { + box-shadow: inset 0 0 2rem rgba(0,0,0,0.5); +} + +/*--------------------------------------------------------------------------*/ +/* Control, Tool, hotbar & navigation */ + +#controls .scene-control, #controls .control-tool { + box-shadow: 0 0 3px #000; + margin: 0 0 8px; + border-radius: 0; + background: rgba(30, 25, 20, 1); + background-origin: padding-box; + border-image: url(img/ui/footer-button.png) 10 repeat; + border-image-width: 4px; + border-image-outset: 0px; +} + +#controls .scene-control.active, #controls .control-tool.active, #controls .scene-control:hover, #controls .control-tool:hover { + background: rgba(72, 46, 28, 1); + background-origin: padding-box; + border-image: url(img/ui/footer-button.png) 10 repeat; + border-image-width: 4px; + border-image-outset: 0px; + box-shadow: 0 0 3px #ff6400; +} + +#hotbar #action-bar #macro-list { + border: 1px solid rgba(72, 46, 28, 1); + box-shadow: 2px 2px 5px #000000; +} + +#hotbar #action-bar .macro { + border-image: url(img/ui/bg_control.jpg) 21 repeat; + border-image-slice: 6 6 6 6 fill; + border-image-width: 6px 6px 6px 6px; + border-image-outset: 0px 0px 0px 0px; + border-radius: 0px; +} + +#hotbar .bar-controls { + background: rgba(30, 25, 20, 1); + border: 1px solid rgba(72, 46, 28, 1); +} + +#players { + border-image: url(img/ui/footer-button.png) 10 repeat; + border-image-width: 4px; + border-image-outset: 0px; + background: rgba(30, 25, 20, 1); +} + +#navigation #scene-list .scene.nav-item.active { + background: rgba(72, 46, 28, 1); +} + +#navigation #scene-list .scene.nav-item { + background: rgba(30, 25, 20, 1); + background-origin: padding-box; + border-image: url(img/ui/footer-button.png) 10 repeat; + border-image-width: 4px; + border-image-outset: 0px; +} + +#navigation #scene-list .scene.view, #navigation #scene-list .scene.context { + background: rgba(72, 46, 28, 1); + background-origin: padding-box; + border-image: url(img/ui/footer-button.png) 10 repeat; + border-image-width: 4px; + border-image-outset: 0px; + box-shadow: 0 0 3px #ff6400; +} + +#navigation #nav-toggle { + background: rgba(30, 25, 20, 1); + background-origin: padding-box; + border-image: url(img/ui/footer-button.png) 10 repeat; + border-image-width: 4px; + border-image-outset: 0px; +} + /*--------------------------------------------------------------------------*/ /* CALENDAR STUFF */ #calendar-time-container{ @@ -632,16 +740,16 @@ button { display: block; } #calendar{ -min-width: 150px; -grid-row: 1; -grid-column: 1; -width: fit-content; -height: 75px; -margin: 0; -padding: 0; -border: 1px solid #000; -border-radius: 3%; -background: rgba(0, 0, 0, 0.5); + min-width: 150px; + grid-row: 1; + grid-column: 1; + width: fit-content; + height: 75px; + margin: 0; + padding: 0; + border: 1px solid #000; + border-radius: 3%; + background: rgba(0, 0, 0, 0.5); } #calendar-hdr{ display: grid; @@ -880,7 +988,7 @@ background: rgba(0, 0, 0, 0.5); .tooltip .tooltiptext { visibility: hidden; width: 360px; - background-color: rgba(0,0,0,0.9); + background-color: rgba(30, 25, 20, 0.9); text-align: center; padding: 5px 0; border-radius: 6px; @@ -894,6 +1002,12 @@ background: rgba(0, 0, 0, 0.5); /* Fade in tooltip */ opacity: 0; transition: opacity 0.3s; + + border-image: url(img/ui/bg_control.jpg) 21 repeat; + border-image-slice: 6 6 6 6 fill; + border-image-width: 6px 6px 6px 6px; + border-image-outset: 0px 0px 0px 0px; + border-radius: 0px; } /* Show the tooltip text when you mouse over the tooltip container */ diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index c63ca260..14c0c3e0 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -8,33 +8,41 @@

-
-
- Vie + / - - /{{data.sante.vie.max}} -
-
- Endurance + / - - /{{data.sante.endurance.max}} -
-
- Fatigue + / - +
    +
  • + +
    • +
  • + +
    • +
  • +
-
- Sonné : - -
-
- Rêve + / - - /{{data.reve.seuil.value}} -
-
+ + /{{data.sante.fatigue.max}} + - + +
  • + +
    • +
  • + +
    • +
  • {{data.lockUnlockText}} -
    • -
    + +
    Encaisser des dommages