Merge remote-tracking branch 'refs/remotes/Roll20/master'

This commit is contained in:
Chris B
2017-03-20 13:44:51 -04:00
4 changed files with 4529 additions and 4 deletions
@@ -1564,6 +1564,7 @@ button[type=roll] * {
{
padding-bottom: 5px;
padding-top: 15px;
text-align: center;
}
.sheet-rolltemplate-atk .sheet-save .sheet-savedc span,
@@ -6434,10 +6434,10 @@
};
if(multiclass === false) {
if(full.indexOf(charclass) != -1) {
if(full.indexOf(charclass.toLowerCase()) != -1) {
casterlevel = finallevel
}
else if(half.indexOf(charclass) != -1) {
else if(half.indexOf(charclass.toLowerCase()) != -1) {
casterlevel = finallevel === 1 ? 0 : Math.ceil(finallevel/2)
}
else if((charclass === "Fighter" && v.arcane_fighter === "1") || (charclass === "Rogue" && v.arcane_rogue === "1") || (charclass === "third")) {
@@ -6446,10 +6446,10 @@
hitdie_final = "@{hitdietype}"
}
else {
if(full.indexOf(charclass) != -1) {
if(full.indexOf(charclass.toLowerCase()) != -1) {
casterlevel = parseInt(v.base_level,10)
}
else if(half.indexOf(charclass) != -1) {
else if(half.indexOf(charclass.toLowerCase()) != -1) {
casterlevel = Math.floor(parseInt(v.base_level,10)/2)
}
else if((charclass === "Fighter" && v.arcane_fighter === "1") || (charclass === "Rogue" && v.arcane_rogue === "1") || (charclass === "third")) {
+562
View File
@@ -0,0 +1,562 @@
/*==== Button Reset ====*/
button[type="roll"]:before {
content: ""!important;
font-size:0.75em;
display: none;
}
div.sheet-tab-content { display: none; }
input.sheet-tab1:checked ~ div.sheet-tab1,
input.sheet-tab2:checked ~ div.sheet-tab2,
input.sheet-tab3:checked ~ div.sheet-tab3,
input.sheet-tab4:checked ~ div.sheet-tab4,
input.sheet-tab5:checked ~ div.sheet-tab5,
input.sheet-tab6:checked ~ div.sheet-tab6
{
display: block;
}
.sheet-loc-text{
width:68px;
}
input.sheet-tab
{
width: 100px;
height: 20px;
position: relative;
top: 0px;
left: 5px;
margin: -1.5px;
margin-bottom: 5px;
cursor: pointer;
z-index: 1;
opacity: 0;
}
input.sheet-tab + span::before
{
content:attr(title);
border: solid 1px #a8a8a8;
border-bottom-color: black;
text-align: center;
display: inline-block;
background: #fff;
background: -moz-linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
background: -webkit-linear-gradient(to top, #D3D3D3 8, #fff, #D3D3D3 );
background: -ms-linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
background: -o-linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
background: linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
width: 100px;
height: 20px;
font-size: 18px;
position: absolute;
top: 70px;
left: 30px;
}
input.sheet-tab:checked + span::before
{
background: #dcdcdc;
background: -moz-linear-gradient(to top, #D3D3D3 , #dcdcdc, #D3D3D3 );
background: -webkit-linear-gradient(to top, #D3D3D3 , #dcdcdc, #D3D3D3 );
background: -ms-linear-gradient(to top, #fcfcfc, #dcdcdc, #fcfcfc);
background: -o-linear-gradient(to top, #D3D3D3 , #dcdcdc, #D3D3D3 );
background: linear-gradient(to top, #D3D3D3 , #dcdcdc, #D3D3D3 );
border-bottom-color: #fff;
}
input.sheet-tab:not(:first-child) + span::before
{
border-left: none;
}
input.sheet-tab2 + span::before
{
left: 133px;
/*
background: #fff;
background: -moz-linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
background: -webkit-linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
background: -ms-linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
background: -o-linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
background: linear-gradient(to top, #D3D3D3 , #fff, #D3D3D3 );
*/
}
input.sheet-tab3 + span::before
{
/* left: 330px; */
left: 234px;
}
input.sheet-tab4 + span::before
{
/*left: 480px;*/
left: 336px;
}
input.sheet-tab5 + span::before
{
/*left: 630px;*/
left: 438px;
}
input.sheet-tab6 + span::before
{
/*left: 780px;*/
left: 540px;
}
div.sheet-tab-content
{
font-family: 'Verdana';
border: 1px solid #a8a8a8;
border-top-color: #000;
margin: 0px;
padding: 1px;
padding-left:5px
}
.sheet-category_label{
display:inline-block;
width:203px;
}
.sheet-skill_name{
width:99px;
}
.sheet-skill_values{
display:inline-block
font-size:0.75em;
width:34px;
box-shadow: none;
border: 0px;
border-bottom: 1px solid black;
text-align:center;
}
.sheet-value_display{
box-shadow: none;
border: 0px;
border-bottom: 1px solid black;
text-align:center;
}
.sheet-armor-name{
width:169px;
}
.sheet-skill_button{
display:inline-block;
padding:1px 2px 1px 1px;
width:93px;
text-align:left;
}
.sheet-blank_skill{
width:96px;
}
.sheet-personal_label{
font-size:1.0em;
display:inline;
}
.sheet-personal_text{
box-shadow: none;
border: 0px;
border-bottom: 1px solid black;
margin-bottom:1px;
}
.sheet-attribute_label{
font-size:1.0em;
width:108px;
display:inline-block
}
.sheet-char_button{
display:inline-block;
padding:1px 2px 1px 1px;
text-align:center;
font-size:0.6em;
width:25px;
}
.sheet-skill_mod_button{
font-size:0.75em;
padding:1px;
text-align:left;
}
button[type="roll"] {
height:24px;
padding-bottom: 0;
display: inline-block;
margin: 0;
font-weight: 400;
text-align: center;
cursor: pointer;
background-image: none;
/*background-color: transparent;*/
border: 1px solid #ccc;
white-space: nowrap;
border-radius: 4px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.sheet-spell_div{
width:97%;
background-color: white;
padding: 5px
;border-radius: 6px;"
}
button[type="roll"]:hover {
background-color: black;
border-color: red;
color:white
}
button[type="roll"] label, button[type="roll"] input {
height:24px;
line-height: 24px;
text-align:center;
width: 100%;
cursor: pointer;
background: none;
box-shadow: none;
transition: none;
border-radius: none;
border:none;
font-weight:700;
}
.sheet-melee_wpns_labels label{
display:inline-block;
font-size:1em;
}
.sheet-melee_wpns{
display:inline-block;
}
.sheet-template_value{
text-align: right;
}
.sheet-rolltemplate-HL-Missle th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-HL-Missle table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-HL-Melee th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-HL-Melee table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-FLL-Missle th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-FLL-Missle table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-FLL-Melee th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-FLL-Melee table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-WalkL-Missle th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-WalkL-Missle table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-WalkL-Melee th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-WalkL-Melee table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-skillRoll th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-skillRoll table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-skillRoll .inlinerollresult {
background-color: transparent;
color: #000000;
border: none;
}
.sheet-rolltemplate-melee-roll .inlinerollresult {
background-color: transparent;
color: #000000;
border: none;
}
.sheet-rolltemplate-melee-roll th {
text-align: centre;
color: #ffffff;
background-color: #000000;
}
.sheet-rolltemplate-melee-roll table {
width: 230px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-melee-roll .template_value{
text-align: right;
}
.repcontrol{
margin-right: 7px;
}
div.repcontrol button
{
width: 20px;
height: 20px;
color: transparent;
text-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
}
div.repcontrol button.repcontrol_add::before,
div.repcontrol button.repcontrol_edit::before
{
font-family: Pictos;
position: relative;
color: #000;
}
/* +Add */
div.repcontrol button.repcontrol_add::before
{
content: "&"; /* & in Pictos is a + sign, while + is a plus inside a circle */
left: -5px;
top: -4px;
}
/* Modify */
div.repcontrol button.repcontrol_edit::before
{
text-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
content: "x"; /* x in Pictos is a crossed hammer and wrench */
left: -5px;
top: -4px;
}
/* Done */
div.repcontrol.editmode button.repcontrol_edit::before
{
content: "3"; /* 3 in Pictos is a check mark */
}
.sheet-spirit_stat{
display:inline-block;
width:33px;
}
/*Hide Spirit Matrices*/
.sheet-HideSpiritm:checked ~ *.sheet-Spiritmconfig {
display:none;
}
.charsheet span.sheet-is-HideSpirit::after { /*Close Config: grayish background with black text*/
content: "^";
}
.charsheet .sheet-HideSpirit:checked + span.sheet-is-HideSpirit::after { /*Show Configuration: Black background with grayish text*/
content: "v";
}
.charsheet span.sheet-is-HideSpirit {
text-align: center;
display: inline-block;
width: 5%;
height: 16px;
font-size: 9px;
/*font-family: "Pictos";*/
/*background: #65763c;*/
background: black; /*#93537c;*/
color: white; /*white;*/
font-weight: bold;
border-radius: 4px;
margin-left: -5%;
}
.charsheet input.sheet-HideSpiritm {
width: 5%;
height: 16px;
cursor: pointer;
margin-left: auto;
margin-top: auto;
/*position: absolute;
right: 20%;*/
opacity: 0;
z-index: 9999;
}
.charsheet .sheet-HideSpirit:checked + span.sheet-is-HideSpirit {
background: black;
border-radius: 4px;
color: white;
}
/*Hide Sorcery matrices*/
.sheet-HideSorcerym:checked ~ *.sheet-Sorcerymconfig {
display:none;
}
.charsheet span.sheet-is-HideSorcery::after { /*Close Config: grayish background with black text*/
content: "^";
}
.charsheet .sheet-HideSorcerym:checked + span.sheet-is-HideSorcery::after { /*Show Configuration: Black background with grayish text*/
content: "v";
}
.charsheet span.sheet-is-HideSorcery {
text-align: center;
display: inline-block;
width: 5%;
height: 16px;
font-size: 9px;
/*font-family: "Pictos";*/
/*background: #65763c;*/
background: black; /*#93537c;*/
color: white; /*white;*/
font-weight: bold;
border-radius: 4px;
margin-left: -5%;
}
.charsheet input.sheet-HideSorcerym {
width: 5%;
height: 16px;
cursor: pointer;
margin-left: auto;
margin-top: auto;
/*position: absolute;
right: 20%;*/
opacity: 0;
z-index: 9999;
}
.charsheet .sheet-HideSorcerym:checked + span.sheet-is-HideSorcery {
background: black;
border-radius: 4px;
color: white;
}
File diff suppressed because it is too large Load Diff