uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev_gennpc

Browse Source 
# Conflicts:
#	system/styles/l5r5e.css
#	system/templates/actors/character/identity.html
This commit is contained in:
Vlyan
2022-02-06 11:12:33 +01:00
parent 05fe3b8326 2a2ad458fe
commit 57a645f2e0
68 changed files with 1200 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
system/styles/scss/army.scss
View File

@@ -24,6 +24,14 @@
display: inline-grid;
position: relative;
.attributes-buttons {
position: relative;
line-height: 13px;
top: 0.3rem;
right: 1.2rem;
width: 12px;
}
strong {
color: $l5r5e-label;
text-align: center;
@@ -39,6 +47,7 @@
background: transparent;
border: 0 none;
text-align: center;
margin: 0.3rem 1.6rem 0 1.5rem;
}
&:after {
@@ -55,6 +64,9 @@
}
&:nth-child(1) {
input {
margin: 0.3rem 1rem 0 1.5rem;
}
&:after {
transform: rotate(0deg);
}
@@ -67,6 +79,9 @@
}
&:nth-child(3) {
input {
margin: 0.3rem 1rem 0 1.5rem;
}
&:after {
transform: rotate(180deg);
}
@@ -88,13 +103,14 @@
}
}
.sheet-body {
height: calc(100% - 9.5rem);
height: calc(100% - 11.5rem);
.tab {
height: calc(100% - 3.5rem);
&.army {
.warlord,
.commander {
display: flex;
flex-wrap: wrap;
.fa-sign-in-alt {
transform: rotate(90deg);
@@ -189,8 +205,30 @@
}
}
}
.warlord-name {
display: flex;
flex: 100%;
flex-wrap: wrap;
margin: 0;
padding: 0.5rem 0.5rem 0;
background: $l5r5e-title;
--notchSize: 0.25rem;
i {
color: $l5r5e-black;
margin-right: 0.5rem;
}
label {
flex: 0 0 auto !important;
height: 1.65rem;
margin: 0;
padding: 0 0.5rem;
color: $l5r5e-label;
background: $l5r5e-white;
border: 1px solid $l5r5e-label;
border-radius: 1rem;
}
}
}
&.others {
flex-direction: column;

6
system/styles/scss/global.scss
View File

@@ -1,11 +1,13 @@
/** Global **/
body {
background: url("../assets/imgs/bg-table.webp") no-repeat center;
background-size: cover;
> * {
scrollbar-width: thin;
}
&:not(.background) {
background: url("../assets/imgs/bg-table.webp") no-repeat;
background-size: auto;
}
}
/* Windows */

6
system/styles/scss/nav.scss
View File

@@ -2,7 +2,7 @@
nav {
&.sheet-tabs {
height: 3rem;
line-height: 3rem;
line-height: 2rem;
font-family: $font-tertiary;
letter-spacing: -0.05rem;
font-size: 1rem;
@@ -11,6 +11,8 @@ nav {
margin-bottom: 0;
background: $l5r5e-white;
color: $l5r5e-black;
display: flex;
flex-direction: row;
--notchSize: 0.5rem;
clip-path: polygon(
0% var(--notchSize),
@@ -24,6 +26,7 @@ nav {
);
}
.item {
flex: 1;
&:hover {
background-color: $l5r5e-label;
color: $white-light;
@@ -43,7 +46,6 @@ nav {
.item.active {
background-color: rgba(73, 12, 11, 0.85);
color: rgba(255, 255, 255, 1);
background-color: rgba(73, 12, 11, 0.85);
clip-path: polygon(
0% var(--notchSize),
var(--notchSize) 0%,

26
system/styles/scss/sheets.scss
View File

@@ -6,6 +6,21 @@
text-shadow: 0 0 2px $red;
}
}
.l5r-buttons-bar {
display: flex;
flex: 0 0 100%;
overflow: hidden;
padding: 0 8px;
line-height: 1.9rem;
justify-content: flex-end;
background: rgba(186, 187, 177, 0.5);
height: 2rem;
a.l5r-header-button {
flex: none;
margin: 0 0 0 8px;
}
}
&.actor {
.sheet-header {
height: 26rem;
@@ -15,7 +30,7 @@
}
}
.sheet-body {
height: calc(100% - 27rem);
height: calc(100% - 28rem);
}
fieldset {
&.advancement,
@@ -175,6 +190,10 @@
height: 1.75rem;
margin: 0 1rem 0 0.5rem;
padding: 0 0.25rem 0.25rem;
&[disabled] {
border: 1px solid rgba(186, 187, 177, 0.5);
background: $l5r5e-white-light;
}
}
}
.identity-content {
@@ -385,6 +404,11 @@
width: 3.5rem;
}
}
.attributes-buttons {
line-height: 13px;
position: relative;
top: 0.2rem;
}
.void-content {
width: 100%;
padding-top: 0.25rem;

110
system/styles/scss/ui.scss
View File

@@ -9,6 +9,14 @@ button {
cursor: url("../assets/cursors/pointer.webp"), pointer;
}
// System title was too long and merge version with module number
#game-details {
.system {
overflow: auto;
border-bottom: 1px solid var(--color-border-light-highlight);
}
}
// sidebar
#sidebar {
padding: 0.5rem 0.25rem 0.5rem 0.5rem;
@@ -18,10 +26,13 @@ button {
border: 1px solid rgb(195, 165, 130);
border-radius: 0;
overflow: initial;
height: calc(100% - 1rem);
top: 0.5rem;
height: calc(100% - 1.1rem);
top: 0.2rem;
width: 320px;
min-width: 40px;
letter-spacing: 0.1rem;
position: relative;
margin-right: 0.5rem;
&:before {
z-index: -1;
content: "";
@@ -94,6 +105,14 @@ button {
content: "";
}
}
&.fa-id-badge {
background-size: 85%;
color: black;
padding-left: 2px;
&:before {
content: "\f2c1";
}
}
&.fa-music {
background-image: url("../assets/ui/sidebar/playlist.svg");
background-size: 80%;
@@ -328,9 +347,9 @@ button {
// hotbar
#hotbar {
margin: 0;
//margin: 0;
#action-bar {
flex: 0 0 100%;
//flex: 0 0 100%;
.macro {
background-position: center;
background-size: 100%;
@@ -408,9 +427,10 @@ button {
border-image-outset: 0px;
margin: 0;
padding: 0;
left: 1.15rem;
left: 0.2rem;
bottom: 0.65rem;
box-shadow: inset 0 0 0.5rem $black-light;
position: relative;
&:before {
z-index: -1;
position: absolute;
@@ -431,7 +451,7 @@ button {
height: 80px;
width: 88px;
margin-left: 0.5rem;
opacity: 0;
opacity: 0.8;
}
// navigation
@@ -514,46 +534,48 @@ button {
// controls
#controls {
top: 100px;
.scene-control.active,
.control-tool.active,
.scene-control:hover,
.control-tool:hover {
background: linear-gradient(
$l5r5e-linear-gradient-first,
$l5r5e-linear-gradient-first-dark,
$l5r5e-linear-gradient-first
);
background-origin: padding-box;
border-image: url("../assets/ui/macro-button.webp") 10 repeat;
border-image-width: 0.25rem;
border-image-outset: 0px;
box-shadow: 0 0 10px $red;
&:hover {
ol {
.scene-control.active,
.control-tool.active,
.scene-control:hover,
.control-tool:hover {
background: linear-gradient(
$l5r5e-linear-gradient-first-dark,
$l5r5e-linear-gradient-first,
$l5r5e-linear-gradient-first-dark
$l5r5e-linear-gradient-first-dark,
$l5r5e-linear-gradient-first
);
background-origin: padding-box;
border-image: url("../assets/ui/macro-button.webp") 10 repeat;
border-image-width: 0.25rem;
border-image-outset: 0px;
box-shadow: 0 0 10px $red;
&:hover {
background: linear-gradient(
$l5r5e-linear-gradient-first-dark,
$l5r5e-linear-gradient-first,
$l5r5e-linear-gradient-first-dark
);
}
}
}
.scene-control,
.control-tool {
color: $white;
background: linear-gradient(
$l5r5e-linear-gradient-second,
$l5r5e-linear-gradient-second-dark,
$l5r5e-linear-gradient-second
);
background-origin: padding-box;
border-image: url("../assets/ui/macro-button.webp") 10 repeat;
border-image-width: 0.25rem;
border-image-outset: 0px;
&:hover {
.scene-control,
.control-tool {
color: $white;
background: linear-gradient(
$l5r5e-linear-gradient-first-dark,
$l5r5e-linear-gradient-first,
$l5r5e-linear-gradient-first-dark
$l5r5e-linear-gradient-second,
$l5r5e-linear-gradient-second-dark,
$l5r5e-linear-gradient-second
);
background-origin: padding-box;
border-image: url("../assets/ui/macro-button.webp") 10 repeat;
border-image-width: 0.25rem;
border-image-outset: 0px;
&:hover {
background: linear-gradient(
$l5r5e-linear-gradient-first-dark,
$l5r5e-linear-gradient-first,
$l5r5e-linear-gradient-first-dark
);
}
}
}
}
@@ -719,6 +741,12 @@ button {
top: -1px;
left: -1px;
}
.goodvalue {
color: #4e8c69;
}
.badvalue {
color: #ab2a00;
}
}
.card-header img {
display: inline-block;
@@ -765,7 +793,7 @@ button {
#l5r5e-gm-monitor {
min-height: 170px;
min-width: 500px;
min-width: 240px;
.window-content {
form {