Merge branch 'Develop' into Develop-VJ

This commit is contained in:
CK 2021-01-04 16:16:01 -05:00 committed by GitHub
commit fb99bfeff6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 619 additions and 620 deletions

View file

@ -489,7 +489,6 @@
&.item-action {flex: 0 0 100px}
&.attunement {flex: 0 0 24px}
}
.item-weight {
flex: 0 0 60px;
border-left: 1px solid @colorFaint;

File diff suppressed because it is too large Load diff

View file

@ -292,4 +292,4 @@ export default class ActorSheet5eCharacter extends ActorSheet5e {
// Default drop handling if levels were not added
super._onDropItemCreate(itemData);
}
}
}