fix: 🐛 Reset font size scale, various style fixes

Fixes #268, fixes #266, and fixes #267
fvtt-fria-ligan · Nov 2, 2022 · 18a23cd · 18a23cd
1 parent 257fe00
commit 18a23cd
Show file tree

Hide file tree

Showing 28 changed files with 171 additions and 249 deletions.
diff --git a/src/actor/party/templates/sheet-tabs/travel-tab.hbs b/src/actor/party/templates/sheet-tabs/travel-tab.hbs
@@ -1,4 +1,4 @@
-<div class="flex column full" style="overflow-y: auto">
+<div class="flex column full" style="overflow: hidden auto">
 	<div class="tab-hint">{{localize "FLPS.PARTY.HINT_ASSIGN"}}</div>
 	<form>
 		<button class="reset">{{localize "FLPS.TRAVEL.RESET"}}</button>

diff --git a/src/components/modifiers-component.hbs b/src/components/modifiers-component.hbs
@@ -55,7 +55,7 @@
         {{#if (or (eq ../type "gear") (eq ../type "weapon") (eq ../type "armor"))}}
             <div class="flex row align-center" title="{{localize "ITEM.ROLL_MODIFIERS_USEGEAR"}}">
                 <input type="checkbox" name="system.rollModifiers.{{@key}}.gearBonus" id="{{../_id}}.{{@key}}.gearBonusToggle" {{checked modifier.gearBonus}} />
-                <label for="{{../_id}}.{{@key}}.gearBonusToggle" style="white-space: nowrap; font-size: var(--font-size--small);">{{localize "ITEM.ROLL_MODIFIERS_USEGEAR"}}</label>
+                <label for="{{../_id}}.{{@key}}.gearBonusToggle" style="white-space: nowrap; font-size: var(--font-size-12);">{{localize "ITEM.ROLL_MODIFIERS_USEGEAR"}}</label>
             </div>
         {{/if}}
         {{#unless modifier.gearBonus}}

diff --git a/src/components/roll-engine/templates/roll.hbs b/src/components/roll-engine/templates/roll.hbs
@@ -76,4 +76,4 @@
 			{{localize "PUSH"}}
 		</button>
 	</div>
-{{/if}}
+{{/if}}
diff --git a/src/journal/adventure-sites/styles/index.scss b/src/journal/adventure-sites/styles/index.scss
@@ -26,7 +26,7 @@
 
 		em {
 			font-family: "Branding", "Poppins", sans-serif;
-			font-size: var(--font-size--default);
+			font-size: var(--font-size-16);
 			color: #111c;
 		}
 

diff --git a/src/legacy-styles/components/_character-generator.scss b/src/legacy-styles/components/_character-generator.scss
@@ -36,7 +36,7 @@
 
 .chargen-title {
 	margin-top: 20px;
-	font-size: var(--font-size--large);
+	font-size: var(--font-size-18);
 	font-family: "IM Fell DW Pica";
 	font-weight: 600;
 	text-transform: uppercase;
@@ -45,7 +45,7 @@
 
 .chargen-description {
 	font-family: "IM Fell Great Primer";
-	font-size: var(--font-size--default);
+	font-size: var(--font-size-16);
 	text-align: justify;
 	margin: 20px 0;
 	line-height: 1.35;
@@ -77,7 +77,7 @@
 	margin-left: 30px;
 	font-family: "IM FELL DW Pica";
 	justify-content: space-around;
-	font-size: var(--font-size--default);
+	font-size: var(--font-size-16);
 	background: #fff;
 	border-image-outset: 3px;
 }

diff --git a/src/legacy-styles/components/_chat.scss b/src/legacy-styles/components/_chat.scss
@@ -3,13 +3,13 @@
 	border-radius: 3px;
 	color: var(--color-foreground);
 	font-family: var(--font-table);
-	font-size: var(--font-size--very-small);
+	font-size: var(--font-size-12);
 	line-height: 16px;
 	padding: 8px;
 }
 
 .chat-message .message-header .message-metadata {
-	font-size: var(--font-size--extra-small);
+	font-size: var(--font-size-12);
 }
 
 .forbidden-lands.chat-item .border {
@@ -23,14 +23,14 @@
 }
 .forbidden-lands.chat-item h3 {
 	font-family: var(--font-subheader);
-	font-size: var(--font-size--small);
+	font-size: var(--font-size-14);
 	font-weight: bold;
 	margin: 0 0 8px;
 	text-align: center;
 }
 .forbidden-lands.chat-item h4 {
 	font-family: var(--font-special);
-	font-size: var(--font-size--small);
+	font-size: var(--font-size-14);
 	font-weight: bold;
 	margin: 0 0 8px;
 	text-align: center;
@@ -39,7 +39,7 @@
 	margin-top: -8px;
 }
 .forbidden-lands.chat-item img {
-	background: radial-gradient(closest-side, var(--color-highlight) 0%, transparent 100%);
+	background: radial-gradient(closest-side, var(--color-highlight) 0%, white 100%);
 	border: 0;
 	display: block;
 	margin: 0 auto 8px;

diff --git a/src/legacy-styles/components/_dialog.scss b/src/legacy-styles/components/_dialog.scss
@@ -10,7 +10,7 @@
 		text-transform: uppercase;
 		border-bottom: none;
 		font-weight: bold;
-		font-size: 1.8rem;
+		font-size: var(--font-size-18);
 	}
 
 	h3 {
@@ -96,7 +96,6 @@
 			background: #eee;
 			padding: 0.3em 2em;
 			font-weight: normal;
-			font-size: max(1rem, 100%);
 			border: 2px groove #e0e0e0;
 			width: 100%;
 			display: flex;
@@ -123,8 +122,8 @@
 
 	.display-numbers {
 		font-family: var(--font-subheader);
-		font-size: 8rem;
-		line-height: 8rem;
+		font-size: var(--font-size-48);
+		line-height: var(--font-size-48);
 	}
 
 	.spell-options {

diff --git a/src/legacy-styles/components/_editor-override.scss b/src/legacy-styles/components/_editor-override.scss
@@ -28,9 +28,12 @@
 .app.sheet.actor {
 	.editor,
 	.journal-entry-content {
+		font-family: var(--font-editor);
+		font-size: var(--font-size-18);
+
 		.journal-header > input[name="name"] {
 			font-family: "IM Fell Three Line Pica";
-			font-size: 4rem;
+			font-size: var(--font-size-32);
 			text-transform: uppercase;
 			text-align: center;
 			line-height: 2;
@@ -49,96 +52,49 @@
 				box-shadow: none;
 			}
 		}
+		#{utils.fromTo(h,1,6)} {
+			font-family: "IM Fell Three Line Pica";
+			text-transform: uppercase;
+			text-indent: 0px;
+			text-align: center;
+			border: unset;
+		}
+		h5 {
+			margin: 0px auto;
+			font-family: "IM Fell Three Line Pica";
+			text-transform: uppercase;
+			border-top: 1px solid black;
+			padding-top: 4px;
+		}
+		ul {
+			list-style-type: "\2725      ";
 
-		.editor-content,
-		.journal-entry-page.text {
-			width: 100%;
-			height: 100%;
-			font-family: "IM Fell Great Primer";
-			font-size: var(--font-size--large);
-			line-height: 1.6;
-			text-shadow: 0 0 1px rgba(0, 0, 0, 0.3);
-			color: #333;
-			padding: 0 3em;
-			display: flex;
-			flex-flow: column;
-			overflow-y: auto;
-
-			.fbl-core:not(.gear-table) {
-				max-width: 70ch;
-				margin-inline: auto;
+			li::marker {
+				font-size: var(--font-size-14);
 			}
+		}
+		table {
+			background: transparent;
+			font-family: var(--font-table);
+			font-size: var(--font-size-14);
+			border: none;
 
-			#{utils.fromTo(h,1,6)} {
-				font-family: "IM Fell Three Line Pica";
-				text-transform: uppercase;
-				text-indent: 0px;
-				text-align: center;
-				border: unset;
-			}
-			h5 {
-				margin: 0px auto;
-				font-family: "IM Fell Three Line Pica";
-				text-transform: uppercase;
-				border-top: 1px solid black;
-				width: 18%;
-				padding-top: 4px;
-			}
-			p {
-				width: 100%;
-			}
-			p + p {
-				text-indent: 14px;
-				margin-top: -0.5em;
-				a.entity-link {
-					text-indent: 0px;
-				}
-			}
-			blockquote {
-				margin: 20px auto;
-				max-width: 55ch;
-				padding: 0 50px;
-				font-size: 2.4rem;
-				font-style: italic;
-				border: unset;
-			}
-			ul {
-				list-style-type: "✥";
-				margin: 0.5em auto;
-				text-indent: 0px;
+			thead {
+				background: transparent;
+				color: var(--color-text-dark-primary);
+				text-shadow: none;
 
-				li {
-					padding-left: 1rem;
-				}
+				border: none;
+				border-bottom: 2px solid var(--color-border);
 			}
-			table {
-				font-family: "Poppins";
-				font-size: var(--font-size--small);
-				line-height: 1;
-				padding: 25px 0;
-				max-width: 100%;
+
+			tr {
 				border: none;
-				border-collapse: collapse;
-				margin: auto;
-				margin-bottom: 15px;
-				h4 {
-					font-family: "Poppins";
-					font-weight: bold;
-					margin: 0;
-					text-align: left;
-					text-transform: uppercase;
-				}
-				tr:nth-child(2) {
-					border-top: 1px solid #7a7971;
-				}
-				tr:nth-child(even) {
-					background-color: rgb(170, 170, 170);
-				}
-				td {
-					padding-right: 10px;
-					p {
-						text-indent: 0;
-					}
+				border-bottom: 1px solid var(--color-border);
+				padding: 0.5rem;
+
+				&:nth-child(odd):not(:has(th)) {
+					background-color: #cbcccb;
 				}
 			}
 		}
@@ -149,8 +105,6 @@
 .editor:hover,
 .journal-entry-page.text:focus .edit-container,
 .journal-entry-page.text:hover .edit-container {
-	height: unset;
-
 	.editor-edit {
 		background: #cccd;
 		border: none;
@@ -163,30 +117,7 @@
 		z-index: 100;
 
 		i {
-			font-size: 1.5rem;
+			font-size: var(--font-size-16);
 		}
 	}
 }
-
-.app.journal-sheet form > button[type="submit"] {
-	position: absolute;
-	bottom: 10px;
-	width: 20%;
-	background: #fff;
-	font-weight: 600;
-	left: 50%;
-	transform: translateX(-50%);
-	border: 1px solid transparent;
-	border-image: url(./assets/journal-art/box-border-large.webp) 28/7 repeat;
-	border-image-outset: 6;
-	background-color: #fff;
-	opacity: 0;
-	transition: opacity 0.3s cubic-bezier(0.39, 0.58, 0.57, 1);
-
-	&:focus-visible,
-	&:hover {
-		opacity: 1;
-		box-shadow: none;
-		filter: drop-shadow(0 0 2px #111);
-	}
-}
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,4 +76,4 @@ @@
     			{{localize "PUSH"}}
     		</button>
     	</div>
-    {{/if}}
+    {{/if}}