jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced all paper-tooltip with custom, working version

Browse Source
This commit is contained in:
Stefan Zermatten
2017-09-28 11:47:03 +02:00
parent 2cd6e27f70
commit c4e77c7eae
10 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rpg-docs/client/views/character/features/features.html
View File

@@ -74,7 +74,7 @@
checked={{enabled}} checked={{enabled}}
disabled={{#unless canEditCharacter charId}}true{{/unless}}> disabled={{#unless canEditCharacter charId}}true{{/unless}}>
</paper-checkbox> </paper-checkbox>
<paper-tooltip position="left">Feature enabled</paper-tooltip> {{#simpleTooltip}}Feature enabled{{/simpleTooltip}}
</div> </div>
{{/if}} {{/if}}
</div> </div>
@@ -101,11 +101,13 @@
{{/each}} {{/each}}
</div> </div>
{{#if canEditCharacter _id}} {{#if canEditCharacter _id}}
<paper-fab id="addFeature" <div class="floatyButton">
class="floatyButton {{#if shouldFloatyButtonBounce}}bounce{{/if}}" <paper-fab id="addFeature"
icon="add"> class="{{#if shouldFloatyButtonBounce}}bounce{{/if}}"
<paper-tooltip position="left">Add Feature</paper-tooltip> icon="add">
</paper-fab> </paper-fab>
{{#simpleTooltip}}Add Feature{{/simpleTooltip}}
</div>
{{/if}} {{/if}}
</div> </div>
</template> </template>

10
rpg-docs/client/views/character/inventory/inventory.html
View File

@@ -110,12 +110,12 @@
<div class="paper-font-caption" style="margin-right: 8px"> <div class="paper-font-caption" style="margin-right: 8px">
{{round totalWeight}} lbs {{round totalWeight}} lbs
</div> </div>
<div> <div style="position: relative;">
<paper-checkbox class="carriedCheckbox" <paper-checkbox class="carriedCheckbox"
disabled={{#unless canEditCharacter charId}}true{{/unless}} disabled={{#unless canEditCharacter charId}}true{{/unless}}
checked={{isCarried}}> checked={{isCarried}}>
</paper-checkbox> </paper-checkbox>
<paper-tooltip position="left"> Container carried</paper-tooltip> {{#simpleTooltip}} Container carried{{/simpleTooltip}}
</div> </div>
</div> </div>
<div class="bottom list"> <div class="bottom list">
@@ -136,21 +136,21 @@
class="addContainer" class="addContainer"
mini> mini>
</paper-fab> </paper-fab>
<paper-tooltip position="left"> New container </paper-tooltip> {{#simpleTooltip class="always"}} Container {{/simpleTooltip}}
</div> </div>
<div> <div>
<paper-fab icon="av:library-books" <paper-fab icon="av:library-books"
class="libraryItem" class="libraryItem"
mini> mini>
</paper-fab> </paper-fab>
<paper-tooltip position="left"> Library item </paper-tooltip> {{#simpleTooltip class="always"}} Item from library {{/simpleTooltip}}
</div> </div>
<div> <div>
<paper-fab icon="note-add" <paper-fab icon="note-add"
class="addItem" class="addItem"
mini> mini>
</paper-fab> </paper-fab>
<paper-tooltip position="left"> New item </paper-tooltip> {{#simpleTooltip class="always"}} Item {{/simpleTooltip}}
</div> </div>
{{/fabMenu}} {{/fabMenu}}
{{/if}} {{/if}}

11
rpg-docs/client/views/character/journal/journal.html
View File

@@ -83,9 +83,12 @@
</div> </div>
<div class="fab-buffer"></div> <div class="fab-buffer"></div>
{{#if canEditCharacter _id}} {{#if canEditCharacter _id}}
<paper-fab id="addNote" <div class="floatyButton">
class="floatyButton" <paper-fab id="addNote"
icon="add" icon="add"
title="Add"></paper-fab> title="Add">
</paper-fab>
{{#simpleTooltip}}Add Note{{/simpleTooltip}}
</div>
{{/if}} {{/if}}
</template> </template>

35
rpg-docs/client/views/character/spells/spells.html
View File

@@ -53,22 +53,22 @@
{{numPrepared}} / {{evaluate charId maxPrepared}} {{numPrepared}} / {{evaluate charId maxPrepared}}
</div> </div>
{{/if}} {{/if}}
<div> <div style="position: relative;">
<paper-tooltip position="left">
Done
</paper-tooltip>
<paper-icon-button class="finishPrep" icon="done"> <paper-icon-button class="finishPrep" icon="done">
</paper-icon-button> </paper-icon-button>
{{#simpleTooltip}}
Done
{{/simpleTooltip}}
</div> </div>
{{else}} {{else}}
<div> <div style="position: relative;">
<paper-tooltip position="left">
Change prepared spells
</paper-tooltip>
<paper-icon-button class="prepSpells" <paper-icon-button class="prepSpells"
disabled={{#unless canEditCharacter charId}}true{{/unless}} disabled={{#unless canEditCharacter charId}}true{{/unless}}
icon="book"> icon="book">
</paper-icon-button> </paper-icon-button>
{{#simpleTooltip}}
Change prepared spells
{{/simpleTooltip}}
</div> </div>
{{/if}} {{/if}}
</div> </div>
@@ -124,32 +124,31 @@
{{#if canEditCharacter _id}} {{#if canEditCharacter _id}}
{{#fabMenu}} {{#fabMenu}}
<div> <div>
<paper-tooltip position="left">
New spell list
</paper-tooltip>
<paper-fab icon="work" <paper-fab icon="work"
class="addSpellList" class="addSpellList"
mini> mini>
</paper-fab> </paper-fab>
{{#simpleTooltip class="always"}}
Spell list
{{/simpleTooltip}}
</div> </div>
<div> <div>
<paper-tooltip position="left">
Spell library
</paper-tooltip>
<paper-fab icon="av:library-books" <paper-fab icon="av:library-books"
class="librarySpell" class="librarySpell"
mini> mini>
</paper-fab> </paper-fab>
{{#simpleTooltip class="always"}}
Spell from library
{{/simpleTooltip}}
</div> </div>
<div> <div>
<paper-tooltip position="left">
New spell
</paper-tooltip>
<paper-fab icon="note-add" <paper-fab icon="note-add"
class="addSpell" class="addSpell"
mini> mini>
</paper-fab> </paper-fab>
{{#simpleTooltip class="always"}}
Spell
{{/simpleTooltip}}
</div> </div>
{{/fabMenu}} {{/fabMenu}}
{{/if}} {{/if}}

6
rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js
View File

@@ -157,4 +157,10 @@ Template.attributeDialogView.helpers({
statValue: function(){ statValue: function(){
return evaluateEffect(this.charId, this); return evaluateEffect(this.charId, this);
}, },
showNewUserExperience: function(){
console.log(this.statName);
if (this.statName === "speed"){
return Session.get("newUserExperienceStep") >= 2;
}
},
}); });

4
rpg-docs/client/views/characterList/characterList.html
View File

@@ -49,14 +49,14 @@
class="addParty" class="addParty"
mini> mini>
</paper-fab> </paper-fab>
<paper-tooltip position="left"> New Party </paper-tooltip> {{#simpleTooltip class="always"}} New Party {{/simpleTooltip}}
</div> </div>
<div> <div>
<paper-fab icon="face" <paper-fab icon="face"
class="addCharacter" class="addCharacter"
mini> mini>
</paper-fab> </paper-fab>
<paper-tooltip position="left"> New Character </paper-tooltip> {{#simpleTooltip class="always"}} New Character {{/simpleTooltip}}
</div> </div>
{{/fabMenu}} {{/fabMenu}}
</div> </div>

1
rpg-docs/client/views/paperTemplates/inputSuffixes/inputSuffixes.html
View File

@@ -25,7 +25,6 @@
{{/ simpleTooltip}} {{/ simpleTooltip}}
</div> </div>
<div class="brackets" style="position: relative"> <div class="brackets" style="position: relative">
<!--<paper-tooltip position="left" animation-delay="0">This field accepts formulae in {curly brackets}</paper-tooltip>-->
<iron-icon icon="dicecloud:code-braces"></iron-icon> <iron-icon icon="dicecloud:code-braces"></iron-icon>
{{# simpleTooltip}} {{# simpleTooltip}}
This field accepts formulae in {curly brackets} This field accepts formulae in {curly brackets}

20
rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.css
View File

@@ -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; opacity: 0.9;
} }
@@ -16,3 +30,7 @@
pointer-events: none; pointer-events: none;
white-space: nowrap; white-space: nowrap;
} }
.tooltip.always {
opacity: 0.9;
}

4
rpg-docs/client/views/paperTemplates/simpleTooltip/simpleTooltip.html
View File

@@ -1,6 +1,6 @@
<template name="simpleTooltip"> <template name="simpleTooltip">
<div class="simple-tooltip fit"> <div class="simple-tooltip fit layout vertical center-justified">
<div class="tooltip"> <div class="tooltip {{class}}">
{{> Template.contentBlock}} {{> Template.contentBlock}}
</div> </div>
</div> </div>

2
rpg-docs/client/views/user/profile/profile.html
View File

@@ -27,7 +27,7 @@
{{#if verified}} {{#if verified}}
<span> <span>
<iron-icon icon="check"></iron-icon> <iron-icon icon="check"></iron-icon>
<paper-tooltip>Verified</paper-tooltip> {{#simpleTooltip}}Verified{{/simpleTooltip}}
</span> </span>
{{/if}} {{/if}}
</div> </div>