diff --git a/system/assets/icons/.gitkeep b/system/assets/icons/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/system/assets/icons/Imperial.webp b/system/assets/icons/Imperial.webp new file mode 100644 index 0000000..00252ea Binary files /dev/null and b/system/assets/icons/Imperial.webp differ diff --git a/system/assets/icons/Invocations.webp b/system/assets/icons/Invocations.webp new file mode 100644 index 0000000..637c9c9 Binary files /dev/null and b/system/assets/icons/Invocations.webp differ diff --git a/system/assets/icons/Katas.webp b/system/assets/icons/Katas.webp new file mode 100644 index 0000000..bcdd1a9 Binary files /dev/null and b/system/assets/icons/Katas.webp differ diff --git a/system/assets/icons/Kihos.webp b/system/assets/icons/Kihos.webp new file mode 100644 index 0000000..7d22835 Binary files /dev/null and b/system/assets/icons/Kihos.webp differ diff --git a/system/assets/icons/Magic.webp b/system/assets/icons/Magic.webp new file mode 100644 index 0000000..476a578 Binary files /dev/null and b/system/assets/icons/Magic.webp differ diff --git a/system/assets/icons/Maho.webp b/system/assets/icons/Maho.webp new file mode 100644 index 0000000..0b44034 Binary files /dev/null and b/system/assets/icons/Maho.webp differ diff --git a/system/assets/icons/Ninjutsu.webp b/system/assets/icons/Ninjutsu.webp new file mode 100644 index 0000000..742abe4 Binary files /dev/null and b/system/assets/icons/Ninjutsu.webp differ diff --git a/system/assets/icons/Rituals.webp b/system/assets/icons/Rituals.webp new file mode 100644 index 0000000..87c6834 Binary files /dev/null and b/system/assets/icons/Rituals.webp differ diff --git a/system/assets/icons/Shujis.webp b/system/assets/icons/Shujis.webp new file mode 100644 index 0000000..cf077a4 Binary files /dev/null and b/system/assets/icons/Shujis.webp differ diff --git a/system/assets/icons/damage.webp b/system/assets/icons/damage.webp new file mode 100644 index 0000000..1f751a5 Binary files /dev/null and b/system/assets/icons/damage.webp differ diff --git a/system/assets/icons/range.webp b/system/assets/icons/range.webp new file mode 100644 index 0000000..bb6a06a Binary files /dev/null and b/system/assets/icons/range.webp differ diff --git a/system/assets/imgs/bgL5R.jpg b/system/assets/imgs/bgL5R.jpg new file mode 100644 index 0000000..b0a0579 Binary files /dev/null and b/system/assets/imgs/bgL5R.jpg differ diff --git a/system/fonts/.gitkeep b/system/fonts/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/system/fonts/LogotypeL5r.ttf b/system/fonts/LogotypeL5r.ttf new file mode 100644 index 0000000..2e2f689 Binary files /dev/null and b/system/fonts/LogotypeL5r.ttf differ diff --git a/system/scripts/items/feat-sheet.js b/system/scripts/items/feat-sheet.js index cab760b..b4be03c 100644 --- a/system/scripts/items/feat-sheet.js +++ b/system/scripts/items/feat-sheet.js @@ -1,15 +1,15 @@ -import { L5RItemSheet } from "./item-sheet.js"; +import { ItemSheetL5r5e } from "./item-sheet.js"; /** * @extends {ItemSheet} */ -export class L5RFeatSheet extends L5RItemSheet { +export class FeatSheetL5r5e extends ItemSheetL5r5e { /** @override */ static get defaultOptions() { return mergeObject(super.defaultOptions, { classes: ["l5r", "sheet", "feat"], - template: "systems/l5r/templates/item/feat-sheet.html", + template: "systems/l5r5e/templates/item/feat-sheet.html", width: 520, height: 480, tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] diff --git a/system/scripts/items/item-sheet.js b/system/scripts/items/item-sheet.js index 0501b31..09c9edc 100644 --- a/system/scripts/items/item-sheet.js +++ b/system/scripts/items/item-sheet.js @@ -2,13 +2,13 @@ * Extend the basic ItemSheet with some very simple modifications * @extends {ItemSheet} */ -export class L5RItemSheet extends ItemSheet { +export class ItemSheetL5r5e extends ItemSheet { /** @override */ static get defaultOptions() { return mergeObject(super.defaultOptions, { classes: ["l5r", "sheet", "item"], - template: "systems/l5r/templates/item/item-sheet.html", + template: "systems/l5r5e/templates/item/item-sheet.html", width: 520, height: 480, tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] diff --git a/system/scripts/items/item.js b/system/scripts/items/item.js index 3fae8e4..ab6db57 100644 --- a/system/scripts/items/item.js +++ b/system/scripts/items/item.js @@ -1,4 +1,4 @@ -export class L5RItem extends Item { +export class ItemL5r5e extends Item { } \ No newline at end of file diff --git a/system/scripts/items/weapon-sheet.js b/system/scripts/items/weapon-sheet.js index c2f738e..be8337d 100644 --- a/system/scripts/items/weapon-sheet.js +++ b/system/scripts/items/weapon-sheet.js @@ -1,15 +1,15 @@ -import { L5RItemSheet } from "./item-sheet.js"; +import { ItemSheetL5r5e } from "./item-sheet.js"; /** * @extends {ItemSheet} */ -export class L5RWeaponSheet extends L5RItemSheet { +export class WeaponSheetL5r5e extends ItemSheetL5r5e { /** @override */ static get defaultOptions() { return mergeObject(super.defaultOptions, { classes: ["l5r", "sheet", "weapon"], - template: "systems/l5r/templates/item/weapon-sheet.html", + template: "systems/l5r5e/templates/item/weapon-sheet.html", width: 520, height: 480, tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] diff --git a/system/scripts/main-l5r5e.js b/system/scripts/main-l5r5e.js index 7419aaa..30a000d 100644 --- a/system/scripts/main-l5r5e.js +++ b/system/scripts/main-l5r5e.js @@ -3,6 +3,10 @@ import { RegisterSettings } from './settings.js'; import { PreloadTemplates } from './preloadTemplates.js'; import { ActorL5r5e } from "./actor-l5r5e.js"; import { ActorSheetL5r5e } from './sheets/actor-sheet.js'; +import { ItemL5r5e } from './items/item.js'; +import { ItemSheetL5r5e } from './items/item-sheet.js'; +import { WeaponSheetL5r5e } from './items/weapon-sheet.js'; +import { FeatSheetL5r5e } from './items/feat-sheet.js'; // Import Dice Types @@ -15,6 +19,7 @@ Hooks.once('init', async function() { // Assign custom classes and constants here CONFIG.Actor.entityClass = ActorL5r5e; CONFIG.Actor.sheetClasses = ActorSheetL5r5e; + CONFIG.Item.entityClass = ItemL5r5e; // Register custom system settings RegisterSettings(); @@ -27,6 +32,12 @@ Hooks.once('init', async function() { Actors.unregisterSheet("core", ActorSheet); Actors.registerSheet("l5r5e", ActorSheetL5r5e, { types: ["character"], makeDefault: true }); + // Items sheet + Items.unregisterSheet("core", ItemSheet); + Items.registerSheet("l5r5e", ItemSheetL5r5e, { types: ["item"], makeDefault: true }); + Items.registerSheet("l5r5e", WeaponSheetL5r5e, { types: ["weapon"], makeDefault: true }); + Items.registerSheet("l5r5e", FeatSheetL5r5e, { types: ["feat"], makeDefault: true }); + Handlebars.registerHelper('localizeSkillCategory', function(skillName) { const key = 'L5r5e.Skills.' + skillName + '.Title'; return game.i18n.localize(key); diff --git a/system/scripts/preloadTemplates.js b/system/scripts/preloadTemplates.js index 98418c0..4161cdd 100644 --- a/system/scripts/preloadTemplates.js +++ b/system/scripts/preloadTemplates.js @@ -2,10 +2,12 @@ export const PreloadTemplates = async function() { const templatePaths = [ // Add paths to "systems/l5r5e/templates" 'systems/l5r5e/templates/sheets/actor/rings.html', + 'systems/l5r5e/templates/sheets/actor/narrative.html', 'systems/l5r5e/templates/sheets/actor/identity.html', 'systems/l5r5e/templates/sheets/actor/category.html', 'systems/l5r5e/templates/sheets/actor/skill.html', 'systems/l5r5e/templates/sheets/actor/social.html', + 'systems/l5r5e/templates/sheets/actor/attributes.html', 'systems/l5r5e/templates/sheets/actor/conflict.html', 'systems/l5r5e/templates/sheets/actor/stance.html', 'systems/l5r5e/templates/sheets/actor/feats.html', diff --git a/system/styles/conf/l5r5e.scss b/system/styles/conf/l5r5e.scss index f292dcb..41f6f81 100644 --- a/system/styles/conf/l5r5e.scss +++ b/system/styles/conf/l5r5e.scss @@ -1,11 +1,12 @@ /* Global */ -@import "../scss/fonts"; @import "../scss/colors"; +@import "../scss/global"; +@import "../scss/fonts"; @import "../scss/ui"; @import "../scss/dices"; .l5r5e { - @import "../scss/sheet"; + @import "../scss/sheets"; @import "../scss/nav"; @import "../scss/rings"; @import "../scss/skills"; diff --git a/system/styles/l5r5e.css b/system/styles/l5r5e.css index f22c35f..96d4215 100644 --- a/system/styles/l5r5e.css +++ b/system/styles/l5r5e.css @@ -1 +1 @@ -.testing{width:14.28571%}.testing{width:28.57143%}.testing{width:14.28571%}.testing{width:28.57143%}.testing{width:14.28571%}.testing{width:28.57143%}.testing{width:14.28571%}.testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%} +.window-app .window-content{background:url("../assets/imgs/bgL5R.jpg") no-repeat;background-size:cover}*{transition-property:background, color, border-color, text-shadow, box-shadow;transition-duration:0.5s;transition-timing-function:ease}input[type="text"]:focus,input[type="number"]:focus,input[type="password"]:focus,input[type="date"]:focus,input[type="time"]:focus{box-shadow:0 0 6px rgba(255,0,0,0.75)}.tabs .item.active{text-shadow:0 0 10px rgba(255,0,0,0.75)}ul,li{list-style-type:none;margin:0;padding:0}@font-face{font-family:"LogotypeL5r";src:url("../fonts/LogotypeL5r.ttf") format("truetype")}@font-face{font-family:"BrushtipTexe";src:url("../fonts/BrushtipTexe.otf") format("opentype")}h1{font:1.5rem "BrushtipTexe"}i.strife,i.success,i.explosive,i.opportunity,i.d6,i.d12,i.i_earth,i.i_water,i.i_fire,i.i_air,i.i_void{font-family:LogotypeL5r;line-height:1rem;font-style:normal;font-weight:normal;vertical-align:middle}i.strife:before{content:"f"}i.success:before{content:"s"}i.explosive:before{content:"e"}i.opportunity:before{content:"o"}i.d6:before{content:"r"}i.d12:before{content:"k"}i.i_earth:before{content:"g"}i.i_water:before{content:"w"}i.i_fire:before{content:"i"}i.i_air:before{content:"a"}i.i_void:before{content:"v"}#sidebar #sidebar-tabs{flex:0 0 1rem;box-sizing:border-box;margin:0 0 0.25rem;border-bottom:1px solid rgba(255,255,255,0.5);box-shadow:none}#sidebar #sidebar-tabs>.item{line-height:27px;border-radius:100%;margin:0;flex:0 0 27px;height:27px}#sidebar #sidebar-tabs>.item .active{border:1px solid rgba(255,100,0,0.75);box-shadow:0 0 6px rgba(255,100,0,0.75)}.testing{width:14.28571%}.testing{width:28.57143%}.l5r5e.sheet{min-width:600px}.l5r5e.sheet .sheet-header h1{flex:0 0 100%}.l5r5e.sheet .sheet-header h1 input{height:3rem;line-height:1.5rem;margin:0;padding:0 0 0.5rem;width:100%;border:1px solid rgba(255,255,255,0.5);color:#963c41}.l5r5e.sheet .sheet-header img{flex:0 0 150px;height:150px;margin-right:0.25rem}.l5r5e.sheet .sheet-header .header-fields{display:flex;flex-wrap:wrap}.l5r5e.sheet .sheet-header .identity-wrapper{flex:0 0 calc(100% - 150px - 0.25rem)}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content{flex:0 0 100%;display:flex;flex-wrap:wrap}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li{flex:33%}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li:nth-child(1),.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li:nth-child(2){flex:50%;margin:0 0 0.5rem}.l5r5e.sheet .sheet-header .rings{flex:0 0 calc(50% - 0.25rem);display:flex;padding:0.25rem}.l5r5e.sheet .sheet-header .social-content{flex:0 0 100%;display:flex;padding:0.25rem}.l5r5e.sheet .sheet-header .attributes-wrapper{flex:0 0 calc(50% - 0.25rem);display:flex;padding:0.25rem}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .rings{display:flex;flex-wrap:wrap;color:rgba(255,255,255,0.75)}.l5r5e .rings #earth,.l5r5e .rings #air,.l5r5e .rings #water,.l5r5e .rings #fire,.l5r5e .rings #void{position:relative;flex:1 1 50%;text-align:center}.l5r5e .rings #earth i.i_earth,.l5r5e .rings #earth i.i_water,.l5r5e .rings #earth i.i_fire,.l5r5e .rings #earth i.i_air,.l5r5e .rings #earth i.i_void,.l5r5e .rings #air i.i_earth,.l5r5e .rings #air i.i_water,.l5r5e .rings #air i.i_fire,.l5r5e .rings #air i.i_air,.l5r5e .rings #air i.i_void,.l5r5e .rings #water i.i_earth,.l5r5e .rings #water i.i_water,.l5r5e .rings #water i.i_fire,.l5r5e .rings #water i.i_air,.l5r5e .rings #water i.i_void,.l5r5e .rings #fire i.i_earth,.l5r5e .rings #fire i.i_water,.l5r5e .rings #fire i.i_fire,.l5r5e .rings #fire i.i_air,.l5r5e .rings #fire i.i_void,.l5r5e .rings #void i.i_earth,.l5r5e .rings #void i.i_water,.l5r5e .rings #void i.i_fire,.l5r5e .rings #void i.i_air,.l5r5e .rings #void i.i_void{font-size:5rem;line-height:4.75rem}.l5r5e .rings #earth label,.l5r5e .rings #air label,.l5r5e .rings #water label,.l5r5e .rings #fire label,.l5r5e .rings #void label{position:relative;width:5rem;line-height:0;float:right}.l5r5e .rings #earth input,.l5r5e .rings #air input,.l5r5e .rings #water input,.l5r5e .rings #fire input,.l5r5e .rings #void input{position:absolute;height:2rem;width:2rem;border-radius:100%;top:0;left:0;border:2px solid #babbb1;color:rgba(255,255,255,0.75)}.l5r5e .rings #earth input:hover,.l5r5e .rings #air input:hover,.l5r5e .rings #water input:hover,.l5r5e .rings #fire input:hover,.l5r5e .rings #void input:hover{border:2px solid rgba(255,0,0,0.75);text-shadow:0 0 6px rgba(255,0,0,0.75);box-shadow:0 0 6px inset rgba(255,0,0,0.75)}.l5r5e .rings #earth{float:right;color:#6e8d6b}.l5r5e .rings #earth input{top:auto;right:0;bottom:-1rem;left:auto;background:#6e8d6b}.l5r5e .rings #earth label strong{position:absolute;bottom:0.75rem;left:-1.5rem}.l5r5e .rings #air{color:#8e768c}.l5r5e .rings #air input{top:auto;right:auto;bottom:-1rem;left:0;background:#8e768c}.l5r5e .rings #air label{float:left}.l5r5e .rings #air label strong{position:absolute;bottom:0.75rem;right:-1rem}.l5r5e .rings #water{float:right;color:#6e8b91;padding-right:2rem}.l5r5e .rings #water input{top:17%;right:-1.25rem;bottom:auto;left:auto;background:#6e8b91}.l5r5e .rings #water label strong{position:absolute;bottom:-0.75rem;right:2rem}.l5r5e .rings #fire{color:#926f47;padding-left:2rem}.l5r5e .rings #fire input{top:17%;right:auto;bottom:auto;left:-1.25rem;background:#926f47}.l5r5e .rings #fire label{float:left}.l5r5e .rings #fire label strong{position:absolute;bottom:-0.75rem;right:2rem}.l5r5e .rings #void{top:-2rem;margin:0 calc(50% - 2.5rem);color:#4d4844}.l5r5e .rings #void input{top:-1rem;right:auto;bottom:auto;left:30%;background:#4d4844}.l5r5e .rings #void label strong{position:absolute;bottom:-0.75rem;left:1.75rem}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%} diff --git a/system/styles/scss/colors.scss b/system/styles/scss/colors.scss index 105cebd..a5fbfbb 100644 --- a/system/styles/scss/colors.scss +++ b/system/styles/scss/colors.scss @@ -1,9 +1,62 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); -} -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file +/** Colors **/ + +// -- Global +$white: rgba(255, 255, 255, 0.75); +$black: rgba(0, 0, 0, 0.75); +$red: rgba(255, 0, 0, 0.75); +$orange: rgba(255, 100, 0, 0.75); +$blue: rgba(0, 0, 255, 0.75); +$green: rgba(0, 255, 0, 0.75); + +// color title +$l5r5e-title: rgb(186, 187, 177); +// color bold +$l5r5e-bold: rgb(118, 79, 64); +// color red +$l5r5e-red: rgb(150, 60, 65); +// color white 0.5 +$l5r5e-white: rgba(255, 255, 255, 0.5); +// color black 0.5 +$l5r5e-black: rgba(0, 0, 0, 0.5); + +// Earth +$l5r5e-earth: rgb(110, 141, 107); +// Air +$l5r5e-air: rgb(142, 118, 140); +// Water +$l5r5e-water: rgb(110, 139, 145); +// Fire +$l5r5e-fire: rgb(146, 111, 71); +// Void +$l5r5e-void: rgb(77, 72, 68); + +// -- Clans + +// Crab +$l5r5e-dragon: rgb(130, 130, 140); +// Crane +$l5r5e-dragon: rgb(120, 145, 145); +// Dragon +$l5r5e-dragon: rgb(85, 130, 110); +// Lion +$l5r5e-dragon: rgb(160, 140, 80); +// Mantis +$l5r5e-dragon: rgb(45, 85, 30); +// Phoenix +$l5r5e-dragon: rgb(145, 190, 175); +// Scorpion +$l5r5e-dragon: rgb(155, 70, 60); +// Unicorn +$l5r5e-dragon: rgb(120, 90, 135); +// Spider +$l5r5e-dragon: rgb(0, 0, 0); + +.Crab {} +.Crane {} +.Dragon {} +.Lion {} +.Mantis {} +.Phoenix {} +.Scorpion {} +.Unicorn {} +.Spider {} \ No newline at end of file diff --git a/system/styles/scss/fonts.scss b/system/styles/scss/fonts.scss index 105cebd..8ba2082 100644 --- a/system/styles/scss/fonts.scss +++ b/system/styles/scss/fonts.scss @@ -1,9 +1,42 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); +/** Fonts **/ + +// Font Logotype L5R +@font-face { + font-family: "LogotypeL5r"; + src: url('../fonts/LogotypeL5r.ttf') format("truetype"); } -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file + +// Font BrushtipTexe +@font-face { + font-family: "BrushtipTexe"; + src: url('../fonts/BrushtipTexe.otf') format("opentype"); +} + +$font-primary: "Roboto", sans-serif; +$font-secondary: "BrushtipTexe", sans-serif; +$font-dice: "LogotypeL5r", sans-serif; + +h1 { + font: 1.5rem "BrushtipTexe"; +} + +i.strife, i.success, i.explosive, i.opportunity, i.d6, i.d12, +i.i_earth, i.i_water, i.i_fire, i.i_air, i.i_void { + font-family: LogotypeL5r; + line-height: 1rem; + font-style: normal; + font-weight: normal; + vertical-align:middle; +} + +i.strife:before { content: "f"; } +i.success:before { content: "s"; } +i.explosive:before { content: "e"; } +i.opportunity:before { content: "o"; } +i.d6:before { content: "r"; } +i.d12:before { content: "k"; } +i.i_earth:before { content: "g"; } +i.i_water:before { content: "w"; } +i.i_fire:before { content: "i"; } +i.i_air:before { content: "a"; } +i.i_void:before { content: "v"; } \ No newline at end of file diff --git a/system/styles/scss/global.scss b/system/styles/scss/global.scss new file mode 100644 index 0000000..d7be235 --- /dev/null +++ b/system/styles/scss/global.scss @@ -0,0 +1,25 @@ +/** Global **/ + +/* Windows */ +.window-app { + .window-content { + background: url("../assets/imgs/bgL5R.jpg") no-repeat; + background-size: cover; + } +} + +/* Focus, Active */ +* { + transition-property: background, color, border-color, text-shadow, box-shadow; + transition-duration: 0.5s; + transition-timing-function: ease; +} +input[type="text"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="date"]:focus, input[type="time"]:focus {box-shadow: 0 0 6px $red;} +.tabs .item.active {text-shadow: 0 0 10px $red;} + +/* lists */ +ul, li { + list-style-type: none; + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/system/styles/scss/rings.scss b/system/styles/scss/rings.scss index 105cebd..34b0d2b 100644 --- a/system/styles/scss/rings.scss +++ b/system/styles/scss/rings.scss @@ -1,9 +1,143 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); -} -// test -.testing { - width: percentage(2/7); +/** Rings **/ + +.rings { + display: flex; + flex-wrap: wrap; + color: $white; + // All + #earth, #air, #water, #fire, #void { + position: relative; + flex: 1 1 50%; + text-align: center; + + i.i_earth, i.i_water, i.i_fire, i.i_air, i.i_void { + font-size: 5rem; + line-height: 4.75rem; + } + + label { + position: relative; + width: 5rem; + line-height: 0; + float: right; + } + + input { + position: absolute; + height: 2rem; + width: 2rem; + border-radius: 100%; + top: 0; + left: 0; + border: 2px solid $l5r5e-title; + color: $white; + &:hover { + border: 2px solid $red; + text-shadow: 0 0 6px $red; + box-shadow: 0 0 6px inset $red; + } + } + } + // Earth + #earth { + float: right; + color: $l5r5e-earth; + input { + top: auto; + right: 0; + bottom: -1rem; + left: auto; + background: $l5r5e-earth; + } + label { + strong { + position: absolute; + bottom: 0.75rem; + left: -1.5rem; + } + } + } + + // Air + #air { + color: $l5r5e-air; + input { + top: auto; + right: auto; + bottom: -1rem; + left: 0; + background: $l5r5e-air; + } + label { + float: left; + strong { + position: absolute; + bottom: 0.75rem; + right: -1rem; + } + } + } + + // Water + #water { + float: right; + color: $l5r5e-water; + padding-right: 2rem; + input { + top: 17%; + right: -1.25rem; + bottom: auto; + left: auto; + background: $l5r5e-water; + } + label { + strong { + position: absolute; + bottom: -0.75rem; + right: 2rem; + } + } + } + + // Fire + #fire { + color: $l5r5e-fire; + padding-left: 2rem; + input { + top: 17%; + right: auto; + bottom: auto; + left: -1.25rem; + background: $l5r5e-fire; + } + label { + float: left; + strong { + position: absolute; + bottom: -0.75rem; + right: 2rem; + } + } + } + + // Void + #void { + top: -2rem; + margin: 0 calc(50% - 2.5rem); + color: $l5r5e-void; + input { + top: -1rem; + right: auto; + bottom: auto; + left: 30%; + background: $l5r5e-void; + } + label { + strong { + position: absolute; + bottom: -0.75rem; + left: 1.75rem; + } + } + } } \ No newline at end of file diff --git a/system/styles/scss/sheet.scss b/system/styles/scss/sheet.scss deleted file mode 100644 index 105cebd..0000000 --- a/system/styles/scss/sheet.scss +++ /dev/null @@ -1,9 +0,0 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); -} -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file diff --git a/system/styles/scss/sheets.scss b/system/styles/scss/sheets.scss new file mode 100644 index 0000000..9cf35cb --- /dev/null +++ b/system/styles/scss/sheets.scss @@ -0,0 +1,57 @@ +/** Sheets **/ +&.sheet { + min-width: 600px; + .sheet-header { + h1 { + flex: 0 0 100%; + input { + height: 3rem; + line-height: 1.5rem; + margin: 0; + padding: 0 0 0.5rem; + width: 100%; + border: 1px solid $l5r5e-white; + color: $l5r5e-red; + } + } + img { + flex: 0 0 150px; + height: 150px; + margin-right: 0.25rem; + } + .header-fields { + display: flex; + flex-wrap: wrap; + } + .identity-wrapper { + flex: 0 0 calc(100% - 150px - 0.25rem); + .identity-content { + flex: 0 0 100%; + display: flex; + flex-wrap: wrap; + li { + flex: 33%; + &:nth-child(1), &:nth-child(2) { + flex: 50%; + margin: 0 0 0.5rem; + } + } + } + } + .rings { + flex: 0 0 calc(50% - 0.25rem); + display: flex; + padding: 0.25rem; + } + .social-content { + flex: 0 0 100%; + display: flex; + padding: 0.25rem; + } + .attributes-wrapper { + flex: 0 0 calc(50% - 0.25rem); + display: flex; + padding: 0.25rem; + } + } +} \ No newline at end of file diff --git a/system/styles/scss/ui.scss b/system/styles/scss/ui.scss index 105cebd..64b7b39 100644 --- a/system/styles/scss/ui.scss +++ b/system/styles/scss/ui.scss @@ -1,9 +1,22 @@ //SCSS -// l5re5.scss -.testing { - width: percentage(1/7); +// sdebar +#sidebar { + #sidebar-tabs { + flex: 0 0 1rem; + box-sizing: border-box; + margin: 0 0 0.25rem; + border-bottom: 1px solid $l5r5e-white; + box-shadow: none; + > .item { + line-height: 27px; + border-radius: 100%; + margin: 0; + flex: 0 0 27px; + height: 27px; + .active { + border: 1px solid $orange; + box-shadow: 0 0 6px $orange; + } + } + } } -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file diff --git a/system/templates/sheets/actor-sheet.html b/system/templates/sheets/actor-sheet.html index 62b3ed0..1ed70db 100644 --- a/system/templates/sheets/actor-sheet.html +++ b/system/templates/sheets/actor-sheet.html @@ -1,10 +1,15 @@
{{!-- Sheet Header --}}
- -
+ +

+ {{> 'systems/l5r5e/templates/sheets/actor/identity.html' }} +
+
+ {{> 'systems/l5r5e/templates/sheets/actor/social.html' }} {{> 'systems/l5r5e/templates/sheets/actor/rings.html' }} + {{> 'systems/l5r5e/templates/sheets/actor/attributes.html' }}
@@ -21,10 +26,7 @@
{{!-- Narrative Tab --}}
- {{> 'systems/l5r5e/templates/sheets/actor/identity.html' }} - {{> 'systems/l5r5e/templates/sheets/actor/social.html' }} -

{{ localize 'L5r5e.Notes' }}

- {{ editor content=data.notes.value target="data.notes.value" button=true editable=editable }} + {{> 'systems/l5r5e/templates/sheets/actor/narrative.html' }}
{{!-- Skills Tab --}} @@ -42,7 +44,7 @@ {{> 'systems/l5r5e/templates/sheets/actor/conflict.html' }} -
+
{{> 'systems/l5r5e/templates/item/items.html' }}
diff --git a/system/templates/sheets/actor/attributes.html b/system/templates/sheets/actor/attributes.html new file mode 100644 index 0000000..4670189 --- /dev/null +++ b/system/templates/sheets/actor/attributes.html @@ -0,0 +1,52 @@ +
    +
  • + + +

    {{ localize 'L5r5e.Conflict.EnduranceTip' }}

    +
    • +
  • + + +

    {{ localize 'L5r5e.Conflict.ComposureTip' }}

    +
    • +
  • + +

    {{ localize 'L5r5e.Conflict.FocusTip' }}

    +
    • +
  • + +

    {{ localize 'L5r5e.Conflict.VigilanteTip' }}

    +
    • +
  • +
    + +
    +
    + +
    +
    • +
\ No newline at end of file diff --git a/system/templates/sheets/actor/category.html b/system/templates/sheets/actor/category.html index fcc5320..2df5b05 100644 --- a/system/templates/sheets/actor/category.html +++ b/system/templates/sheets/actor/category.html @@ -1,15 +1,15 @@ -
  • +

  • {{ localizeSkillCategory categoryId }}

      {{#each category as |skill id| }} {{> 'systems/l5r/templates/sheets/actor/skill.html' categoryId=../categoryId skill=skill skillId=id }} {{/each}}
    -
    - - - - - -
    +
      +
    • {{ localizeSkill categoryId 'Air' }}
      • +
    • {{ localizeSkill categoryId 'Earth' }}
      • +
    • {{ localizeSkill categoryId 'Fire' }}
      • +
    • {{ localizeSkill categoryId 'Water' }}
      • +
    • {{ localizeSkill categoryId 'Void' }}
      • +
    • \ No newline at end of file diff --git a/system/templates/sheets/actor/conflict.html b/system/templates/sheets/actor/conflict.html index ef56140..3f40571 100644 --- a/system/templates/sheets/actor/conflict.html +++ b/system/templates/sheets/actor/conflict.html @@ -1,63 +1,5 @@
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.EnduranceTip' }}

    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.ComposureTip' }}

    -
    -
    -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.FocusTip' }}

    -
    -
    -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.VigilanteTip' }}

    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -

    {{ localize 'L5r5e.Conflict.Stance' }}

    {{#each data.stances as |stance stanceId|}} @@ -65,6 +7,5 @@ {{/each}}
    {{> 'systems/l5r5e/templates/item/weapons.html' }} -
    \ No newline at end of file diff --git a/system/templates/sheets/actor/identity.html b/system/templates/sheets/actor/identity.html index cf004a2..bbbdd18 100644 --- a/system/templates/sheets/actor/identity.html +++ b/system/templates/sheets/actor/identity.html @@ -1,4 +1,4 @@ -
      +
      • diff --git a/system/templates/sheets/actor/narrative.html b/system/templates/sheets/actor/narrative.html new file mode 100644 index 0000000..297d972 --- /dev/null +++ b/system/templates/sheets/actor/narrative.html @@ -0,0 +1,16 @@ +
          +
        • + + +
          • +
        • + + +
          • +
        • + + +
          • +
        +

        {{ localize 'L5r5e.Notes' }}

        +{{ editor content=data.notes.value target="data.notes.value" button=true editable=editable }} \ No newline at end of file diff --git a/system/templates/sheets/actor/rings.html b/system/templates/sheets/actor/rings.html index cebc78f..a28ef95 100644 --- a/system/templates/sheets/actor/rings.html +++ b/system/templates/sheets/actor/rings.html @@ -1,22 +1,37 @@
        • - - +
        • - - +
        • - - +
        • - - +
        • - - +
        \ No newline at end of file diff --git a/system/templates/sheets/actor/skill.html b/system/templates/sheets/actor/skill.html index 1fb80b4..255c1d7 100644 --- a/system/templates/sheets/actor/skill.html +++ b/system/templates/sheets/actor/skill.html @@ -1,5 +1,6 @@ -
      • -
      • + diff --git a/system/templates/sheets/actor/social.html b/system/templates/sheets/actor/social.html index 7dab8ce..4392050 100644 --- a/system/templates/sheets/actor/social.html +++ b/system/templates/sheets/actor/social.html @@ -1,4 +1,4 @@ -