diff --git a/rpg-docs/client/style/main.css b/rpg-docs/client/style/main.css index 7884736f..16f04ec8 100644 --- a/rpg-docs/client/style/main.css +++ b/rpg-docs/client/style/main.css @@ -67,6 +67,12 @@ paper-fab.keyboard-focus { background: #630c05; } +.red-button:not([disabled]) { + background: #d23f31; + color: #fff; + margin-top: 16px; +} + /*Buttons*/ paper-button { color: #000; diff --git a/rpg-docs/client/views/GeneralCSS/globalDetail.css b/rpg-docs/client/views/GeneralCSS/globalDetail.css deleted file mode 100644 index 8297d80c..00000000 --- a/rpg-docs/client/views/GeneralCSS/globalDetail.css +++ /dev/null @@ -1,41 +0,0 @@ -.detailContent { - padding: 24px; -} - -html /deep/ .red-button:not([disabled]) { - background: #d23f31; - color: #fff; - margin-top: 16px; -} - -#globalDetail { - background-color: white; - width: 624px; - height: 500px; - border-radius: 2px; -} - -#globalDetail app-toolbar { - border-radius: 2px 2px 0 0; -} - -@media (max-width: 640px) { - #globalDetail app-toolbar { - border-radius: 0; - } -} - -@media (max-width: 640px) { - #globalDetail { - top: 0 !important; - left: 0 !important; - width: 100%; - height: 100%; - margin: 0; - border-radius: 0; - } -} - -.not-selected [hero] { - visibility: hidden; -} diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/character/characterSheet.html index 621e1b5d..c163b663 100644 --- a/rpg-docs/client/views/character/characterSheet.html +++ b/rpg-docs/client/views/character/characterSheet.html @@ -29,7 +29,7 @@ {{/if}}
- + Stats Features Inventory @@ -43,7 +43,7 @@
- +
{{> stats}}
{{> features}}
{{> inventory}}
diff --git a/rpg-docs/client/views/character/characterSheet.js b/rpg-docs/client/views/character/characterSheet.js index bbb9b367..975064f3 100644 --- a/rpg-docs/client/views/character/characterSheet.js +++ b/rpg-docs/client/views/character/characterSheet.js @@ -1,6 +1,6 @@ Template.characterSheet.onRendered(function() { - //default to the first tab - Session.setDefault(this.data._id + ".selectedTab", "stats"); + //default to the stats tab + Session.setDefault(this.data._id + ".selectedTab", "0"); //watch this character and make sure their encumbrance is updated trackEncumbranceConditions(this.data._id, this); }); diff --git a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.css b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.css index 9c577908..d9170586 100644 --- a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.css +++ b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.css @@ -1,22 +1,15 @@ -html /deep/ .operationDropDown { +.effectEdit .operationDropDown { width: 152px; } -html /deep/ .statDropDown { +.effectEdit .statDropDown { width: 152px; } -html /deep/ .damageMultiplierDropDown { +.effectEdit .damageMultiplierDropDown { width: 152px; } -html /deep/ .effectEdit paper-input { - position: relative; - bottom: 5px; -} - -html /deep/ .effectEdit { - height: 64px; - display: flex; - align-items: flex-end; +.effectEdit .deleteEffect { + flex-shrink: 0; } diff --git a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.html b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.html index a249eb3d..ccfc868a 100644 --- a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.html +++ b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.html @@ -1,36 +1,30 @@ diff --git a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js index bc20833b..4a33c503 100644 --- a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js +++ b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js @@ -1,4 +1,5 @@ //TODO add dexterity armor +// jscs:disable maximumLineLength var stats = [ {stat: "strength", name: "Strength", group: "Ability Scores"}, {stat: "dexterity", name: "Dexterity", group: "Ability Scores"}, @@ -68,9 +69,11 @@ var stats = [ {stat: "psychicMultiplier", name: "Psychic", group: "Weakness/Resistance"}, {stat: "radiantMultiplier", name: "Radiant", group: "Weakness/Resistance"}, {stat: "slashingMultiplier", name: "Slashing", group: "Weakness/Resistance"}, - {stat: "thunderMultiplier", name: "Thunder", group: "Weakness/Resistance"} + {stat: "thunderMultiplier", name: "Thunder", group: "Weakness/Resistance"}, ]; +// jscs:enable maximumLineLength + var statsDict = _.indexBy(stats, "stat"); var statGroups = _.groupBy(stats, "group"); var statGroupNames = _.keys(statGroups); @@ -80,7 +83,7 @@ var attributeOperations = [ {name: "Add", operation: "add"}, {name: "Multiply", operation: "mul"}, {name: "Min", operation: "min"}, - {name: "Max", operation: "max"} + {name: "Max", operation: "max"}, ]; var skillOperations = [ {name: "Add", operation: "add"}, @@ -91,7 +94,7 @@ var skillOperations = [ {name: "Disadvantage", operation: "disadvantage"}, {name: "Passive Bonus", operation: "passiveAdd"}, {name: "Automatically Fail", operation: "fail"}, - {name: "Conditional Benefit", operation: "conditional"} + {name: "Conditional Benefit", operation: "conditional"}, ]; Template.effectEdit.helpers({ @@ -125,7 +128,7 @@ Template.effectEdit.helpers({ //default template return "regularEffectValue"; - } + }, }); Template.regularEffectValue.helpers({ @@ -135,33 +138,30 @@ Template.regularEffectValue.helpers({ }); Template.effectEdit.events({ - "tap .deleteEffect": function(event){ + "click .deleteEffect": function(event){ Effects.softRemoveNode(this._id); GlobalUI.deletedToast(this._id, "Effects", "Effect"); }, - "core-select .statDropDown": function(event){ + "iron-select .statDropDown": function(event){ var detail = event.originalEvent.detail; - if (!detail.isSelected) return; var statName = detail.item.getAttribute("name"); if (statName == this.stat) return; Effects.update(this._id, {$set: {stat: statName}}); }, - "core-select .operationDropDown": function(event){ + "iron-select .operationDropDown": function(event){ var detail = event.originalEvent.detail; - if (!detail.isSelected) return; var opName = detail.item.getAttribute("name"); if (opName == this.operation) return; Effects.update(this._id, {$set: {operation: opName}}); }, - "core-select .damageMultiplierDropDown": function(event){ + "iron-select .damageMultiplierDropDown": function(event){ var detail = event.originalEvent.detail; - if (!detail.isSelected) return; var value = +detail.item.getAttribute("name"); if (value == this.value) return; Effects.update(this._id, {$set: { value: value, calculation: "", - operation: "mul" + operation: "mul", }}); }, "change .effectValueInput": function(event){ @@ -174,5 +174,5 @@ Template.effectEdit.events({ if (this.calculation === value) return; Effects.update(this._id, {$set: {value: "", calculation: value}}); } - } + }, }); diff --git a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html index 4b1c7c0d..cf6a6182 100644 --- a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html +++ b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html @@ -1,13 +1,12 @@ \ No newline at end of file + diff --git a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html b/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html index 0b9c26cd..dcae1b7c 100644 --- a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html +++ b/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html @@ -1,9 +1,8 @@ diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html b/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html index 5aa48af0..19ea9176 100644 --- a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html +++ b/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html @@ -1,11 +1,10 @@ \ No newline at end of file + diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html b/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html index 46020343..cb1d97d5 100644 --- a/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html +++ b/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html @@ -1,10 +1,7 @@ - - diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html b/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html index b4a08c23..3cd2512f 100644 --- a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html +++ b/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html @@ -1,11 +1,12 @@ \ No newline at end of file + diff --git a/rpg-docs/client/views/home/intro/intro.css b/rpg-docs/client/views/home/intro/intro.css index a843da7f..75c5328e 100644 --- a/rpg-docs/client/views/home/intro/intro.css +++ b/rpg-docs/client/views/home/intro/intro.css @@ -23,10 +23,11 @@ text-align: center; } -.intro .section paper-button { - color: #FF5252; -} - .intro paper-button { min-width: 200px; } + + +.intro paper-button:not([raised]) { + color: #d13b2e; +} diff --git a/rpg-docs/client/views/home/intro/intro.html b/rpg-docs/client/views/home/intro/intro.html index 8433fb02..bfd40f87 100644 --- a/rpg-docs/client/views/home/intro/intro.html +++ b/rpg-docs/client/views/home/intro/intro.html @@ -3,12 +3,12 @@
-
+
Realtime D&D 5e Character Tracker
-

+
Spend less time shuffling paper and more time playing -

+
{{#unless currentUser}}
-
Character Sheets
-

+
Character Sheets
+
Check out the example characters -

+
-
-
+
+
Starter Set Archer
@@ -51,8 +51,8 @@ -
-
+
+
Starter Set Wizard
@@ -65,41 +65,44 @@
-

+
Discuss -

-

+

+
On the official subreddit - - - /r/dicecloud - - -

+
+ + + /r/dicecloud + +
-

+
Get involved -

-

Shape upcoming features and track bugs on the DiceCloud Trello board - - - Trello Roadmap - - -

+
+
+ Shape upcoming features and track bugs on the DiceCloud Trello board +
+ + + Trello Roadmap + +
diff --git a/rpg-docs/client/views/layout/layout.html b/rpg-docs/client/views/layout/layout.html index e125f0a2..9e06b2e5 100644 --- a/rpg-docs/client/views/layout/layout.html +++ b/rpg-docs/client/views/layout/layout.html @@ -5,12 +5,13 @@ {{#if currentUser}} - + {{profileLink}} {{else}} - Sign in + + Sign in + {{/if}} diff --git a/rpg-docs/client/views/layout/polymerImports.html b/rpg-docs/client/views/layout/polymerImports.html index 9f0f9089..8f10f205 100644 --- a/rpg-docs/client/views/layout/polymerImports.html +++ b/rpg-docs/client/views/layout/polymerImports.html @@ -46,6 +46,7 @@ + diff --git a/rpg-docs/client/views/loading/loading.html b/rpg-docs/client/views/loading/loading.html index 7c32486a..53ec6928 100644 --- a/rpg-docs/client/views/loading/loading.html +++ b/rpg-docs/client/views/loading/loading.html @@ -1,12 +1,16 @@ diff --git a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html index 072f71ba..b5f48461 100644 --- a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html +++ b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html @@ -1,40 +1,38 @@ diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css index bc8efb5c..1c44b7fe 100644 --- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css +++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css @@ -34,6 +34,28 @@ max-height: 600px; } +.dialog-stack app-toolbar { + border-radius: 2px 2px 0 0; +} + +@media (max-width: 640px) { + .dialog-stack app-toolbar { + border-radius: 0; + } +} + +@media (max-width: 640px) { + .dialog-stack .dialog-sizer { + width: 100%; + height: 100%; + max-width: initial; + max-height: initial; + } + .dialog-stack .dialog { + border-radius: 0; + } +} + .dialog-stack .dialog { position: absolute; width: 100%; @@ -42,7 +64,6 @@ box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.4); - overflow: hidden; border-radius: 2px; transform-origin: top left; } diff --git a/rpg-docs/public/custom_components/app-theme.html b/rpg-docs/public/custom_components/app-theme.html index 5598baed..cd68cb07 100644 --- a/rpg-docs/public/custom_components/app-theme.html +++ b/rpg-docs/public/custom_components/app-theme.html @@ -16,6 +16,11 @@ paper-item.short { --paper-item-min-height: 32px; } + paper-button[raised] { + background-color: var(--accent-color); + color: #dedede; + color: rgba(255,255,255,0.87); + } a { color: inherit; text-decoration: none;