Merge pull request #4249 from clevett/master

D&D 5e by Roll20: Improved Global Fields
This commit is contained in:
Cassie Levett
2018-10-02 09:02:42 -05:00
committed by GitHub
2 changed files with 29 additions and 20 deletions
@@ -654,6 +654,10 @@ button[type=roll] * {
margin-top: 5px;
}
.sheet-globalattack span {
margin-top: 2px;
}
.sheet-globalattack.sheet-acmod .sheet-display span span {
display: inline;
}
@@ -1205,7 +1209,7 @@ button[type=roll] * {
display: none;
}
.sheet-textbox .sheet-display {
.sheet-col3 .sheet-textbox .sheet-display {
padding: 5px 5px 5px 10px;
}
@@ -3461,7 +3465,7 @@ span.sheet-spellconcentration
}
.sheet-globalattack textarea {
width: 200px;
width: 95%;
display: inline;
height: 25px;
margin: 1px;
@@ -4034,10 +4038,10 @@ span.sheet-spellconcentration
}
.sheet-charmancer .sheet-mancer_progress {
width: 100%;
border: 2px solid black;
height: 10px;
margin-top: 1.5em;
width: 100%;
}
.sheet-charmancer .sheet-mancer_progress div {
@@ -4064,39 +4068,40 @@ body:not(:-moz-handler-blocked) .sheet-charmancer .sheet-bottombar {
}
.sheet-pc .sheet-global-mod .sheet-options-flag:not(:checked) ~ .sheet-display .sheet-title {
background-color: #EFEFEF;
border-bottom-right-radius: 5px;
border-top-left-radius: 5px;
display: inline-block;
font-size: 9px;
font-weight: bold;
padding-top: 3px;
line-height: 16px;
padding-bottom: 3px;
padding-left: 4px;
padding-right: 4px;
display: inline-block;
width: 100%;
background-color: #EFEFEF;
line-height: 16px;
border-top-left-radius: 5px;
border-bottom-right-radius: 5px;
padding-top: 3px;
text-align: left;
width: 100%;
}
.sheet-pc .sheet-global-mod .sheet-options-flag:not(:checked) ~ .sheet-display .sheet-subheader {
background-color: #EFEFEF;
border-bottom-right-radius: 5px;
border-top-left-radius: 5px;
display: inline-block;
font-size: 9px;
font-weight: bold;
padding-top: 3px;
height: 16px;
padding-bottom: 3px;
padding-left: 4px;
padding-right: 4px;
height: 16px;
display: inline-block;
width: 70px;
background-color: #EFEFEF;
border-top-left-radius: 5px;
border-bottom-right-radius: 5px;
padding-top: 3px;
text-align: left;
width: 70px;
}
.sheet-pc .sheet-global-mod .sheet-active-flag {
margin-bottom: 10px;
position: relative;
top: -5px;
}
.sheet-pc .sheet-global-mod .sheet-options-flag:checked ~ .sheet-active-flag {
@@ -1137,7 +1137,8 @@
<input type="checkbox" name="attr_options-flag" class="options-flag" checked="checked" style="top: -15px;"><span>y</span>
<input type="checkbox" name="attr_global_save_active_flag" value="1" class="active-flag">
<div class="options">
<textarea type="textarea" name="attr_global_save_rollstring" placeholder="1d4[BLESS]" style="width: 125px;"></textarea>
<span data-i18n="description:-u">DESCRIPTION:</span>
<textarea type="textarea" name="attr_global_save_rollstring" placeholder="1d4[BLESS]"></textarea>
</div>
<div class="display">
<span class="title" name="attr_global_save_rollstring"></span>
@@ -1311,6 +1312,7 @@
<input type="checkbox" name="attr_options-flag" class="options-flag" checked="checked" style="top: -15px;"><span>y</span>
<input type="checkbox" name="attr_global_skill_active_flag" value="1" class="active-flag">
<div class="options">
<span data-i18n="description:-u">DESCRIPTION:</span>
<textarea type="textarea" name="attr_global_skill_rollstring" placeholder="1d4[GUIDANCE]"></textarea>
</div>
<div class="display">
@@ -1605,6 +1607,7 @@
<input type="checkbox" name="attr_options-flag" class="options-flag" checked="checked" style="top: -15px;"><span>y</span>
<input type="checkbox" name="attr_global_attack_active_flag" value="1" class="active-flag">
<div class="options">
<span data-i18n="description:-u">DESCRIPTION:</span>
<textarea type="textarea" name="attr_global_attack_rollstring" placeholder="1d4[BLESS]"></textarea>
</div>
<div class="display">
@@ -1621,9 +1624,10 @@
<input type="checkbox" name="attr_options-flag" class="options-flag" checked="checked" style="top: -15px;"><span>y</span>
<input type="checkbox" name="attr_global_damage_active_flag" value="1" class="active-flag">
<div class="options">
<span data-i18n="description:-u">DESCRIPTION:</span>
<textarea type="textarea" name="attr_global_damage_rollstring" placeholder="1d6[SNEAK ATTACK]"></textarea>
<div class="row" style="margin-bottom: 5px;">
<span style="display: inline; margin-left: 25px;" data-i18n="type:-u">TYPE:</span>
<span style="display: inline;" data-i18n="type:-u">TYPE:</span>
<input type="text" name="attr_global_damage_type" value="">
</div>
</div>