Merge pull request #205 from sdenec/0.4.7

0.4.7
sdenec · Jan 12, 2021 · ea4179b · ea4179b
2 parents 5464731 + 6b9a251
commit ea4179b
Show file tree

Hide file tree

Showing 16 changed files with 349 additions and 86 deletions.
diff --git a/changelog.md b/changelog.md
@@ -10,6 +10,17 @@ Additional Translations generously provided by:
 
 Thank you very much!
 
+*Version 0.4.7*
+- french translation update and localization fixes thanks Github @Nildran
+- tried to fix strange hover behaviour of ability mods
+- minor css fix for NPC CR text color
+- NPC sheets now have a toggle button for the personality infos (now hidden by default) in the biography tab
+- fix to prevent items sometimes becoming invisible when toggling the item details
+- you now can use DAE to set a "custom" formula for data.details.maxSpellPreparation to calculate your available spell preparations thanks @tposney!
+
+*Version 0.4.6*
+- fixed character art popup when pressing enter/return while editing an input field
+
 *Version 0.4.5*
 - fixed search for grid layout
 

diff --git a/src/_scss/_npc.scss b/src/_scss/_npc.scss
@@ -163,6 +163,12 @@
       margin-right: 4px;
       color: var(--secondary-color);
     }
+
+    .level {
+      [contenteditable] {
+        color: var(--secondary-color);
+      }
+    }
   }
 
   .origin-summary {
@@ -475,4 +481,21 @@
     }
   }
 
+  .left-notes.hidden {
+    display: none;
+  }
+
+  .toggle-personality-info {
+    padding: 20px 4px;
+    background: var(--faint-color);
+    border-radius: 3px;
+    margin-right: 4px;
+    color: var(--tertiary-color);
+    cursor: pointer;
+
+    &:hover {
+      color: var(--secondary-color);
+    }
+  }
+
 }
diff --git a/src/_scss/partials/_character-details.scss b/src/_scss/partials/_character-details.scss
@@ -416,14 +416,20 @@ input.ini-mod {
 	border-radius: 0;
 
 	.ability {
-		position: relative;
-	  text-align: center;
+		// position: relative;
 	  padding-bottom: 0;
 	  border-left: 1px solid var(--faint-color);
-	  display: flex;
-	  flex: 1 0 60px;
-	  flex-direction: column;
-	  padding: 0 4px;
+	  flex: 1 0 61px;
+		padding: 0 4px;
+
+		.wrapper {
+			text-align: center;
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			width: 50px;
+			margin: 0 auto;
+		}
 
 		.ability-name {
 			position: relative;
@@ -454,7 +460,7 @@ input.ini-mod {
 
 		.ability-score {
 			font-size: 24px;
-	    margin: 2px 0 2px 0;
+	    margin: 2px 0 3px 0;
 	    padding: 2px 0 0 0;
 	    text-align: center;
 	    font-family: var(--modesto);
@@ -470,19 +476,20 @@ input.ini-mod {
 		  position: relative;
 		  justify-content: space-between;
 		  align-items: center;
-		  width: 50px;
+		  width: 100%;
 		  text-align: center;
 			display: flex;
 			height: auto;
 			margin: 0 auto;
 			padding: 0;
 			opacity: initial;
 		  font-size: 10px;
-		  border: 1px solid var(--tertiary-color);
+		  box-shadow: 0 0 0 1px var(--tertiary-color);
 			border-radius: 5px;
 
 			&:hover {
 				border-radius: 0;
+				box-shadow: 0 0 0 1px var(--note-background);
 			}
 
 			&:hover ~ .mod-label {
@@ -497,24 +504,24 @@ input.ini-mod {
 
 		.mod-label {
 			position: absolute;
-			bottom: 3px;
+			top: 47px;
 			display: none;
 			background: var(--note-background);
 			color: #fff;
-			font-size: 11px;
+			font-size: 10px;
 			height: 17px;
-			padding: 2px 4px;
+			padding: 3px 4px 2px 4px;
 			white-space: nowrap;
 
 			&.ability-mod-label {
-				left: 10px;
-				transform: translate(-100%, 0);
+				right: 25px;
+				transform: translateX(-26px);
 				border-radius: 5px 0 0 5px;
 			}
 
 			&.save-mod-label {
-				right: 10px;
-				transform: translate(100%, 0);
+				left: 25px;
+				transform: translateX(26px);
 				border-radius: 0 5px 5px 0;
 			}
 		}
@@ -527,19 +534,12 @@ input.ini-mod {
 			opacity: .4;
 			transition: opacity .3s ease;
 			cursor: pointer;
-			padding: 0 3px;
-			text-align: right;
 		}
 
 		.ability-mod {
 			background: var(--ability-accent);
 			color: #fff;
-			border-radius: 3px 0 0 3px;
-		}
-
-		.ability-save {
-			border-left: 1px solid var(--primary-color);
-			text-align: left;
+			border-radius: 5px 0 0 5px;
 		}
 
 		.ability-mod:hover,

diff --git a/src/_scss/partials/_inventory.scss b/src/_scss/partials/_inventory.scss
@@ -767,7 +767,7 @@
 
 			.item-name {
 				display: flex;
-				flex: 1;
+				flex: 1 1 1px;
 				cursor: default;
 				flex-wrap: nowrap;
 				font-size: 12px;

diff --git a/src/css/tidy5e.css b/src/css/tidy5e.css
@@ -1324,14 +1324,19 @@
 }
 
 .tidy5e.sheet.actor .ability-scores .ability {
-  position: relative;
-  text-align: center;
   padding-bottom: 0;
   border-left: 1px solid var(--faint-color);
+  flex: 1 0 61px;
+  padding: 0 4px;
+}
+
+.tidy5e.sheet.actor .ability-scores .ability .wrapper {
+  text-align: center;
+  position: relative;
   display: flex;
-  flex: 1 0 60px;
   flex-direction: column;
-  padding: 0 4px;
+  width: 50px;
+  margin: 0 auto;
 }
 
 .tidy5e.sheet.actor .ability-scores .ability .ability-name {
@@ -1363,7 +1368,7 @@
 
 .tidy5e.sheet.actor .ability-scores .ability .ability-score {
   font-size: 24px;
-  margin: 2px 0 2px 0;
+  margin: 2px 0 3px 0;
   padding: 2px 0 0 0;
   text-align: center;
   font-family: var(--modesto);
@@ -1379,20 +1384,21 @@
   position: relative;
   justify-content: space-between;
   align-items: center;
-  width: 50px;
+  width: 100%;
   text-align: center;
   display: flex;
   height: auto;
   margin: 0 auto;
   padding: 0;
   opacity: initial;
   font-size: 10px;
-  border: 1px solid var(--tertiary-color);
+  box-shadow: 0 0 0 1px var(--tertiary-color);
   border-radius: 5px;
 }
 
 .tidy5e.sheet.actor .ability-scores .ability .ability-modifiers:hover {
   border-radius: 0;
+  box-shadow: 0 0 0 1px var(--note-background);
 }
 
 .tidy5e.sheet.actor .ability-scores .ability .ability-modifiers:hover ~ .mod-label {
@@ -1406,25 +1412,25 @@
 
 .tidy5e.sheet.actor .ability-scores .ability .mod-label {
   position: absolute;
-  bottom: 3px;
+  top: 47px;
   display: none;
   background: var(--note-background);
   color: #fff;
-  font-size: 11px;
+  font-size: 10px;
   height: 17px;
-  padding: 2px 4px;
+  padding: 3px 4px 2px 4px;
   white-space: nowrap;
 }
 
 .tidy5e.sheet.actor .ability-scores .ability .mod-label.ability-mod-label {
-  left: 10px;
-  transform: translate(-100%, 0);
+  right: 25px;
+  transform: translateX(-26px);
   border-radius: 5px 0 0 5px;
 }
 
 .tidy5e.sheet.actor .ability-scores .ability .mod-label.save-mod-label {
-  right: 10px;
-  transform: translate(100%, 0);
+  left: 25px;
+  transform: translateX(26px);
   border-radius: 0 5px 5px 0;
 }
 
@@ -1436,19 +1442,12 @@
   opacity: .4;
   transition: opacity .3s ease;
   cursor: pointer;
-  padding: 0 3px;
-  text-align: right;
 }
 
 .tidy5e.sheet.actor .ability-scores .ability .ability-mod {
   background: var(--ability-accent);
   color: #fff;
-  border-radius: 3px 0 0 3px;
-}
-
-.tidy5e.sheet.actor .ability-scores .ability .ability-save {
-  border-left: 1px solid var(--primary-color);
-  text-align: left;
+  border-radius: 5px 0 0 5px;
 }
 
 .tidy5e.sheet.actor .ability-scores .ability .ability-mod:hover,
@@ -2808,7 +2807,7 @@
 
 .tidy5e.sheet.actor .list-layout .items-list .item .item-name {
   display: flex;
-  flex: 1;
+  flex: 1 1 1px;
   cursor: default;
   flex-wrap: nowrap;
   font-size: 12px;
@@ -3679,6 +3678,10 @@
   color: var(--secondary-color);
 }
 
+.tidy5e.sheet.actor.npc .level-information .level [contenteditable] {
+  color: var(--secondary-color);
+}
+
 .tidy5e.sheet.actor.npc .origin-summary .environment {
   position: relative;
   top: -1px;
@@ -3961,6 +3964,23 @@
   font-size: 12px;
 }
 
+.tidy5e.sheet.actor.npc .left-notes.hidden {
+  display: none;
+}
+
+.tidy5e.sheet.actor.npc .toggle-personality-info {
+  padding: 20px 4px;
+  background: var(--faint-color);
+  border-radius: 3px;
+  margin-right: 4px;
+  color: var(--tertiary-color);
+  cursor: pointer;
+}
+
+.tidy5e.sheet.actor.npc .toggle-personality-info:hover {
+  color: var(--secondary-color);
+}
+
 .tidy5e.sheet.actor.vehicle {
   min-width: 690px;
   min-height: 210px;

diff --git a/src/lang/de.json b/src/lang/de.json
@@ -26,6 +26,7 @@
 	"TIDY5E.JournalQuests": "Aufträge",
 	"TIDY5E.JournalMisc": "Verschiedenes",
 	"TIDY5E.JournalEntries": "Tagebucheinträge",
+	"TIDY5E.TogglePersonalityInfo": "Persönlichkeits-Infos umschalten",
 
 	"TIDY5E.EnableEdit": "Bearbeiten erlauben",
 	"TIDY5E.DisableEdit": "Bearbeiten verbieten",

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -26,6 +26,7 @@
 	"TIDY5E.JournalQuests": "Quests",
 	"TIDY5E.JournalMisc": "Miscellaneous",
 	"TIDY5E.JournalEntries": "Journal Entries",
+	"TIDY5E.TogglePersonalityInfo": "Toggle Personality Info",
 
 	"TIDY5E.EnableEdit": "Enable Edit",
 	"TIDY5E.DisableEdit": "Disable Edit",

diff --git a/src/lang/fr.json b/src/lang/fr.json
@@ -29,6 +29,7 @@
 	"TIDY5E.BioFlaws": "Défauts",
 	"TIDY5E.BioAppearance": "Apparence",
 	"TIDY5E.BioBackground": "Background/Biographie",
+	"TIDY5E.TogglePersonalityInfo": "Informations de personnalité",
 
 	"TIDY5E.JournalPoi": "Personnages Importants",
 	"TIDY5E.JournalLoi": "Lieux Importants",
@@ -43,6 +44,17 @@
 
 	"TIDY5E.ConvertCurrencyHint": "convertir la monnaie en devise la plus haute",
 	"TIDY5E.ConvertCurrencyButton": "convertir",
+
+	"TIDY5E.CurrencyAbbrCP" : "PC",
+	"TIDY5E.CurrencyAbbrSP" : "PA",
+	"TIDY5E.CurrencyAbbrGP" : "PO",
+	"TIDY5E.CurrencyAbbrEP" : "PE",
+	"TIDY5E.CurrencyAbbrPP" : "PP",
+
+	"TIDY5E.SearchItem" : "rechercher objet",
+	"TIDY5E.SearchSpell" : "rechercher sort",
+	"TIDY5E.SearchClear" : "annuler la recherche",
+	"TIDY5E.SearchHint" : "Entrer ce que vous recherchez",
 
 	"TIDY5E.Encumbrance": "Encombrement",
 
@@ -73,6 +85,16 @@
 	"TIDY5E.Environment" : "Environnement",
 
 	"TIDY5E.AbbrMod" : "Mod",
+	"TIDY5E.AbbrSavingThrow" : "Sauvegarde",
+	"TIDY5E.SpellAttackMod" : "Bonus d'attaque",
+	"TIDY5E.PreparedSpells" : "Sorts préparés",
+	"TIDY5E.PreparedSpellsMax" : "Maximum de sorts préparés",
+	"TIDY5E.Components" : "Compo",
+	"TIDY5E.SpellSchool" : "École",
+
+	"TIDY5E.AttunementWarning": "Attention : Vous ne pouvez pas harmoniser plus de {number} objets !",
+	"TIDY5E.AttunementItems": "Objets harmonisés",
+	"TIDY5E.AttunementMax": "Harmonisation maximum",
 
 
 	"TIDY5E.Settings.PcLabel" : "PC Sheets: ",
@@ -166,4 +188,4 @@
 		"name" : "Highlight sheet when not linked to actor.",
 		"hint" : "When you find yourself editing the wrong NPC Sheet you can have unlinked sheets visually highlighted."
 	}
-}
+}