move add button in to list

Memkits · Mar 10, 2014 · 8f8496a · 8f8496a
1 parent cf6e5a9
commit 8f8496a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 27 deletions.
diff --git a/page/column.css b/page/column.css
@@ -1,9 +1,8 @@
 
 .list {
     box-shadow: 1px 1px 2px rgba(165, 165, 165, 0.51);
-    align-self: stretch;
-    flex: 1;
-    padding: 100px 0px 200px;
+    padding-bottom: 400px;
+    overflow: auto;
 }
 
 .cover {
@@ -18,18 +17,6 @@
     margin: 0px 9px;
     font-size: 33px;
 }
-
-#add {
-    font-size: 40px;
-    margin: 30px 0px;
-    width: 40px;
-    text-align: center;
-    color: rgb(182, 182, 182);
-}
-#add:hover {
-    color: rgb(165, 68, 219);
-}
-
 .empty {
     padding: 176px;
     color: rgb(165, 165, 165);

diff --git a/page/menu.css b/page/menu.css
@@ -8,8 +8,8 @@
 }
 
 #menu > div {
-    background: rgb(238, 238, 238);
-    color: rgb(109, 109, 109);
+    background: rgb(243, 243, 243);
+    color: rgb(0, 0, 0);
     -webkit-transition-duration: 200ms;
     flex: 1;
     display: flex;
@@ -18,10 +18,6 @@
     display: flex;
     box-shadow: 0px 0px 1px rgb(209, 209, 209);
 }
-#menu > div:hover {
-    background: white;
-    color: black;
-}
 
 .mode-futures#menu {}
 .mode-futures #futures {
@@ -35,6 +31,7 @@
 .mode-working #working {
     flex: 3;
     background: white;
+    overflow: hidden;
 }
 
 .mode-history#menu {}

diff --git a/page/record.css b/page/record.css
@@ -2,7 +2,7 @@
 
 .record {
     padding: 10px;
-    box-shadow: 0px 0px 3px rgb(182, 182, 182);
+    border-bottom: solid 1px rgb(255, 226, 226);
 }
 
 .record .action {
@@ -26,4 +26,5 @@
     color: rgb(197, 197, 197);
     font-size: 16px;
     line-height: 22px;
+    padding-left: 2em;
 }
diff --git a/page/task.css b/page/task.css
@@ -1,12 +1,31 @@
 
+#task-creator {
+    height: 60px;
+}
+#task-creator #add {
+    line-height: 40px;
+    font-size: 35px;
+    cursor: pointer;
+    display: inline-block;
+    width: 40px;
+    height: 40px;
+    margin-left: 20px;
+    text-align: center;
+    color: rgb(185, 185, 185);
+}
+
+#task-creator, .task {
+    border-bottom: solid 1px rgb(224, 224, 224);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-content: center;
+}
+
 .task {
     padding: 0 20px;
     position: relative;
     height: 80px;
-    border-bottom: solid 1px rgb(224, 224, 224);
-}
-.list .task:first-child {
-    border-top: 1px solid rgb(236, 236, 236);
 }
 .task .title {
 }

diff --git a/view/menu.jade b/view/menu.jade
@@ -21,8 +21,9 @@
       .text
         span.count(v-model='working.length')
         span working tasks
-      .button#add(v-on='click: createTask') +
     .list(v-show='mode == "working"')
+      #task-creator
+        #add(v-on='click: createTask') +
       .task(v-repeat='working')
         .title(v-model='title')
         .content(v-model='content')