dragonleo/foundry-sw5e
1
0
Fork 0
forked from GitHub-Mirrors/foundry-sw5e
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #129 from unrealkakeman89/master

Browse source 
Update my dev branch to current version
This commit is contained in:
supervj 2021-01-26 20:32:09 -05:00 • committed by GitHub
commit 3762d819eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
less/update/_variables-light.less
View file

@ -13,7 +13,7 @@
@blockquoteShadow: 0 0 20px rgba(@colorBlue, 0.8); @blockquoteShadow: 0 0 20px rgba(@colorBlue, 0.8);
//forms //forms
@inputBackgroundColor: white; @inputBackgroundColor: @colorGray;
@inputBorderNormal: @colorLightGray; @inputBorderNormal: @colorLightGray;
@inputBorderHover: @colorGray; @inputBorderHover: @colorGray;
@inputBorderFocus: @colorRed; @inputBorderFocus: @colorRed;

5
less/update/components/sidebar-themes.less
View file

@ -95,7 +95,8 @@
} }
#chat-controls { #chat-controls {
.roll-type-select { .roll-type-select {
background: @inputBackgroundColor; background: #4f4f4f;
color: #FFFFFF;
} }
label { label {
color: @bodyFontColor; color: @bodyFontColor;
@ -103,7 +104,7 @@
} }
#chat-form textarea { #chat-form textarea {
background: @inputBackgroundColor; background: #4f4f4f;
} }

6
less/update/components/sidebar.less
View file

@ -169,6 +169,10 @@
} }
} }
#chat-controls { #chat-controls {
&.roll-type-select {
background: #4f4f4f;
color: #FFFFFF;
}
padding-top: 4px; padding-top: 4px;
label { label {
color: @colorBlack; color: @colorBlack;
@ -176,7 +180,7 @@
} }
#chat-form textarea { #chat-form textarea {
background: white; background: #4f4f4f;
&:focus { &:focus {
box-shadow: none; box-shadow: none;
outline: none; outline: none;

5
sw5e-dark.css
View file

@ -234,13 +234,14 @@ body.dark-theme .dice-roll .dice-total.fumble {
box-shadow: 0 0 12px rgba(232, 17, 17, 0.5); box-shadow: 0 0 12px rgba(232, 17, 17, 0.5);
} }
body.dark-theme #chat-controls .roll-type-select { body.dark-theme #chat-controls .roll-type-select {
background: #363636; background: #4f4f4f;
color: #FFFFFF;
} }
body.dark-theme #chat-controls label { body.dark-theme #chat-controls label {
color: white; color: white;
} }
body.dark-theme #chat-form textarea { body.dark-theme #chat-form textarea {
background: #363636; background: #4f4f4f;
} }
body.dark-theme #combat #combat-round { body.dark-theme #combat #combat-round {
color: #E81111; color: #E81111;

7
sw5e-light.css
View file

@ -234,13 +234,14 @@ body.light-theme .dice-roll .dice-total.fumble {
box-shadow: 0 0 12px rgba(196, 15, 15, 0.5); box-shadow: 0 0 12px rgba(196, 15, 15, 0.5);
} }
body.light-theme #chat-controls .roll-type-select { body.light-theme #chat-controls .roll-type-select {
background: white; background: #4f4f4f;
color: #FFFFFF;
} }
body.light-theme #chat-controls label { body.light-theme #chat-controls label {
color: #1C1C1C; color: #1C1C1C;
} }
body.light-theme #chat-form textarea { body.light-theme #chat-form textarea {
background: white; background: #4f4f4f;
} }
body.light-theme #combat #combat-round { body.light-theme #combat #combat-round {
color: #c40f0f; color: #c40f0f;
@ -297,7 +298,7 @@ body.light-theme .sidebar-tab .directory-header .header-search i.fa-search {
color: #0d99cc; color: #0d99cc;
} }
body.light-theme .sidebar-tab .directory-header .header-search input { body.light-theme .sidebar-tab .directory-header .header-search input {
background: white; background: #4f4f4f;
} }
body.light-theme .sidebar-tab .subdirectory { body.light-theme .sidebar-tab .subdirectory {
background: white; background: white;

6
system.json
View file

@ -2,7 +2,7 @@
"name": "sw5e", "name": "sw5e",
"title": "SW 5th Edition", "title": "SW 5th Edition",
"description": "A comprehensive game system for running games of SW 5th Edition in the Foundry VTT environment.", "description": "A comprehensive game system for running games of SW 5th Edition in the Foundry VTT environment.",
"version": "1.2.3", "version": "R1-A2",
"author": "Dev Team", "author": "Dev Team",
"scripts": [], "scripts": [],
"esmodules": ["sw5e.js"], "esmodules": ["sw5e.js"],
@ -135,8 +135,8 @@
"gridUnits": "ft", "gridUnits": "ft",
"primaryTokenAttribute": "attributes.hp", "primaryTokenAttribute": "attributes.hp",
"secondaryTokenAttribute": null, "secondaryTokenAttribute": null,
"minimumCoreVersion": "0.7.6", "minimumCoreVersion": "0.7.7",
"compatibleCoreVersion": "0.7.7", "compatibleCoreVersion": "0.7.9",
"url": "https://github.com/unrealkakeman89/sw5e", "url": "https://github.com/unrealkakeman89/sw5e",
"manifest": "https://raw.githubusercontent.com/unrealkakeman89/sw5e/master/system.json", "manifest": "https://raw.githubusercontent.com/unrealkakeman89/sw5e/master/system.json",
"download": "https://github.com/unrealkakeman89/sw5e/archive/master.zip" "download": "https://github.com/unrealkakeman89/sw5e/archive/master.zip"

17
templates/actors/newActor/parts/swalt-traits.html
View file

@ -80,16 +80,6 @@
</ul> </ul>
{{/unless}} {{/unless}}
</label> </label>
<div>
<label>{{localize "SW5E.MovementConfig"}}</label>
<a class="configure-movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
</div>
<div>
{{#unless isVehicle}}
<label>{{localize "SW5E.SpecialTraits"}}</label>
<a class="configure-flags"><i class="fas fa-cog"></i></a>
{{/unless}}
</div>
<div class="languages"> <div class="languages">
<label data-options="share-languages" class="languages">{{localize "SW5E.Languages"}}</label> <label data-options="share-languages" class="languages">{{localize "SW5E.Languages"}}</label>
<a class="trait-selector" data-options="languages" data-target="data.traits.languages"> <a class="trait-selector" data-options="languages" data-target="data.traits.languages">
@ -101,6 +91,13 @@
{{/each}} {{/each}}
</ul> </ul>
</div> </div>
{{#unless isVehicle}}
<div class="form-group ">
<label>{{localize "SW5E.SpecialTraits"}}</label>
<a class="config-button" data-action="flags" title="{{localize 'SW5E.SpecialTraits'}}"><i class="fas fa-cog"></i></a>
</div>
{{/unless}}
<div> <div>
<label>{{localize "SW5E.TraitArmorProf"}}</label> <label>{{localize "SW5E.TraitArmorProf"}}</label>
<a class="trait-selector" data-options="armorProficiencies" data-target="data.traits.armorProf"> <a class="trait-selector" data-options="armorProficiencies" data-target="data.traits.armorProf">