From c4e77c7eae1d5b77793d96d7d1b2618b5a98242e Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 28 Sep 2017 11:47:03 +0200 Subject: [PATCH] Replaced all paper-tooltip with custom, working version --- .../views/character/features/features.html | 14 ++++---- .../views/character/inventory/inventory.html | 10 +++--- .../views/character/journal/journal.html | 11 +++--- .../client/views/character/spells/spells.html | 35 +++++++++---------- .../stats/attributeDialog/attributeDialog.js | 6 ++++ .../views/characterList/characterList.html | 4 +-- .../inputSuffixes/inputSuffixes.html | 1 - .../simpleTooltip/simpleTooltip.css | 20 ++++++++++- .../simpleTooltip/simpleTooltip.html | 4 +-- .../client/views/user/profile/profile.html | 2 +- 10 files changed, 67 insertions(+), 40 deletions(-) diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html index 5d5a7553..a3c6f1df 100644 --- a/rpg-docs/client/views/character/features/features.html +++ b/rpg-docs/client/views/character/features/features.html @@ -74,7 +74,7 @@ checked={{enabled}} disabled={{#unless canEditCharacter charId}}true{{/unless}}> - Feature enabled + {{#simpleTooltip}}Feature enabled{{/simpleTooltip}} {{/if}} @@ -101,11 +101,13 @@ {{/each}} {{#if canEditCharacter _id}} - - Add Feature - +
+ + + {{#simpleTooltip}}Add Feature{{/simpleTooltip}} +
{{/if}} diff --git a/rpg-docs/client/views/character/inventory/inventory.html b/rpg-docs/client/views/character/inventory/inventory.html index cf823d5f..c135c6ec 100644 --- a/rpg-docs/client/views/character/inventory/inventory.html +++ b/rpg-docs/client/views/character/inventory/inventory.html @@ -110,12 +110,12 @@
{{round totalWeight}} lbs
-
+
- Container carried + {{#simpleTooltip}} Container carried{{/simpleTooltip}}
@@ -136,21 +136,21 @@ class="addContainer" mini> - New container + {{#simpleTooltip class="always"}} Container {{/simpleTooltip}}
- Library item + {{#simpleTooltip class="always"}} Item from library {{/simpleTooltip}}
- New item + {{#simpleTooltip class="always"}} Item {{/simpleTooltip}}
{{/fabMenu}} {{/if}} diff --git a/rpg-docs/client/views/character/journal/journal.html b/rpg-docs/client/views/character/journal/journal.html index 5ae06ced..8632954c 100644 --- a/rpg-docs/client/views/character/journal/journal.html +++ b/rpg-docs/client/views/character/journal/journal.html @@ -83,9 +83,12 @@
{{#if canEditCharacter _id}} - +
+ + + {{#simpleTooltip}}Add Note{{/simpleTooltip}} +
{{/if}} diff --git a/rpg-docs/client/views/character/spells/spells.html b/rpg-docs/client/views/character/spells/spells.html index b5011f82..c992daa4 100644 --- a/rpg-docs/client/views/character/spells/spells.html +++ b/rpg-docs/client/views/character/spells/spells.html @@ -53,22 +53,22 @@ {{numPrepared}} / {{evaluate charId maxPrepared}} {{/if}} -
- - Done - +
+ {{#simpleTooltip}} + Done + {{/simpleTooltip}}
{{else}} -
- - Change prepared spells - +
+ {{#simpleTooltip}} + Change prepared spells + {{/simpleTooltip}}
{{/if}}
@@ -124,32 +124,31 @@ {{#if canEditCharacter _id}} {{#fabMenu}}
- - New spell list - - + {{#simpleTooltip class="always"}} + Spell list + {{/simpleTooltip}}
- - Spell library - + {{#simpleTooltip class="always"}} + Spell from library + {{/simpleTooltip}}
- - New spell - + {{#simpleTooltip class="always"}} + Spell + {{/simpleTooltip}}
{{/fabMenu}} {{/if}} diff --git a/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js b/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js index 1e2bf9a3..202df998 100644 --- a/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js +++ b/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js @@ -157,4 +157,10 @@ Template.attributeDialogView.helpers({ statValue: function(){ return evaluateEffect(this.charId, this); }, + showNewUserExperience: function(){ + console.log(this.statName); + if (this.statName === "speed"){ + return Session.get("newUserExperienceStep") >= 2; + } + }, }); diff --git a/rpg-docs/client/views/characterList/characterList.html b/rpg-docs/client/views/characterList/characterList.html index a5b00dd2..94962a5b 100644 --- a/rpg-docs/client/views/characterList/characterList.html +++ b/rpg-docs/client/views/characterList/characterList.html @@ -49,14 +49,14 @@ class="addParty" mini> - New Party + {{#simpleTooltip class="always"}} New Party {{/simpleTooltip}}
- New Character + {{#simpleTooltip class="always"}} New Character {{/simpleTooltip}}
{{/fabMenu}} diff --git a/rpg-docs/client/views/paperTemplates/inputSuffixes/inputSuffixes.html b/rpg-docs/client/views/paperTemplates/inputSuffixes/inputSuffixes.html index 9cd48f6b..08c15e04 100644 --- a/rpg-docs/client/views/paperTemplates/inputSuffixes/inputSuffixes.html +++ b/rpg-docs/client/views/paperTemplates/inputSuffixes/inputSuffixes.html @@ -25,7 +25,6 @@ {{/ simpleTooltip}}
- {{# simpleTooltip}} This field accepts formulae in {curly brackets} diff --git a/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.css b/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.css index 39bb2cc3..67822bb6 100644 --- a/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.css +++ b/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.css @@ -1,4 +1,18 @@ -.simple-tooltip:hover .tooltip { +.simple-tooltip { + pointer-events: none; +} + +.simple-tooltip:active { + pointer-events: none; +} + +/* Show the tooltip if a older sibling is hovered */ +*:hover ~ .simple-tooltip > .tooltip { + opacity: 0.9; +} + +/* Show the tooltip if parent is hovered */ +*:hover > .simple-tooltip > .tooltip { opacity: 0.9; } @@ -16,3 +30,7 @@ pointer-events: none; white-space: nowrap; } + +.tooltip.always { + opacity: 0.9; +} diff --git a/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.html b/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.html index 961f80f4..f364ba71 100644 --- a/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.html +++ b/rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.html @@ -1,6 +1,6 @@