Skip to content

Commit

Permalink
Merge pull request #74 from Detailing-the-Realm/develop
Browse files Browse the repository at this point in the history
Merge 3.0
  • Loading branch information
Armaklan authored Dec 7, 2021
2 parents d3c1747 + b14edab commit 7f67f91
Show file tree
Hide file tree
Showing 71 changed files with 1,966 additions and 1,365 deletions.
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx pretty-quick --staged
8 changes: 8 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
!/module
!/module/*
!/lang
!/lang/*
!/scss
!/scss/*

10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": true,
"trailingComma": "all",
"bracketSpacing": true,
"jsxBracketSameLine": false
}
10 changes: 10 additions & 0 deletions css/svnsea2e.css
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,11 @@ input[type=range]::-webkit-slider-thumb {
text-align: right;
}

.sheet .sheet-header .herospts, .sheet .sheet-header .wealth {
max-width: 30px;
margin-right: 10px;
}

.sheet .tag {
display: inline-block;
margin: 0 2px 2px 0;
Expand Down Expand Up @@ -910,6 +915,11 @@ input[type=range]::-webkit-slider-thumb {
padding-left: 37px;
}

.actor .sheet-header .raise-tracking button {
width: 2em;
margin: 0 1em;
}

.actor .danger-points input[type="text"] {
font-size: 6em;
height: 1.5em;
Expand Down
Binary file added icons/hubris.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/virtue.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7f67f91

Please sign in to comment.