Merge branch 'master' into character-sheet-importer

This commit is contained in:
Mike Magarino 2021-01-24 16:34:34 -05:00
commit ea7a6e063a
161 changed files with 5350 additions and 3368 deletions

View file

@ -69,12 +69,29 @@
line-height: 30px;
}
}
}
}
.attributes {
input.temphp {
width: 48%;
// Movement Configuration
.movement {
h4.attribute-name {
position: relative;
}
.config-button {
position: absolute;
display: none;
right: 0;
top: 1px;
font-size: 12px;
font-weight: normal;
}
&:hover .config-button {
display: block;
}
}
// Temporary HP
input.temphp {
width: 48%;
}
}
}
@ -238,6 +255,7 @@
li.skill {
height: 24px;
width: 225px;
padding: 3px 2px;
&:nth-child(even) {
@ -340,7 +358,7 @@
margin: 0 0 3px 0;
justify-content: space-between;
}
.configure-flags {
.config-button {
flex: 1;
}
@ -427,9 +445,8 @@
&.rollable .item-image:hover {
background-image: url("../../icons/svg/d20-black.svg") !important;
}
i.attuned {
color: @colorTan;
}
i.attuned { color: @colorTan; }
i.not-attuned { color: @colorCrimson; }
}
// Item uses
@ -470,8 +487,8 @@
overflow: hidden;
&:last-child { border-right: none; }
&.item-action {flex: 0 0 100px}
&.attunement {flex: 0 0 24px}
}
.item-weight {
flex: 0 0 60px;
border-left: 1px solid @colorFaint;
@ -491,6 +508,15 @@
padding: 0.25em 0.5em;
color: @colorDark;
border-top: 1px solid @colorFaint;
h2 {
font-family: 'Russo One';
font-size: 20px;
font-weight: 400;
text-transform: uppercase;
letter-spacing: 0.5px;
border-bottom: 2px solid rgb(13, 153, 204);
color: #c40f0f;
}
}
}
@ -564,26 +590,23 @@
.powercasting-ability {
flex: 0 0 240px;
margin: 0;
input, span {
flex: 0 0 32px;
label, span {
flex: none;
}
input {
flex: 0 0 28px;
text-align: center;
}
select {
margin: 0 5px;
flex: 0 0 150px;
}
h3.power-dc {
flex: 1;
text-align: right;
flex: 0 0 120px;
}
}
.power-slots,
.power-comps {
flex: 0 0 75px;
padding-right: 5px;
text-align: right;
flex: none;
padding: 0 5px;
font-size: 12px;
color: @colorTan;
border-right: 1px solid @colorFaint;
@ -600,9 +623,10 @@
}
}
.power-uses {
padding-right: 8px;
text-align: right !important;
.powerbook .power-uses {
padding-right: 5px;
text-align: right;
color: @colorTan;
}
.power-school, .power-action, .power-target {
@ -651,5 +675,6 @@
padding-right: 8px;
margin-bottom: 4px;
overflow-y: auto;
scrollbar-width: thin;
}
}

View file

@ -178,11 +178,14 @@
background: transparent;
}
// Rollable Links
// Rollable Titles
.editable .rollable:hover {
cursor: pointer;
}
.editable h4.rollable:hover,
.editable .rollable:hover > h4 {
color: #000;
text-shadow: 0 0 10px red;
cursor: pointer;
}
// Separators
@ -306,6 +309,7 @@
/* ----------------------------------------- */
.filter-list {
align-items: center;
list-style: none;
margin: 0;
padding: 0;
@ -382,6 +386,30 @@
padding: 0;
}
// Item Name
.item-name {
flex: 2;
margin: 0;
overflow: hidden;
font-size: 13px;
text-align: left;
align-items: center;
h3, h4 {
margin: 0;
white-space: nowrap;
overflow-x: hidden;
}
}
// Control Buttons
.item-controls {
flex: 0 0 60px;
justify-content: space-between;
a {
font-size: 12px;
text-align: center;
}
}
// Individual Item
.item {
align-items: center;
@ -398,11 +426,6 @@
border: none;
margin-right: 5px;
}
h4 {
margin: 0;
white-space: nowrap;
overflow-x: hidden;
}
}
}
@ -419,32 +442,13 @@
font-size: 12px;
text-align: center;
}
.item-name {
h3 {
padding-left: 5px;
//.modesto();
text-align: left;
font-size: 16px;
}
}
// Item Name
.item-name {
flex: 2;
margin: 0;
overflow: hidden;
font-size: 13px;
text-align: left;
align-items: center;
}
// Control Buttons
.item-controls {
flex: 0 0 60px;
justify-content: space-between;
a {
font-size: 12px;
text-align: center;
}
}
}
/* ----------------------------------------- */
@ -482,4 +486,41 @@
height: 24px;
margin: 2px;
}
}
/* ----------------------------------------- */
/* HUD
/* ----------------------------------------- */
.placeable-hud .control-icon {
box-sizing: content-box;
width: 40px;
flex: 0 0 40px;
margin: 8px 0;
font-size: 28px;
line-height: 40px;
text-align: center;
color: #FBF4F4;
background: rgba(0, 0, 0, 0.6);
box-shadow: 0 0 15px #000;
border: 1px solid #333;
border-radius: 8px;
pointer-events: all;
}
#token-hud .status-effects {
visibility: hidden;
position: absolute;
left: 50px;
top: 0;
display: grid;
padding: 3px;
box-sizing: content-box;
width: 100px;
color: #FBF4F4;
grid-template-columns: 25px 25px 25px 25px;
background: rgba(0, 0, 0, 0.6);
box-shadow: 0 0 15px #000;
border: 1px solid #333;
border-radius: 4px;
pointer-events: all;
}

View file

@ -4,7 +4,7 @@
/* Basic Structure */
/* ----------------------------------------- */
.sw5e.sheet.actor.character {
min-width: 720px;
min-width: 800px;
min-height: 680px;
/* ----------------------------------------- */
@ -160,7 +160,7 @@
padding: 0 3px 3px;
label {
flex: 0 0 20px;
.bungeeInline();
.russoOne();
font-size: 16px;
font-weight: normal;
line-height: 20px;

View file

@ -4,7 +4,8 @@
/* Chat Cards
/* ----------------------------------------- */
.sw5e.chat-card {
.sw5e.chat-card,
.midi-qol-item-card {
font-style: normal;
font-size: 12px;
@ -22,7 +23,7 @@
flex: 1;
margin: 0;
line-height: 36px;
.bungeeInline();
.engli-Besh();
color: @colorOlive;
&:hover {
color: #111;
@ -72,7 +73,7 @@
span {
border-right: 2px groove #FFF;
padding: 0 5px 0 0;
padding: 0 3px 0 0;
font-size: 10px;
&:last-child {

View file

@ -1,6 +1,7 @@
@import "./variables.less";
.sw5e.sheet.item {
min-height: 420px;
min-height: 660px;
min-width: 680px;
/* ----------------------------------------- */
/* Sheet Header */
@ -10,7 +11,19 @@
img.profile {
border: 2px solid #000;
}
h1 {
input {
font-size: 26px;
}
}
.header-details.flexrow {
h1 {
font-size: 26px;
}
.charname {
font-size: 26px;
}
}
.item-subtitle {
flex: 0 0 80px;
height: 60px;
@ -20,8 +33,8 @@
color: @colorTan;
.item-type {
font-size: 24px;
line-height: 26px;
font-size: 20px;
line-height: 24px;
margin: 0;
}
@ -29,19 +42,298 @@
font-size: 16px;
line-height: 24px;
}
.summary {
li {
font-size: 16px;
}
}
}
}
.sheet-navigation {
margin-bottom: 5px;
.item {
font-size: 18px;
font-size: 16px;
}
}
.sheet-body {
overflow: hidden;
h1 {
font-family: 'Russo One';
font-size: 20px;
font-weight: 400;
text-transform: uppercase;
letter-spacing: 0.5px;
border-bottom: none;
color: #c40f0f;
}
h2 {
font-family: 'Russo One';
font-size: 18px;
font-weight: 400;
text-transform: uppercase;
letter-spacing: 0.5px;
border-bottom: 2px solid rgb(13, 153, 204);
color: #c40f0f;
}
h3 {
font-family: 'Russo One';
font-size: 16px;
font-weight: 400;
text-transform: uppercase;
letter-spacing: 0.5px;
border-bottom: none;
color: #c40f0f;
}
.smalltable {
table {
border-top: none;
border-bottom: none;
width: 200px;
}
td {
&:nth-child(odd) {
width: 50px;
margin: 0.5em 0.5em;
text-align: center;
}
&:nth-child(even) {
width: 150px;
margin: 0.5em 0.5em;
padding: 0px 10px 0px 10px;
text-align: left;
}
}
thead {
border-bottom: 0px;
}
th {
color: #000000;
text-shadow: none;
border-bottom: 0px;
background-color: #bdc8cc;
text-transform: none;
font-weight: bold;
font-family: 'Open Sans';
&:nth-child(odd) {
width: 50px;
margin: 0.5em 0.5em;
text-align: center;
}
&:nth-child(even) {
width: 150px;
margin: 0.5em 0.5em;
padding: 0px 10px 0px 10px;
text-align: left;
}
}
}
.medtable {
table {
width: 500px;
border: 0px;
margin: 0.5em 0.5em;
}
td {
&:nth-child(odd) {
width: 50px;
margin: 0.5em 0.5em;
text-align: center;
}
&:nth-child(even) {
width: 450px;
margin: 0.5em 0.5em;
padding: 0px 10px 0px 0px;
text-align: left;
}
}
thead {
border-bottom: 0px;
}
th {
color: #000000;
text-shadow: none;
border-bottom: 0px;
background-color: #bdc8cc;
text-transform: none;
font-weight: bold;
font-family: 'Open Sans';
&:nth-child(odd) {
text-align: center;
}
&:nth-child(even) {
text-align: left;
}
}
}
.classtable {
blockquote {
border-left: 0px;
border-right: 0px;
background-color: #bdc8cc;
width: 600px;
h3 {
color: #000000;
text-transform: uppercase;
font-family: 'Russo One';
font-size: 16px;
}
}
table {
width: 100%;
border-collapse: collapse;
background: rgba(0, 0, 0, 0.05);
border-left: 0px;
border-right: 0px;
border-top: 0;
border-bottom: 0;
margin: 0.5em 0;
font-style: normal;
text-shadow: none;
}
thead {
color: #000000;
text-shadow: none;
border-bottom: 0px;
background-color: #bdc8cc;
text-transform: none;
font-style: normal;
font-family: 'Open Sans';
}
th {
color: #000000;
text-shadow: none;
border-bottom: 0px;
background-color: #bdc8cc;
text-transform: none;
font-style: normal;
font-weight: bold;
font-family: 'Open Sans';
}
tbody {
text-align: center;
}
}
.speciestable {
blockquote {
width: 620px;
padding: 15px 10px;
margin: 15px;
line-height: 20px;
background-color: #bdc8cc;
border-top: 2px solid #0d99cc !important;
border-bottom: 2px solid #0d99cc !important;
border-left: 0 !important;
border-right: 0 !important;
-webkit-box-shadow: 0 0 1.5em rgba(13, 153, 204, .5) !important;
box-shadow: 0 0 1.5em rgba(13, 153, 204, .5) !important;
overflow-x: auto;
h3 {
color: #000000;
font-size: 22px;
border-bottom: none;
}
}
table {
background-color: #bdc8cc;
border-collapse: collapse;
width: 100%;
line-height: 18px;
margin-bottom: 15px;
border: 0 0 0 0;
border-bottom: none;
overflow-x: auto;
tbody {
tr {
&:nth-child(odd) {
background-color: #c9d6db;
}
&:nth-child(even) {
background-color: #bdc8cc;
}
}
}
td {
&:nth-child(1) {
padding-right: 5px;
width: 100px;
font-style: italic;
font-weight: 800;
}
}
h3 {
font-family: 'Russo One';
color: #000000;
font-size: 15px;
text-transform: uppercase;
}
thead {
font-style: normal;
font-size: 18px;
background-color: #bdc8cc;
text-shadow: none;
text-align: left;
line-height: 20px;
border-top: 5px solid #0d99cc;
border-bottom: 0;
}
}
}
.icon {
&:before {
display: inline-block;
font-style: normal;
font-variant: normal;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
}
}
a.entity-link {
background: #DDD;
padding: 1px 4px;
border: 1px solid #4b4a44;
border-radius: 2px;
white-space: nowrap;
word-break: break-all;
i {
&::before {
content: url("ui/jedi-order.svg") !important;
display: inline-block;
position: relative;
top: 2px;
height: 15px;
width: 15px;
}
}
}
#species-description {
h2 {
font-family: 'Russo One';
font-size: 20px;
font-weight: 400;
letter-spacing: 0.5px;
border-bottom: 2px solid rgb(13, 153, 204);
color: #c40f0f;
}
}
#Traits {
h2 {
font-family: 'Russo One';
font-size: 20px;
font-weight: 400;
text-transform: uppercase;
letter-spacing: 0.5px;
border-bottom: 2px solid rgb(13, 153, 204);
color: #c40f0f;
}
}
.tab {
padding: 0 5px;
overflow: hidden auto;

View file

@ -31,11 +31,4 @@
.summary {
font-size: 18px;
}
.powercasting-ability {
label {
flex: none;
}
}
}

View file

@ -6,33 +6,3 @@
@import "character.less";
@import "npc.less";
@import "vehicle.less";
// TODO: Remove number styling after 0.7.x
input[type="number"] {
width: calc(100% - 2px);
min-width: 20px;
height: 26px;
background: rgba(0, 0, 0, 0.05);
padding: 1px 3px;
margin: 0;
color: #191813;
font-family: inherit;
font-size: inherit;
text-align: inherit;
line-height: inherit;
border: 1px solid #7a7971;
border-radius: 3px;
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
-moz-appearance: textfield;
&:focus {
box-shadow: 0 0 5px red;
}
}
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
}

View file

@ -19,15 +19,15 @@
font-size: @font-size;
font-weight: 400;
}
/* bungee-inline-regular - latin */
/* engli-besh */
@font-face {
font-family: 'Bungee Inline';
font-family: 'Engli-Besh';
font-style: normal;
font-weight: 400;
src: url('./fonts/BungeeInline.ttf');
src: url('./fonts/EngliBesh-KG3W.ttf');
}
.bungeeInline {
font-family: 'Bungee Inline';
.engli-Besh {
font-family: 'Engli-Besh';
font-size: 20px;
font-weight: 400;
}

View file

@ -13,7 +13,7 @@
@blockquoteShadow: 0 0 20px rgba(@colorBlue, 0.8);
//forms
@inputBackgroundColor: white;
@inputBackgroundColor: @colorGray;
@inputBorderNormal: @colorLightGray;
@inputBorderHover: @colorGray;
@inputBorderFocus: @colorRed;

View file

@ -5,7 +5,7 @@
.dropShadow1();
}
.sw5e.sheet.actor.character {
min-width: 780px;
min-width: 850px;
min-height: 720px;
}
.sw5e.sheet .window-content {
@ -54,7 +54,7 @@
grid-template-rows: 1fr 26px auto;
grid-template-columns: 128px 1fr;
column-gap: 8px;
row-gap: 8px;
grid-row-gap: 8px;
img {
grid-column-start: 1;
@ -683,7 +683,7 @@
display: grid;
grid-template-columns: 1fr 1fr;
grid-gap: 16px;
row-gap: 8px;
grid-row-gap: 8px;
input,
select {
@ -715,7 +715,7 @@
}
.languages {
grid-column-end: span 2;
grid-column-end: span 1;
label {
&:hover {
cursor: pointer;
@ -745,7 +745,7 @@
display: grid;
grid-template-columns: 1fr 1fr;
grid-gap: 4px;
row-gap: 4px;
grid-row-gap: 4px;
strong {
font-size: 13px;
@ -994,7 +994,7 @@
}
&.limited {
grid-template-rows: 144px auto;
row-gap: 8px;
grid-row-gap: 8px;
header {
grid-template-rows: 1fr;
}

View file

@ -54,7 +54,8 @@
color: @colorBlue;
}
.sw5e.chat-card {
.sw5e.chat-card,
.midi-qol-item-card {
.card-header {
padding: 0;
border: none;

View file

@ -31,7 +31,8 @@
color: @chatNotificationColor;
}
.sw5e.chat-card {
.sw5e.chat-card,
.midi-qol-item-card {
.card-header {
h3 {
@ -94,7 +95,8 @@
}
#chat-controls {
.roll-type-select {
background: @inputBackgroundColor;
background: #4f4f4f;
color: #FFFFFF;
}
label {
color: @bodyFontColor;
@ -102,7 +104,7 @@
}
#chat-form textarea {
background: @inputBackgroundColor;
background: #4f4f4f;
}

View file

@ -51,7 +51,8 @@
}
.sw5e.chat-card {
.sw5e.chat-card,
.midi-qol-item-card {
font-size: 13px;
.card-header {
@ -168,6 +169,10 @@
}
}
#chat-controls {
&.roll-type-select {
background: #4f4f4f;
color: #FFFFFF;
}
padding-top: 4px;
label {
color: @colorBlack;
@ -175,7 +180,7 @@
}
#chat-form textarea {
background: white;
background: #4f4f4f;
&:focus {
box-shadow: none;
outline: none;

View file

@ -48,6 +48,12 @@
font-weight: 400;
src: url('./fonts/Aurebesh.ttf');
}
@font-face {
font-family: 'Engli-Besh';
font-style: normal;
font-weight: 400;
src: url('./fonts/EngliBesh-KG3W.ttf');
}
@import "_variables.less";
html {
@ -77,6 +83,9 @@ html {
body {
.openSans(13px, 400);
background-image: url('./ui/SW5e-logo.svg');
background-repeat: no-repeat;
background-size: cover;
}
h1 {