From a8c09110f7513e2a97edc9a4fb51f2a8e2e0620f Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 17:02:22 -0500
Subject: [PATCH] reverting redisign commits. @zakkain some issues here ill
 follow up with you on - if i forget, "add" button in responsive layout, item
 store issues

---
 styles/app/tasks.styl | 58 ++++++------------------------
 views/app/index.html  |  2 --
 views/app/tasks.html  | 83 +++++++++++++++++++++----------------------
 3 files changed, 51 insertions(+), 92 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 8c0b370fa0..70d54c189d 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -1,21 +1,21 @@
-.color-worst
+.color-worst pre
   background-color: rgb(230, 184, 175)
-.color-worse
+.color-worse pre
   background-color: rgb(244, 204, 204)
-.color-bad
+.color-bad pre
   background-color: rgb(252, 229, 205)
-.color-neutral
+.color-neutral pre
   background-color: rgb(255, 242, 204)
-.color-good
+.color-good pre
   background-color: rgb(217, 234, 211)
-.color-better
+.color-better pre
   background-color: rgb(208, 224, 227)
-.color-best
+.color-best pre
   background-color: rgb(201, 218, 248)
-.completed
+.completed pre
   background-color: rgb(217, 217, 217)
   color: rgb(153, 153, 153)
-.reward
+.reward pre
   background-color: white
 
 label.checkbox.inline{
@@ -76,10 +76,7 @@ li:hover .task-meta-controls .hover-show
 
   .task-controls,.task-text
     display:inline
-    margin: 0 10px 0 0
-
-    input
-      margin-top: 0
+    margin-right:10px
 
   .task-meta-controls .hover-show
     display: none;
@@ -88,37 +85,4 @@ li:hover .task-meta-controls .hover-show
     text-decoration:none;
 
 .new-task-form
-  margin-bottom:5px;
-
-
-// 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
-    font-family: 'Lato', sans-serif
-
-.todo-status-toggler
-  margin-top: 0.75em
\ No newline at end of file
+  margin-bottom:5px;
\ No newline at end of file
diff --git a/views/app/index.html b/views/app/index.html
index 69ce9f1db5..9d66e2fd2b 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -14,8 +14,6 @@
 <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 />
diff --git a/views/app/tasks.html b/views/app/tasks.html
index f0ff20c787..ccdd9bf407 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -1,18 +1,18 @@
 <taskLists:>
     <!--helpTitle & helpContent moved to tour -->
-    <div class="task-column span3 habits">
+    <div class="span3 well 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="task-column span3 dailys">
+    <div class="span3 well 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="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
+    <div class="span3 well 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 @@
                 <!--&nbsp;<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="todo-status-toggler nav nav-tabs">
+        <ul class="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="task-column span3 rewards">
+    <div class="span3 well rewards">
 
         <!--Title -->
         <div class="row-fluid">
@@ -123,52 +123,49 @@
     </div>
 
 <newTask:>
-    <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
-        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
-        <input class="btn addtask-btn" type="submit" value="Add">
+    <form class="form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
+        <input value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
+        <input class="btn" type="submit" value="Add" />
     </form>
 
-    <!-- all the parts of a single task -->
     <task:>
         <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-            <!-- 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>
+    <pre>
+    <div class="task-meta-controls">
 
-                {#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>
+        <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>
+    <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>
+    <div class="task-text">{:task.text}</div>
 
-            <!-- edit/options dialog -->
-            <app:taskMeta />
-        </li>
+    <app:taskMeta />
+    </pre>
+    </li>
 
 <taskMeta:>
     <div style="display:none;" id={{:task.id}}-edit>