Skip to content

Commit

Permalink
Merge pull request #11 from Roll20/master
Browse files Browse the repository at this point in the history
Update from Master
  • Loading branch information
Lockbox313 committed Dec 17, 2017
2 parents 3159ff1 + 4972837 commit ac05581
Show file tree
Hide file tree
Showing 215 changed files with 36,468 additions and 13,030 deletions.
8 changes: 4 additions & 4 deletions 5eShaped/5eShaped.html

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions 5eShaped/changelog.md
Expand Up @@ -11,6 +11,13 @@ Bugs fall into the patch category.

The sheet will always upgrade itself unless I specify otherwise, though some things like roll template fields changing will require users who have added custom macros to fix.

## 15.5.9

### Bug Fixes

* [#633: Hit dice and level field not displaying properly for sheets from versions before 15.5.5](https://bitbucket.org/mlenser/5eshaped/issues/633/hit-dice-and-level-field-not-displaying)
* [#631: Delay/No Response to using Short and Long Rest buttons](https://bitbucket.org/mlenser/5eshaped/issues/631/delay-no-response-to-using-short-and-long)

## 15.5.8

### Bug Fixes
Expand Down
26 changes: 15 additions & 11 deletions AD&D_1E/1ESheet.css
@@ -1,4 +1,9 @@
/* background toggle*/
/* abilities */
div.sheet-abilities tr td.sheet-center:first-child {background-color: #1f1f1f; color: #fff; font-family: serif; width:4.5em;}
div.sheet-abilities tr td:nth-child(2) {width: 14%; text-align: center; white-space: nowrap;}
div.sheet-abilities tr td:nth-child(2) input.sheet-input-small {width: 50%;}

/* background toggle */
.sheet-wrapper {margin:5px; padding:0}
.sheet-useBackground input[value="1"]:checked ~ .sheet-background { background-image:none; background-color:white;}
.sheet-useBackground input[value="2"]:checked ~ .sheet-background { background-image:url("http://i.imgur.com/izwlEug.jpg"); background-size: cover; background-position: center top;}
Expand All @@ -15,9 +20,9 @@ table, tr {width:100%;}
table, tr, td {font-size:12px; font-weight:bold;}

input {border:1px transparent; border-bottom:1px solid; background-color:transparent; text-align:center; font-family:cursive; font-size:1.1em; color:#262626;}
.sheet-input-small {width:3.5em; height:1.85em;}
.sheet-input-medium {width:80%; height:1.85em;}
.sheet-input-large {width:100%; height:1.85em;}
.sheet-input-small, input[type="number"].sheet-input-small, input[type="text"].sheet-input-small {width:2.75em; height:1.85em;}
.sheet-input-medium, input[type="number"].sheet-input-medium, input[type="text"].sheet-input-medium {width:80%; height:1.85em;}
.sheet-input-large, input[type="number"].sheet-input-large, input[type="number"].sheet-input-large {width:100%; height:1.85em;}
input[disabled], select[disabled], textarea[disabled], input[readonly] {cursor:not-allowed; background-color:rgba(245, 245, 245, 0.85);}

select {background-color:transparent;}
Expand All @@ -42,14 +47,15 @@ input[type="checkbox"]:checked + span:not(.sheet-not-sheet-show)::before {conten
input[type="checkbox"].sheet-counted + span:not(.sheet-not-sheet-show)::before {counter-increment: sheet-rep-items; content: counter(sheet-rep-items) '. '; width:auto;}
input[type="checkbox"].sheet-counted:checked + span:not(.sheet-not-sheet-show)::before {counter-increment: sheet-rep-items; content: counter(sheet-rep-items) '. '; width:auto;}

.sheet-personal_attributes,.sheet-abilities,.sheet-saves,.sheet-weapons,.sheet-to_hit_AC,.sheet-thief_skills,
.sheet-wealth,.sheet-equipment,.sheet-special_abilities,.sheet-spells,.sheet-notes {margin-top:0;}
.sheet-personal_attributes,.sheet-abilities,.sheet-saves,.sheet-weapons,.sheet-to_hit_AC,.sheet-thac0,.sheet-thief_skills,
.sheet-wealth,.sheet-equipment,.sheet-special_abilities,.sheet-nonweapon_proficiencies,.sheet-spells,.sheet-notes {margin-top:0;}

/*to-hit AC*/
.sheet-box {border: 1px solid #000; height:30px; width:50px; font-size:14px;}
tr.sheet-to-hit td:nth-child(odd){background-color:rgba(148, 148, 148, 0.5); color:#ffffff;}
tr.sheet-to-hit td:nth-child(even){background-color:rgba(236, 236, 236, 0.85);}
.sheet-to-hit-input input {width:108%; height:24px; text-align:center;}
.sheet-to-hit-input input {width:100%; height:24px; text-align:center;}
.sheet-rolltemplate-attacks .sheet-ToHit strong, .sheet-rolltemplate-attacks .sheet-ToHit span {min-width: 1.1em;}

div.sheet-footer span.sheet-data input[type="text"] {width:21em; height:1.5em; border:none; background-color:transparent; margin-top:-2px;}

Expand Down Expand Up @@ -112,14 +118,14 @@ textarea.sheet-macro-text {width:5.5em; resize:vertical; height:1.3em; overflow:

.sheet-rolltemplate-attacks .sheet-ToHit {
font-family: monospace;
font-size: 12px;
font-size: 10px;
line-height: .80em !important;
}

.sheet-rolltemplate-attacks td.sheet-ToHit .inlinerollresult {
border: none;
padding: 2px 0 0 0;
font-size: 12px;
font-size: 10px;
}

.sheet-rolltemplate-attacks tr:nth-child(odd) {
Expand Down Expand Up @@ -290,8 +296,6 @@ textarea.sheet-macro-text {width:5.5em; resize:vertical; height:1.3em; overflow:
background-color:#430054;
}



.sheet-rolltemplate-general .sheet-tcat {
font-weight: bold;
}
Expand Down

0 comments on commit ac05581

Please sign in to comment.