Merge branch 'old-system' into 'master'

Old system

See merge request wintermyst/kidsonbrooms!8
This commit is contained in:
WinterMyst 2024-12-03 12:17:47 +00:00
commit 9b25cc053a
8 changed files with 153 additions and 18 deletions

View File

@ -162,72 +162,140 @@
}
.flex-group-center {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: center;
flex-direction: center;
-ms-flex-wrap: center;
flex-wrap: center;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
text-align: center;
}
.flex-group-left {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: flex-start;
flex-direction: flex-start;
-ms-flex-wrap: center;
flex-wrap: center;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
text-align: left;
}
.flex-group-right {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: flex-end;
flex-direction: flex-end;
-ms-flex-wrap: center;
flex-wrap: center;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
text-align: right;
}
.flexshrink {
-webkit-box-flex: 0;
-ms-flex: 0;
flex: 0;
}
.flex-between {
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
}
.flexlarge {
-webkit-box-flex: 2;
-ms-flex: 2;
flex: 2;
}
.align-left {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: flex-start;
flex-direction: flex-start;
-ms-flex-wrap: center;
flex-wrap: center;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
text-align: left;
}
.align-right {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: flex-end;
flex-direction: flex-end;
-ms-flex-wrap: center;
flex-wrap: center;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
text-align: right;
}
.align-center {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: center;
flex-direction: center;
-ms-flex-wrap: center;
flex-wrap: center;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
text-align: center;
}
.right-align-input {
-webkit-box-flex: 1;
-ms-flex: 1;
flex: 1;
margin-left: auto;
max-width: 260px;
@ -243,26 +311,47 @@
cursor: pointer;
}
.editor-container {
min-height: 200px; /* Adjust this value as needed */
}
/* Styles limited to kidsonbrooms sheets */
.kids-on-brooms .item-form {
font-family: "Roboto", sans-serif;
}
.kids-on-brooms .sheet-header {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-align: start;
-ms-flex-align: start;
align-items: flex-start;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
align-items: stretch;
flex: 0 auto;
-webkit-box-flex: 0;
-ms-flex: 0 1 auto;
flex: 0 1 auto;
overflow: hidden;
margin-bottom: 10px;
height: 110px;
}
.kids-on-brooms .sheet-header .profile-img {
-webkit-box-flex: 0;
-ms-flex: 0 0 100px;
flex: 0 0 100px;
height: 100px;
margin-right: 10px;
}
.kids-on-brooms .sheet-header .header-fields {
-webkit-box-flex: 1;
-ms-flex: 1;
flex: 1;
}
.kids-on-brooms .sheet-header h1.charname {
@ -281,7 +370,9 @@
border-radius: 10px;
}
.kids-on-brooms .sheet-tabs {
flex: 0;
-webkit-box-flex: 1;
-ms-flex: 1;
flex: 1;
}
.kids-on-brooms .sheet-body,
.kids-on-brooms .sheet-body .tab,
@ -295,8 +386,14 @@
padding: 0 8px;
}
.kids-on-brooms .selection-row {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
margin-bottom: 10px;
}
@ -307,6 +404,8 @@
height: 28px;
margin: 2px 0;
padding: 0;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
background: rgba(0, 0, 0, 0.05);
border: 2px groove #eeede0;
@ -320,6 +419,8 @@
font-weight: bold;
padding-left: 5px;
text-align: left;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
}
.kids-on-brooms .items-list {
@ -336,7 +437,11 @@
padding: 0;
}
.kids-on-brooms .items-list .item {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
padding: 0 2px;
border-bottom: 1px solid #c9c7b8;
@ -345,11 +450,15 @@
border-bottom: none;
}
.kids-on-brooms .items-list .item .item-name {
-webkit-box-flex: 2;
-ms-flex: 2;
flex: 2;
margin: 0;
overflow: hidden;
font-size: 13px;
text-align: left;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
color: #191813;
}
@ -359,6 +468,8 @@
overflow-x: hidden;
}
.kids-on-brooms .items-list .item .item-name .item-image {
-webkit-box-flex: 0;
-ms-flex: 0 0 30px;
flex: 0 0 30px;
height: 30px;
background-size: 30px;
@ -366,8 +477,14 @@
margin-right: 5px;
}
.kids-on-brooms .items-list .item-controls {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-flex: 0;
-ms-flex: 0 0 100px;
flex: 0 0 100px;
-webkit-box-pack: end;
-ms-flex-pack: end;
justify-content: flex-end;
}
.kids-on-brooms .items-list .item-controls a {
@ -385,6 +502,8 @@
height: 28px;
margin: 2px 0;
padding: 0;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
background: rgba(0, 0, 0, 0.05);
border: 2px groove #eeede0;
@ -399,6 +518,8 @@
text-align: left;
}
.kids-on-brooms .item-formula {
-webkit-box-flex: 0;
-ms-flex: 0 0 200px;
flex: 0 0 200px;
padding: 0 8px;
}
@ -419,5 +540,3 @@
outline: none;
border-color: #8102dd;
}
/*# sourceMappingURL=kidsonbrooms.css.map */

View File

@ -71,7 +71,7 @@ function compileScss() {
/* ----------------------------------------- */
function watchUpdates() {
gulp.watch(SYSTEM_SCSS, css);
gulp.watch(SYSTEM_SCSS, compileScss);
}

View File

@ -42,6 +42,7 @@ Hooks.once('init', async function() {
decimals: 2
};
// Define custom Document classes
CONFIG.Actor.documentClass = KidsOnBroomsActor;
@ -104,12 +105,10 @@ Hooks.once('init', async function() {
}
});
// Preload Handlebars templates.
return preloadHandlebarsTemplates();
});
/***

View File

@ -20,6 +20,8 @@ export class KidsOnBroomsActorSheet extends ActorSheet {
{
console.log("template", this.actor)
return `systems/kidsonbrooms/templates/actor/actor-${this.actor.type}-sheet.html`;
}
/* -------------------------------------------- */

View File

@ -3,10 +3,15 @@
}
.sheet-header {
@include flexbox(row, wrap, flex-start); // Use a mixin for flexbox
flex: 0 auto;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: flex-start;
justify-content: flex-start; // Use a mixin for flexbox
flex: 0 1 auto;
overflow: hidden;
margin-bottom: 10px;
height: 110px;
.profile-img {
flex: 0 0 100px;
@ -38,7 +43,7 @@ div.editor-border {
}
.sheet-tabs {
flex: 0;
flex: 1;
}
.sheet-body,

View File

@ -14,6 +14,10 @@
@import 'global/flex';
@import 'global/base';
.editor-container {
min-height: 200px; /* Adjust this value as needed */
}
/* Styles limited to kidsonbrooms sheets */
.kids-on-brooms {
@import 'components/forms';

View File

@ -2,7 +2,7 @@
"id": "kidsonbrooms",
"title": "Kids on Brooms System",
"description": "The Kids on Brooms system for FoundryVTT!",
"version": "1.1.5",
"version": "1.1.6",
"compatibility": {
"minimum": 12,
"verified": 12.331

View File

@ -43,10 +43,16 @@
</section>
</div>
<div class="tab schoolbag" data-group="primary" data-tab="schoolbag">
{{!-- Schoolbag Tab --}}
<div class="tab features editor-border" data-group="primary" data-tab="schoolbag">
{{editor schoolbag target="system.schoolbag" engine="prosemirror" button=false collaborate=false editable=true}}
</div>
</div>
{{!-- Strengths Tab --}}
<div class="tab features editor-border" data-group="primary" data-tab="strengths">