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

Merge branch 'develop' of github.com:lefnire/habitrpg into develop

Browse source
This commit is contained in:
Tyler Renelle 2013-05-07 17:59:14 +01:00
commit b2bc54aead
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
styles/app/filters.styl
View file

@ -16,4 +16,10 @@
.tag-label:hover
background-color: #3a87ad
cursor: pointer
cursor: pointer
.tag-editing
padding 2px 0 0 2px
.tag-editing .tag-editing-pill
height:auto

12
views/app/filters.html
View file

@ -10,9 +10,9 @@
{#each _user.tags as :tag}
<li class="{#if _user.filters[:tag.id]}active{/}" style='position:relative;'>
{#if _editingTags}
<div class="input-append option-group">
<input class="input input-small option-content" type="text" value='{:tag.name}' />
<span class="add-on"><a class='pull-right' x-bind=click:filtersDeleteTag data-tag-id={{:tag.id}}><i class='icon-trash'></i></a></span>
<div class="input-append option-group tag-editing" >
<input class="input input-small option-content tag-editing-pill" type="text" value='{:tag.name}' />
<span class="add-on tag-editing-pill"><a class='pull-right' x-bind=click:filtersDeleteTag data-tag-id={{:tag.id}}><i class='icon-trash'></i></a></span>
</div>
{else}
<a data-tag-id="{{:tag.id}}" x-bind="click:toggleFilterByTag">{:tag.name}</a>
@ -22,9 +22,9 @@
<li>
{#if _editingTags}
<form class='form-inline' x-bind="submit:filtersNewTag">
<div class="input-append">
<input class="span2" type="text" value={_newTag} placeholder="New Tag" />
<button class="add-on" type="submit">Add</button>
<div class="input-append tag-editing">
<input class="span2 tag-editing-pill" type="text" value={_newTag} placeholder="New Tag" />
<button class="add-on tag-editing-pill" type="submit">Add</button>
</div>
</form>
{/}

2
views/app/game-pane.html
View file

@ -86,7 +86,7 @@
<div class='span6'>
<h3>Tavern Talk & LFG</h3>
<form x-bind='submit:tavernSendChat'>
<textarea x-bind='keyup:tavernMessageKeyup'>{_tavernMessage}</textarea><br/>
<textarea class="span6" rows="3"x-bind='keyup:tavernMessageKeyup'>{_tavernMessage}</textarea><br/>
<input class=btn type=submit value=Submit />
</form>
<ul class='unstyled tavern-chat'>

2
views/app/party.html
View file

@ -22,7 +22,7 @@
<div class="span6">
<h3>Chat</h3>
<form x-bind='submit:partySendChat'>
<textarea x-bind='keyup:partyMessageKeyup'>{_chatMessage}</textarea><br/>
<textarea class="span6" rows="3" x-bind='keyup:partyMessageKeyup'>{_chatMessage}</textarea><br/>
<input class=btn type=submit value=Submit />
</form>
<ul class='party-chat unstyled'>