merge
This commit is contained in:
@@ -2,6 +2,8 @@
|
||||
@import "../scss/colors";
|
||||
@import "../scss/global";
|
||||
@import "../scss/fonts";
|
||||
@import "../scss/cursors";
|
||||
@import "../scss/dices";
|
||||
@import "../scss/ui";
|
||||
|
||||
.l5r5e {
|
||||
|
||||
File diff suppressed because one or more lines are too long
54
system/styles/scss/cursors.scss
Normal file
54
system/styles/scss/cursors.scss
Normal file
@@ -0,0 +1,54 @@
|
||||
body,
|
||||
#navigation #scene-list .scene.view,
|
||||
#navigation #scene-list .scene.context,
|
||||
#navigation #nav-toggle,
|
||||
#navigation #scene-list .scene.nav-item,
|
||||
#controls .scene-control.active,
|
||||
#controls .control-tool.active,
|
||||
#controls .scene-control:hover,
|
||||
#controls .control-tool:hover,
|
||||
#client-settings .window-content form .form-group > label,
|
||||
#client-settings .window-content form .form-group select,
|
||||
#client-settings .form-group input,
|
||||
.app.window-app .form-group label,
|
||||
#sidebar .sidebar-tab #chat-controls div.roll-type-select select,
|
||||
#sidebar .sidebar-tab #chat-controls div.roll-type-select i.fas {
|
||||
cursor: url("../assets/cursors/normal.webp"), default !important;
|
||||
}
|
||||
|
||||
a,
|
||||
#hotbar .macro,
|
||||
#playlists-popout .global-volume::-webkit-slider-thumb,
|
||||
#sidebar #playlists .global-volume::-webkit-slider-thumb,
|
||||
#playlists-popout li.playlist:not(:first-of-type) li.sound .sound-volume::-webkit-slider-thumb,
|
||||
#sidebar #playlists li.playlist:not(:first-of-type) li.sound .sound-volume::-webkit-slider-thumb,
|
||||
#sidebar #settings button,
|
||||
.app.window-app.sheet.wfrp4e.actor.character-sheet
|
||||
.tab.main.active
|
||||
.main-row
|
||||
.movement.row-section
|
||||
.move-value
|
||||
.auto-calc-toggle,
|
||||
.app.window-app.sheet.wfrp4e.actor.npc-sheet .main-row .movement.row-section .move-value .auto-calc-toggle,
|
||||
.app.window-app.sheet.wfrp4e.actor.creature-sheet .main-row .movement.row-section .move-value .auto-calc-toggle,
|
||||
.app.window-app .form-group input[type="range"]::-webkit-slider-thumb,
|
||||
.token-sheet .tab[data-tab="image"] input[type="range"]::-webkit-slider-thumb,
|
||||
#drawing-config .tab[data-tab="image"] input[type="range"]::-webkit-slider-thumb,
|
||||
.metacurrency-value,
|
||||
.overcast-button,
|
||||
.chargen-button,
|
||||
#controls .scene-control,
|
||||
#controls .control-tool,
|
||||
#effects-config .flex2::-webkit-slider-thumb,
|
||||
#client-settings section.content .submenu > button,
|
||||
#client-settings .window-content button label,
|
||||
form .form-group .form-fields button,
|
||||
.sidebar-tab .action-buttons button,
|
||||
.dialog .dialog-buttons button,
|
||||
form button {
|
||||
cursor: url("../assets/cursors/pointer.webp"), pointer !important;
|
||||
}
|
||||
|
||||
.draggable {
|
||||
cursor: url("../assets/cursors/drag.webp"), move !important;
|
||||
}
|
||||
@@ -9,17 +9,24 @@
|
||||
// Font BrushtipTexe
|
||||
@font-face {
|
||||
font-family: "BrushtipTexe";
|
||||
src: url("../fonts/BrushtipTexe.otf") format("opentype");
|
||||
src: url("../fonts/BrushtipTexe.ttf") format("truetype");
|
||||
}
|
||||
|
||||
// Font ArchitectsDaughter
|
||||
// Font PatrickHand
|
||||
@font-face {
|
||||
font-family: "PatrickHand";
|
||||
src: url("../fonts/PatrickHand.ttf") format("truetype");
|
||||
}
|
||||
|
||||
// Font ManoNegra
|
||||
@font-face {
|
||||
font-family: "ManoNegra";
|
||||
src: url("../fonts/ManoNegra.ttf") format("truetype");
|
||||
}
|
||||
|
||||
$font-primary: "PatrickHand", sans-serif;
|
||||
$font-secondary: "BrushtipTexe", sans-serif;
|
||||
$font-tertiary: "ManoNegra", sans-serif;
|
||||
$font-dice: "LogotypeL5r", sans-serif;
|
||||
|
||||
body {
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
/** Global **/
|
||||
|
||||
body {
|
||||
background: url("../assets/imgs/background.webp") no-repeat center;
|
||||
background-size: cover;
|
||||
}
|
||||
|
||||
/* Windows */
|
||||
.window-app {
|
||||
.window-content {
|
||||
@@ -56,3 +61,20 @@ input[type="time"] {
|
||||
padding: 0.25rem;
|
||||
color: $l5r5e-bold;
|
||||
}
|
||||
|
||||
// Elements Colors
|
||||
.earth {
|
||||
color: $l5r5e-earth;
|
||||
}
|
||||
.air {
|
||||
color: $l5r5e-air;
|
||||
}
|
||||
.water {
|
||||
color: $l5r5e-water;
|
||||
}
|
||||
.fire {
|
||||
color: $l5r5e-fire;
|
||||
}
|
||||
.void {
|
||||
color: $l5r5e-void;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,10 @@
|
||||
|
||||
nav {
|
||||
&.sheet-tabs {
|
||||
background: $l5r5e-title;
|
||||
font-family: $font-tertiary;
|
||||
border: 0 none;
|
||||
margin-bottom: 0;
|
||||
background: $l5r5e-white;
|
||||
color: $l5r5e-black;
|
||||
--notchSize: 0.5rem;
|
||||
clip-path: polygon(
|
||||
@@ -18,9 +21,9 @@ nav {
|
||||
}
|
||||
.item {
|
||||
&:hover {
|
||||
background-color: rgba(0, 0, 0, 0.75);
|
||||
color: rgba(255, 255, 255, 1);
|
||||
text-shadow: black 1px 2px 0;
|
||||
background-color: $l5r5e-label;
|
||||
color: $white;
|
||||
text-shadow: none;
|
||||
}
|
||||
}
|
||||
.item.active {
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Earth
|
||||
#earth {
|
||||
float: right;
|
||||
|
||||
@@ -132,9 +132,26 @@
|
||||
}
|
||||
}
|
||||
li {
|
||||
position: relative;
|
||||
p {
|
||||
display: none;
|
||||
z-index: 2;
|
||||
position: absolute;
|
||||
bottom: -100%;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
color: #fff;
|
||||
padding: 0.25rem;
|
||||
--notchSize: 0.5rem;
|
||||
clip-path: polygon(
|
||||
0% 0,
|
||||
0 0%,
|
||||
100% 0%,
|
||||
100% var(--notchSize),
|
||||
100% calc(100% - var(--notchSize)),
|
||||
calc(100% - var(--notchSize)) 100%,
|
||||
var(--notchSize) 100%,
|
||||
0% calc(100% - var(--notchSize))
|
||||
);
|
||||
}
|
||||
&:hover {
|
||||
p {
|
||||
@@ -160,5 +177,88 @@
|
||||
article {
|
||||
background: $l5r5e-white;
|
||||
padding: 0.5rem;
|
||||
flex-wrap: wrap;
|
||||
&.tab[data-tab] {
|
||||
&.active {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
.skills-wrapper,
|
||||
.feats-wrapper {
|
||||
flex: 50%;
|
||||
> li {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
font-size: 0.75rem;
|
||||
margin: 0 0 1rem;
|
||||
border: 1px solid $l5r5e-title;
|
||||
--notchSize: 0.75rem;
|
||||
clip-path: polygon(
|
||||
0 var(--notchSize),
|
||||
var(--notchSize) 0,
|
||||
100% 0,
|
||||
100% var(--notchSize),
|
||||
100% calc(100% - var(--notchSize)),
|
||||
100% 100%,
|
||||
0 100%,
|
||||
0 100%
|
||||
);
|
||||
h4 {
|
||||
flex: 100%;
|
||||
margin: 0;
|
||||
padding: 0.5rem 0.5rem 0;
|
||||
text-align: center;
|
||||
background: $l5r5e-title;
|
||||
color: $l5r5e-label;
|
||||
--notchSize: 0.5rem;
|
||||
clip-path: polygon(
|
||||
0% var(--notchSize),
|
||||
var(--notchSize) 0%,
|
||||
calc(100%) 0%,
|
||||
100% var(--notchSize),
|
||||
100% calc(100% - var(--notchSize)),
|
||||
calc(100% - var(--notchSize)) 100%,
|
||||
var(--notchSize) 100%,
|
||||
0% calc(100%)
|
||||
);
|
||||
}
|
||||
ul {
|
||||
flex: 50%;
|
||||
padding: 0.25rem 0.5rem 0.25rem 0;
|
||||
li {
|
||||
text-align: left;
|
||||
line-height: 1.5rem;
|
||||
margin: 0.25rem 0;
|
||||
&.skill {
|
||||
text-align: right;
|
||||
strong {
|
||||
color: $l5r5e-black;
|
||||
}
|
||||
&[data-skill="melee"],
|
||||
&[data-skill="ranged"],
|
||||
&[data-skill="unarmed"] {
|
||||
strong {
|
||||
float: left;
|
||||
line-height: 0.75rem;
|
||||
width: calc(100% - 1.75rem);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
&.skill-category-ring-actions {
|
||||
padding: 0.25rem 0 0.25rem 0.5rem;
|
||||
border-left: 1px solid $l5r5e-title;
|
||||
}
|
||||
}
|
||||
input {
|
||||
width: 1.5rem;
|
||||
height: 1.5rem;
|
||||
text-align: center;
|
||||
}
|
||||
&:last-child {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,38 +1,83 @@
|
||||
/* SCSS */
|
||||
|
||||
button {
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
|
||||
// sidebar
|
||||
#sidebar {
|
||||
padding: 0.5rem 0.25rem 0.5rem 0.5rem;
|
||||
background-position: top;
|
||||
background-size: 100%;
|
||||
background-repeat: no-repeat;
|
||||
background: url("../assets/ui/bgSidebar.png") no-repeat;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
padding: 0.5rem;
|
||||
background: url(../assets/ui/bgSidebar.webp) no-repeat;
|
||||
border: 1px solid rgb(195, 165, 130);
|
||||
border-radius: 0;
|
||||
overflow: initial;
|
||||
height: calc(100% - 1rem);
|
||||
top: 0.5rem;
|
||||
min-width: 40px;
|
||||
&:before {
|
||||
z-index: -1;
|
||||
content: "";
|
||||
position: absolute;
|
||||
height: calc(100% + 0.6rem);
|
||||
width: 100%;
|
||||
border: 1px solid rgb(195, 165, 130);
|
||||
border-radius: 0;
|
||||
top: -0.35rem;
|
||||
left: 0.25rem;
|
||||
}
|
||||
#sidebar-tabs {
|
||||
flex: 0 0 1rem;
|
||||
flex: 0 0 2rem;
|
||||
box-sizing: border-box;
|
||||
margin: 0 0 0.25rem;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.25);
|
||||
border-bottom: 1px solid rgba(195, 165, 130, 0.5);
|
||||
box-shadow: none;
|
||||
> .item {
|
||||
line-height: 27px;
|
||||
line-height: 1.6rem;
|
||||
border-radius: 100%;
|
||||
margin: 0;
|
||||
flex: 0 0 27px;
|
||||
height: 27px;
|
||||
.active {
|
||||
flex: 0 0 1.6rem;
|
||||
height: 1.6rem;
|
||||
&.active,
|
||||
&:hover {
|
||||
border: 1px solid $orange;
|
||||
box-shadow: 0 0 6px $orange;
|
||||
}
|
||||
}
|
||||
.collapse {
|
||||
position: relative;
|
||||
flex: 0 0 1.5rem;
|
||||
line-height: 1.5rem;
|
||||
color: rgb(195, 165, 130);
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
.sidebar-tab {
|
||||
.action-buttons button {
|
||||
cursor: default;
|
||||
color: $white;
|
||||
background: linear-gradient(
|
||||
$l5r5e-linear-gradient-green,
|
||||
$l5r5e-linear-gradient-green-dark,
|
||||
$l5r5e-linear-gradient-green
|
||||
);
|
||||
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-green-dark,
|
||||
$l5r5e-linear-gradient-green,
|
||||
$l5r5e-linear-gradient-green-dark
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
.message-sender {
|
||||
color: $l5r5e-red;
|
||||
}
|
||||
.chat-control-icon {
|
||||
cursor: url(../l5r-ui/ui/cursors/pointer.webp), pointer;
|
||||
}
|
||||
}
|
||||
|
||||
// hotbar
|
||||
@@ -47,24 +92,26 @@
|
||||
border-image-outset: 0;
|
||||
border-radius: 0;
|
||||
.macro-key {
|
||||
background: transparent;
|
||||
background: $l5r5e-black;
|
||||
}
|
||||
}
|
||||
#macro-list {
|
||||
background: $black;
|
||||
margin: 0;
|
||||
padding: 0.05rem;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background-position: center;
|
||||
background-size: 100%;
|
||||
background: url(../assets/ui/bgSidebar.webp) no-repeat;
|
||||
background-origin: padding-box;
|
||||
border-image: url("../assets/ui/macro-button.webp") 15 repeat;
|
||||
border-image-width: 0.5rem;
|
||||
border-image-outset: 0px;
|
||||
border: 0 none;
|
||||
box-shadow: 0.25rem 0.25rem 0.5rem $black;
|
||||
}
|
||||
}
|
||||
.bar-controls {
|
||||
background: $black;
|
||||
background-position: center;
|
||||
background-size: 100%;
|
||||
background: url(../assets/ui/bgSidebar.webp) no-repeat;
|
||||
background-origin: padding-box;
|
||||
border-image: url("../assets/ui/macro-button.webp") 15 repeat;
|
||||
border-image-width: 0.5rem;
|
||||
@@ -82,7 +129,12 @@
|
||||
|
||||
// players
|
||||
#players {
|
||||
background: $black;
|
||||
border-radius: 0;
|
||||
background-position: center;
|
||||
background-size: 100%;
|
||||
background: url(../assets/ui/bgSidebar.webp) no-repeat;
|
||||
background-origin: padding-box;
|
||||
border: 1px solid rgb(195, 165, 130);
|
||||
background-origin: padding-box;
|
||||
border-image: url("../assets/ui/macro-button.webp") 15 repeat;
|
||||
border-image-width: 0.5rem;
|
||||
@@ -132,6 +184,13 @@
|
||||
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-blue-dark,
|
||||
$l5r5e-linear-gradient-blue,
|
||||
$l5r5e-linear-gradient-blue-dark
|
||||
);
|
||||
}
|
||||
}
|
||||
#scene-list {
|
||||
.scene.nav-item.active {
|
||||
@@ -140,6 +199,13 @@
|
||||
$l5r5e-linear-gradient-red-dark,
|
||||
$l5r5e-linear-gradient-red
|
||||
);
|
||||
&:hover {
|
||||
background: linear-gradient(
|
||||
$l5r5e-linear-gradient-red-dark,
|
||||
$l5r5e-linear-gradient-red,
|
||||
$l5r5e-linear-gradient-red-dark
|
||||
);
|
||||
}
|
||||
}
|
||||
.scene.view,
|
||||
.scene.context {
|
||||
@@ -155,6 +221,13 @@
|
||||
border-image-width: 0.25rem;
|
||||
border-image-outset: 0px;
|
||||
box-shadow: 0 0 20px red;
|
||||
&:hover {
|
||||
background: linear-gradient(
|
||||
$l5r5e-linear-gradient-red-dark,
|
||||
$l5r5e-linear-gradient-red,
|
||||
$l5r5e-linear-gradient-red-dark
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -176,6 +249,13 @@
|
||||
border-image-width: 0.25rem;
|
||||
border-image-outset: 0px;
|
||||
box-shadow: 0 0 10px $red;
|
||||
&:hover {
|
||||
background: linear-gradient(
|
||||
$l5r5e-linear-gradient-red-dark,
|
||||
$l5r5e-linear-gradient-red,
|
||||
$l5r5e-linear-gradient-red-dark
|
||||
);
|
||||
}
|
||||
}
|
||||
.scene-control,
|
||||
.control-tool {
|
||||
@@ -188,5 +268,97 @@
|
||||
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-blue-dark,
|
||||
$l5r5e-linear-gradient-blue,
|
||||
$l5r5e-linear-gradient-blue-dark
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Chat-Message
|
||||
.chat-message {
|
||||
background-image: url("../assets/ui/chat-texture.webp");
|
||||
.message-header {
|
||||
line-height: 2rem;
|
||||
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
||||
margin-bottom: 0.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
/* #region Chat log */
|
||||
/* differentiate public roll from private or blind.
|
||||
Private uses class whisper, blind uses class blind AND whisper, Self Roll
|
||||
uses class whisper (identical to Private Roll for CSS) */
|
||||
#chat-log .message.whisper {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
#chat-log .message.whisper .message-header .message-metadata::before {
|
||||
color: rgba(88, 88, 88, 0.25);
|
||||
content: " (Private Roll) ";
|
||||
float: left;
|
||||
}
|
||||
|
||||
#chat-log .message.blind .message-header .message-metadata::before {
|
||||
color: rgba(88, 88, 88, 0.25);
|
||||
content: " (Blind Roll) " !important;
|
||||
float: left;
|
||||
}
|
||||
|
||||
// Playlist
|
||||
#playlists {
|
||||
.playlist {
|
||||
.playlist-header {
|
||||
h4 {
|
||||
font: 0.75rem $font-primary;
|
||||
text-transform: uppercase;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Settings
|
||||
#settings button {
|
||||
cursor: default;
|
||||
color: $white;
|
||||
background: linear-gradient(
|
||||
$l5r5e-linear-gradient-blue,
|
||||
$l5r5e-linear-gradient-blue-dark,
|
||||
$l5r5e-linear-gradient-blue
|
||||
);
|
||||
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-blue-dark,
|
||||
$l5r5e-linear-gradient-blue,
|
||||
$l5r5e-linear-gradient-blue-dark
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Combat
|
||||
#combat {
|
||||
#combat-round {
|
||||
.encounters {
|
||||
h3 {
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Dialog
|
||||
.dialog {
|
||||
.dialog-buttons {
|
||||
button {
|
||||
line-height: 1rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user