Skip to content

Commit

Permalink
Merge branch 'Roll20:master' into talus
Browse files Browse the repository at this point in the history
  • Loading branch information
thhesp authored Dec 9, 2023
2 parents 6c24578 + a2ab56d commit 9128c51
Show file tree
Hide file tree
Showing 262 changed files with 41,725 additions and 7,147 deletions.
75 changes: 68 additions & 7 deletions 3DX/3dx.css
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,38 @@ label, input, button, select, textarea {
width: 96%;
}

.Nivel_P__Section {
width: 4.5%;
}

.Nivel_P__Box {
align-items: center;
display: flex;
border: solid thin var(--boxborder);
border-radius: 10px;
flex-direction: column;
justify-content: center;
width: 100%;
}

.Nivel_P__Label {
background: var(--boxbg);
border-radius: 10px 10px 0 0;
padding-block: 0.3rem;
width: 100%;
}

.Nivel_P__Input {
background: none;
border: none;
padding-block: 0.3rem;
width: 100%;
}

.Column__Triple {
display: flex;
flex-direction: column;
width: 32%;
width: 29.5%;
}
.Column__Double {
display: flex;
Expand Down Expand Up @@ -527,6 +555,7 @@ label, input, button, select, textarea {
.Proficiencias__Wrap {
display: flex;
width: 50%;
margin-bottom: 0.6rem
}
.Proficiencias__Column {
align-items: center;
Expand Down Expand Up @@ -561,7 +590,6 @@ label, input, button, select, textarea {
border: none;
border-bottom: solid thin var(--boxborder);
display: flex;
padding-block: 0.3rem;
width: calc(100% - 1px);
}
.Proficiencias__Button {
Expand Down Expand Up @@ -591,7 +619,8 @@ label, input, button, select, textarea {
border-bottom: none;
display: flex;
flex-direction: column;
padding-bottom: 0.4rem;
height: 100%;
padding-bottom: 0.1rem;
width: 100%;
}
.Inventory__Label {
Expand All @@ -603,7 +632,8 @@ label, input, button, select, textarea {
.Inventory__Textarea {
background: none;
border: none;
padding-block: 0.3rem;
padding-bottom: 0.2rem;
padding-top: 0.3rem;
text-align: start;
width: 100%;
}
Expand Down Expand Up @@ -674,18 +704,24 @@ label, input, button, select, textarea {
width: 45%;
}

.Habilidades__Section {
display: flex;
flex-direction: column;
width: 25%;
}

.Habilidades__Box {
align-items: center;
display: flex;
border: solid thin var(--boxborder);
border-radius: 10px;
border-radius: 10px 10px 0px 0px;
flex-direction: column;
justify-content: flex-start;
width: 25%
width: 100%
}
.Habilidades__Label {
background: var(--boxbg);
border-radius: 10px 10px 0 0;
border-radius: 10px 10px 0px 0px;
padding-block: 0.3rem;
width: 100%;
}
Expand All @@ -696,6 +732,30 @@ label, input, button, select, textarea {
width: 100%;
}


.Beneficios__Box {
align-items: center;
display: flex;
border: solid thin var(--boxborder);
border-radius: 0px 0px 10px 10px;
flex-direction: column;
height: 100%;
justify-content: flex-start;
width: 100%
}
.Beneficios__Label {
background: var(--boxbg);
padding-block: 0.3rem;
width: 100%;
}
.Beneficios__Input {
background: none;
border: none;
padding-block: 0.3rem;
width: 100%;
}


.LeftAlign {
text-align: left;
}
Expand All @@ -718,6 +778,7 @@ label, input, button, select, textarea {
padding-inline: 2%;
padding-block: 1rem;
width: 96%;
margin-bottom: 1rem;
}
.Rolagens__Box {
align-items: center;
Expand Down
94 changes: 71 additions & 23 deletions 3DX/3dx.html

Large diffs are not rendered by default.

Binary file modified 3DX/3dx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
176 changes: 88 additions & 88 deletions Aborea_new/aborea.html

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion Achtung!_Cthulhu_2d20/Achtung!_Cthulhu_2d20.html
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ <h1>Achtung! Cthulhu</h1>
<option value="5">5</option>
</select>
</div>
</div>
</div>

<div>
<label>Description</label>
Expand Down Expand Up @@ -948,6 +948,10 @@ <h1>Achtung! Cthulhu</h1>

<section class="v_rolls">
<div>
<div>
<label>Armor</label>
<input type="number" id="attr_vehicle_Armor" name="attr_vehicle_Armor" value="0" min="0" max="99" />
</div>
<div>
<label>Brawn</label>
<!-- The visible and draggable button for the macro bar -->
Expand Down
2 changes: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ City\ of\ Mist\ Official/ @Roll20/sheetmaintainers # @nmbradley
Das\ Schwarze\ Auge\ (TDE)\ 5\ OFFICIAL\ by\ Ulisses/ @Roll20/sheetmaintainers # @Plushtoast
Deathmatch\ Island/ @Roll20/sheetmaintainers # @timdenee
Delta\ Green\ 2/ @Roll20/sheetmaintainers # @uriele
Dirty\ System/ @Roll20/sheetmaintainers # @ctotone
Draci\ Hlidka/ @Roll20/sheetmaintainers # @DraciHlidka
Dragonbane/ @Roll20/sheetmaintainers # @Kurohyou
Earthdawn\ (FASA\ Official)/ @Roll20/sheetmaintainers # @ChrisDDickey @jiboux
Expand Down Expand Up @@ -62,6 +63,7 @@ Sentinel\ Comics\ Roleplaying\ Game/ @Roll20/sheetmaintainers # @fredhicks
Sig\ City\ of\ Blades/ @Roll20/sheetmaintainers # @stevenpaulr
Sports\ Brawl\ by\ Lost\ West\ Media/ @Roll20/sheetmaintainers # @LostWestMedia
Stargate-RPG/ @Roll20/sheetmaintainers # @Anduh
Table\ Top\ Defined/ @Roll20/sheetmaintainers # @eGellman89
Tales\ from\ the\ Loop\ Official/ @Roll20/sheetmaintainers # @nmbradley
Teens\ in\ Space\ Official/ @Roll20/sheetmaintainers # @nmbradley
Tesoro-y-Gloria/ @Roll20/sheetmaintainers # @Tenfes
Expand Down
87 changes: 87 additions & 0 deletions Call_of_Cthulhu/Call_of_Cthulhu.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
@import url("https://fonts.googleapis.com/css2?family=Old+Standard+TT:wght@400;700&display=swap");

.charsheet {
font-family: "Old Standard TT", Arial;
}

.hidden {
display: none;
}

input:invalid {
border: 2px solid red;
}

.sheet-rolltemplate-stats div.sheet-template-container {
border: 2px solid black;
border-radius: 0.3em;
box-shadow: inset 0px 0px 3px 1px black;
text-align: center;
}

.sheet-rolltemplate-stats div.sheet-template-header h1,
.sheet-rolltemplate-stats div.sheet-template-header h2 {
display: inline;
color: white;
font-variant: small-caps;
font-size: 1.2em;
}

.sheet-rolltemplate-stats div.sheet-template-container .inlinerollresult {
background-color: transparent;
border: none;
font-weight: unset;
font-size: unset;
padding: unset;
}

.sheet-rolltemplate-stats div.sheet-template-header {
background-color: black;
border-bottom: 2px solid #4d4d4d;
text-transform: capitalize;
padding-bottom: 5px;
}

.sheet-rolltemplate-stats div.sheet-template-header div {
color: white;
font-size: small;
}

.sheet-rolltemplate-stats div.sheet-template-body div.sheet-template-row {
background-color: white;
padding: 1.5%;
}

.sheet-rolltemplate-stats
div.sheet-template-body
div.sheet-template-row
span.sheet-inlinerollresult {
color: black;
font-size: 1.3em;
font-weight: bold;
cursor: help;
padding: 0 3px 0 3px;
}

input.resistance-disabled {
background: white;
border: none;
text-align: center;
}

input.resistance-enabled {
text-align: center;
}

td.top-row {
border-bottom: 1px solid lightgray;
}

td.left-col {
border-right: 1px solid lightgray;
}

input.middle-cell {
font-weight: bold;
color: black;
}
Loading

0 comments on commit 9128c51

Please sign in to comment.