Merge pull request #13147 from chase-devil/master

BASH Ultimate Edition - Fixing bug, please apply this ASAP
Roll20 · Aug 1, 2024 · 19aeb7c · 19aeb7c
2 parents 846f70b + 0566f70
commit 19aeb7c
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 194 deletions.
diff --git a/BASH Ultimate Edition/BASH.css b/BASH Ultimate Edition/BASH.css
@@ -1,7 +1,6 @@
 @import url('https://fonts.googleapis.com/css2?family=Bangers&display=swap');
 .charsheet {
 	box-sizing: border-box;
-	color: black;
 	text-transform: uppercase;
 	font-family: "Bangers"; 
 	letter-spacing: 0.05em;
@@ -12,10 +11,9 @@
 .charsheet input {
 	width: 100%;
 	border: none;
-	border-radius: 0;
 	text-align: center;
 	color: black;
-	background-color: var(--color-surface2);
+	background-color: white;
 	letter-spacing: 0.05em;
 }
 .charsheet input.sheet-atts {
@@ -30,30 +28,66 @@
 }
 .charsheet textarea {
 	border: none; 
-	font-size: .85em;
-	letter-spacing: 0.05em;
-	height:auto;
+	width:95%; 
+	font-size: .75em;
 }
 .charsheet details summary{
 	cursor: pointer;
 }
-.charsheet label{
-	display: inline;
+.charsheet textarea{
+	height:auto;
+}
+
+/*--------Tables--------*/
+.charsheet table,
+.charsheet tr,
+.charsheet th,
+.charsheet td {
+	border: 1px solid #a1a1a1;
+	text-align: center;
+	background-color: white;
 	color: black;
-	font-weight: inherit;
-	font-size: inherit;
-	margin-bottom: unset;
-	padding: 0;
-	text-wrap: nowrap;	
 }
-.charsheet .heropointsbox > *{
-	display: grid;
-	grid-template-columns: 8em auto;
+
+.charsheet td.sheet-gray {
+	background-color: #dadada;
+}
+
+.charsheet td.sheet-green {
+	background-color: #00ff4c;
+}
+
+.charsheet td.sheet-yellow {
+	background-color: #ffff4e;
+}
+
+.charsheet td.sheet-orange {
+	background-color: #ff942e;
+}
+
+.charsheet td.sheet-red {
+	background-color: #ff000d;
+}
+
+.charsheet td.sheet-violet {
+	background-color: #ff00f8;
+}
+
+.charsheet td.sheet-purple {
+	background-color: #d499fa;
+}
+
+.charsheet td.sheet-lightblue {
+	background-color: #00d0fc;
+}
+
+.charsheet td.sheet-blue {
+	background-color: #006bf8;
 }
-.charsheet .
 .charsheet button{
 	letter-spacing: 0.05em;
 }
+
 .charsheet .repcontrol_add,
 .charsheet .repcontrol_edit,
 .charsheet .repcontrol_del {
@@ -67,7 +101,6 @@
     font-size:0.75em;
     /*height:1.5em;*/
     border-radius: 0;
-	letter-spacing: 0.1em;
 }
 .charsheet div.sheet-attTitle {
 	display: inline-block;
@@ -101,15 +134,6 @@
 	border: 1px solid #1b608e; 
 	text-align: left;
 }
-.charsheet .blue-box .sheet-standardBox {
-	box-shadow: none;
-	background-color: white;
-}
-.charsheet .two-column{
-	display: grid;
-	grid-template-columns: auto auto;
-	grid-gap: 1em;
-}
 .charsheet .sheet-weaponCell {
 	display: inline-block;
 	color: black;
@@ -131,6 +155,10 @@
 	-webkit-appearance: none; 
 	margin: 0; 
 }
+.sheet-standardBox label{
+	display: inline;
+	padding: 0;
+}
 .ui-dialog .btn{
 	text-shadow: none;
 }
@@ -146,18 +174,6 @@
 .ui-dialog .smallinputs input[type=number]{
 	width: 1.5em;
 }
-/*------Equipment------*/
-.charsheet .equipmentGrid{
-	display: grid;
-	grid-template-columns: max-content 1fr max-content;
-	align-items: center;
-}
-.charsheet .money{
-	display: grid;
-	gap: 0.4em;
-	grid-template-columns: max-content 8em;
-	align-items: center;
-}
 
 /*-----Powers and Attacks----*/
 .blue-box{
@@ -169,50 +185,6 @@
 .blue-box summary{
 	color: gray;
 }
-.charsheet .powerGrid{
-	display: grid;
-	grid-template-columns: max-content 1fr max-content;
-}
-.charsheet .energy{
-	padding-left: 1.2em;
-	width: max-content;
-	margin-top: auto;
-}
-.charsheet .energy input{
-	padding: 0;
-}
-.charsheet label.powers-note{
-	display: grid;
-	grid-template-columns: max-content auto;	
-	align-items: center;
-	grid-gap: 1em;
-	color: gray;
-}
-.charsheet label.powers-note input{
-	text-align: left;
-	color: #555;
-}
-.charsheet button[type=roll].sheet-powerButton,
-.charsheet .attackHeader {
-	font-size: 3em; 
-	background-color: transparent;
-	font-weight: normal;
-	color: #ffff4e; 
-	background-image: none;
-	margin: 0.5rem 0.5rem 0;
-	border: none;
-	box-shadow: none;
-	line-height: normal;
-}
-
-.sheet-standardBox button[type=roll].sheet-powerButton:hover,
-button[type=roll]:hover * {
-    color: #FFCC00;
-}
-.charsheet .attackGrid{
-	display: grid;
-	grid-template-columns: 1fr repeat(3, max-content);
-}
 
 /*----Action roll templates----*/
 .sheet-rolltemplate-stats .sheet-comic,
@@ -414,52 +386,21 @@ button[type=roll].sheet-textButton * {
     pointer-events: none;
 }
 
-/*--------Tables--------*/
-.charsheet table,
-.charsheet tr,
-.charsheet th,
-.charsheet td {
-	border: 1px solid #a1a1a1;
-	text-align: center;
-	background-color: white;
-	color: black;
-}
-
-.charsheet td {
-	width: 1%;
-}
-.charsheet td.sheet-gray {
-	background-color: #dadada;
-}
-
-.charsheet td.sheet-green {
-	background-color: #00ff4c;
-}
-
-.charsheet td.sheet-yellow {
-	background-color: #ffff4e;
-}
-
-.charsheet td.sheet-orange {
-	background-color: #ff942e;
-}
-
-.charsheet td.sheet-red {
-	background-color: #ff000d;
-}
-
-.charsheet td.sheet-violet {
-	background-color: #ff00f8;
+.charsheet button[type=roll].sheet-powerButton {
+	font-size: 2.5em; 
+	background-color: transparent;
+	font-weight: normal;
+	color: #ffff4e; 
+	background-image: none;
+	padding: 0px;
+	padding-top: 5px;
+	border: none;
+	box-shadow: none;
 }
 
-.charsheet td.sheet-purple {
-	background-color: #d499fa;
+.sheet-standardBox button[type=roll].sheet-powerButton:hover,
+button[type=roll]:hover * {
+    color: #FFCC00;
 }
 
-.charsheet td.sheet-lightblue {
-	background-color: #00d0fc;
-}
 
-.charsheet td.sheet-blue {
-	background-color: #006bf8;
-}