mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-08-01 03:30:25 +00:00
add in Lato as main font, lots of minor layout tweaks. Continue refactoring tasks html
This commit is contained in:
Zachary Kain
parent
b7d46b1e20
commit
ba1a8dabc8
3 changed files with 74 additions and 50 deletions
|
|
@ -1,21 +1,21 @@
|
|||
.color-worst pre
|
||||
.color-worst
|
||||
background-color: rgb(230, 184, 175)
|
||||
.color-worse pre
|
||||
.color-worse
|
||||
background-color: rgb(244, 204, 204)
|
||||
.color-bad pre
|
||||
.color-bad
|
||||
background-color: rgb(252, 229, 205)
|
||||
.color-neutral pre
|
||||
.color-neutral
|
||||
background-color: rgb(255, 242, 204)
|
||||
.color-good pre
|
||||
.color-good
|
||||
background-color: rgb(217, 234, 211)
|
||||
.color-better pre
|
||||
.color-better
|
||||
background-color: rgb(208, 224, 227)
|
||||
.color-best pre
|
||||
.color-best
|
||||
background-color: rgb(201, 218, 248)
|
||||
.completed pre
|
||||
.completed
|
||||
background-color: rgb(217, 217, 217)
|
||||
color: rgb(153, 153, 153)
|
||||
.reward pre
|
||||
.reward
|
||||
background-color: white
|
||||
|
||||
label.checkbox.inline{
|
||||
|
|
@ -77,7 +77,6 @@ li:hover .task-meta-controls .hover-show
|
|||
.task-controls,.task-text
|
||||
display:inline
|
||||
margin: 0 10px 0 0
|
||||
vertical-align: -4%
|
||||
|
||||
input
|
||||
margin-top: 0
|
||||
|
|
@ -94,7 +93,32 @@ li:hover .task-meta-controls .hover-show
|
|||
|
||||
// begin rewrite css 2013-03-04
|
||||
|
||||
.task-column
|
||||
padding: 1.5em
|
||||
background: #f5f5f5
|
||||
border: 1px solid #bbb
|
||||
border-radius: 0.25em
|
||||
font-family: 'Lato', sans-serif
|
||||
h2
|
||||
margin: 0 0 0.5em
|
||||
padding: 0
|
||||
|
||||
.task
|
||||
clear: both
|
||||
padding: 0.5em
|
||||
margin-bottom: 0.75em
|
||||
border: 1px solid rgba(0, 0, 0, 0.2)
|
||||
border-radius: 0.25em
|
||||
&:last-child
|
||||
margin-bottom: 0
|
||||
|
||||
.addtask-form
|
||||
margin-bottom: 0.75em
|
||||
.addtask-field
|
||||
max-width: 70%
|
||||
.addtask-btn
|
||||
float: right
|
||||
float: right
|
||||
font-family: 'Lato', sans-serif
|
||||
|
||||
.todo-status-toggler
|
||||
margin-top: 0.75em
|
||||
|
|
@ -14,6 +14,8 @@
|
|||
<Head:>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<!-- webfonts -->
|
||||
<link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic' rel='stylesheet' type='text/css'>
|
||||
|
||||
<Header:>
|
||||
<app:modals:modals />
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
<taskLists:>
|
||||
<!--helpTitle & helpContent moved to tour -->
|
||||
<div class="span3 well habits">
|
||||
<div class="task-column span3 habits">
|
||||
<h2>Habits</h2>
|
||||
<app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
|
||||
<ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
|
||||
</div>
|
||||
|
||||
<div class="span3 well dailys">
|
||||
<div class="task-column span3 dailys">
|
||||
<h2>Daily</h2>
|
||||
<app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
|
||||
<ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
|
||||
</div>
|
||||
|
||||
<div class="span3 well todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
|
||||
<div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
|
||||
<h2>Todos</h2>
|
||||
<div class="display-context-dependant show-for-uncompleted">
|
||||
<app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
|
||||
|
|
@ -32,14 +32,14 @@
|
|||
<!-- <a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
|
||||
</span>
|
||||
<div id="todos-chart" style="display:none;"></div>
|
||||
<ul class="nav nav-tabs">
|
||||
<ul class="todo-status-toggler nav nav-tabs">
|
||||
<li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>
|
||||
<li><a x-bind=click:changeContext data-target="#todo-well" data-context="context-completed">Complete</a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="span3 well rewards">
|
||||
<div class="task-column span3 rewards">
|
||||
|
||||
<!--Title -->
|
||||
<div class="row-fluid">
|
||||
|
|
@ -131,45 +131,43 @@
|
|||
<!-- all the parts of a single task -->
|
||||
<task:>
|
||||
<li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
|
||||
<pre>
|
||||
<!-- right-hand side control buttons -->
|
||||
<div class="task-meta-controls">
|
||||
<div class="hover-show">
|
||||
<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>
|
||||
{#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">
|
||||
<i class="icon-signal"></i>
|
||||
</a>
|
||||
{/}
|
||||
</div>
|
||||
|
||||
{#if :task.notes}
|
||||
<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>
|
||||
<!-- right-hand side control buttons -->
|
||||
<div class="task-meta-controls">
|
||||
<div class="hover-show">
|
||||
<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>
|
||||
{#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">
|
||||
<i class="icon-signal"></i>
|
||||
</a>
|
||||
{/}
|
||||
</div>
|
||||
|
||||
<!-- left-hand side checkbox -->
|
||||
<div class="task-controls">
|
||||
<!-- Habits -->
|
||||
{#if equal(:task.type, 'habit')}
|
||||
{#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
|
||||
{#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
|
||||
<!-- Rewards -->
|
||||
{else if equal(:task.type, 'reward')}
|
||||
<a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
|
||||
<!-- Daily & Todos -->
|
||||
{else}
|
||||
<input type=checkbox checked="{:task.completed}">
|
||||
{/}
|
||||
</div>
|
||||
{#if :task.notes}
|
||||
<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>
|
||||
{/}
|
||||
</div>
|
||||
|
||||
<!-- main content -->
|
||||
<div class="task-text">{:task.text}</div>
|
||||
<!-- left-hand side checkbox -->
|
||||
<div class="task-controls">
|
||||
<!-- Habits -->
|
||||
{#if equal(:task.type, 'habit')}
|
||||
{#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
|
||||
{#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
|
||||
<!-- Rewards -->
|
||||
{else if equal(:task.type, 'reward')}
|
||||
<a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
|
||||
<!-- Daily & Todos -->
|
||||
{else}
|
||||
<input type=checkbox checked="{:task.completed}">
|
||||
{/}
|
||||
</div>
|
||||
|
||||
<!-- edit/options dialog -->
|
||||
<app:taskMeta />
|
||||
</pre>
|
||||
<!-- main content -->
|
||||
<div class="task-text">{:task.text}</div>
|
||||
|
||||
<!-- edit/options dialog -->
|
||||
<app:taskMeta />
|
||||
</li>
|
||||
|
||||
<taskMeta:>
|
||||
|
|
|
|||
Loading…
Reference in a new issue