sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade bootstrap, and manually specifcy hover-triggers for popovers (bootstrap now

Browse source 
defaults to click)
This commit is contained in:
Tyler Renelle 2012-12-05 07:17:45 -08:00
parent 7ed84072ea
commit 2a8bc2abe2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/bootstrap.min.js vendored
View file

File diff suppressed because one or more lines are too long

10
views/app/index.html
View file

@ -289,7 +289,7 @@
<taskColumn: nonvoid> <taskColumn: nonvoid>
<div class="span3 well {{{type}}}s"> <div class="span3 well {{{type}}}s">
<!--removing for now, help-info in the tour instead--> <!--removing for now, help-info in the tour instead-->
<!--<span class="help-icon" rel="popover" data-placement="bottom" data-original-title="{{{helpTitle}}}" data-content="{{{helpContent}}}"><i class="icon-question-sign"></i></span>--> <!--<span class="help-icon" rel="popover" data-placement="bottom" data-trigger="hover" data-original-title="{{{helpTitle}}}" data-content="{{{helpContent}}}"><i class="icon-question-sign"></i></span>-->
<h1>{{{title}}}</h1> <h1>{{{title}}}</h1>
{{{content}}} {{{content}}}
</div> </div>
@ -309,7 +309,7 @@
<a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a> <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
<a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a> <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
{#if :task.history} {#if :task.history}
<a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel=tooltip title="Progress"> <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
<i class="icon-signal"></i> <i class="icon-signal"></i>
</a> </a>
{/} {/}
@ -317,9 +317,9 @@
{#if :task.notes} {#if :task.notes}
{#if equal(:task.type,'reward')} {#if equal(:task.type,'reward')}
<span rel="popover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span> <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
{else} {else}
<span rel="popover" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span> <span rel="popover" data-trigger="hover" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
{/} {/}
{/} {/}
</div> </div>
@ -389,7 +389,7 @@
<li class="task reward item"> <li class="task reward item">
<pre> <pre>
<div class="task-meta-controls"> <div class="task-meta-controls">
<span rel="popover" data-placement="left" data-content="{:item.notes}" data-original-title="{:item.text}" class='task-notes'><i class="icon-comment"></i></span> <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:item.notes}" data-original-title="{:item.text}" class='task-notes'><i class="icon-comment"></i></span>
</div> </div>
<div class="task-controls"> <div class="task-controls">
{{{#if reroll}}} {{{#if reroll}}}