Replaced all paper-tooltip with custom, working version

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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;
}
},
});

View File

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

View File

@@ -25,7 +25,6 @@
{{/ simpleTooltip}}
</div>
<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>
{{# simpleTooltip}}
This field accepts formulae in {curly brackets}

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

View File

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

View File

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