Merge branch 'front-alpha' of https://github.com/nelsonic/time into f…

…ront-alpha
dwyl · Apr 12, 2015 · 205ad8d · 205ad8d
2 parents a4e8368 + 1b4137b
commit 205ad8d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 36 deletions.
diff --git a/front/public/css/mobile-first.css b/front/public/css/mobile-first.css
@@ -58,8 +58,8 @@ input {
 
   #feedback-triangle i:before{
     position:relative;
-    bottom: 1em;
-    right: 1em;
+    bottom: 0.9em;
+    right: 1.1em;
     color:white;
     font-size: 2em;
   }
@@ -154,49 +154,50 @@ input {
   .timer-one-line{
     display: table-row;
     border-bottom: 1px solid #d3d3d3;
-    /*width: 100%;*/
+    width: 100%;
   }
 
-  .timer-one-line span, .timer-one-line i{
-    display: table-cell;
-    padding: 0 0.3em;
-  }
-
-  .timer-one-line i{
-    width:1em;
-  }
-
-    span.timer-desc{
-      text-align:left;
+    .timer-one-line span, .timer-one-line i{
+      display: table-cell;
+      padding: 0 0.3em;
     }
 
-    span.timer-time{
-      text-align:right;
+    .timer-one-line i{
+      width:1em;
     }
 
-/*======== Past timer edit mode ========*/
+      span.timer-desc{
+        text-align:left;
+      }
 
+      span.timer-time{
+        text-align:right;
+        width: 3em;
+      }
+
+/*======== Past timer edit mode ========*/
 .timer-one-line button{
   border-radius:0;
   color: #fff;
   background: #323232;
-  border: solid 1px #fff;
+  border: none;
   text-transform:uppercase;
   text-align: center;
-  padding:0.3em;
-  margin: 0 0.5em 0 0;
-  /*font-size:0.8em;*/
+  padding:0.3em 0.4em;
+  margin: 0 0.5em 0 0.3em;
 }
 
-  .timer-one-line input{
-    border: 0;
-    border-bottom: solid 1px #403f3f;
-    resize: horizontal;
-    border-radius: 0;
-    background:none;
-    font-family: 'Open Sans', sans-serif;
-    color: #403f3f;
-  }
+.timer-one-line input{
+  border: 0;
+  border-bottom: solid 1px #403f3f;
+  resize: horizontal;
+  border-radius: 0;
+  background:none;
+  font-family: 'OpenSans', sans-serif;
+  color: #403f3f;
+  width: 85%;
+  display: inline-block;
+}
 
   .timer-one-line input:focus{
     outline: 0;

diff --git a/front/views/index.html b/front/views/index.html
@@ -14,8 +14,8 @@
   <body>
     <!--Icon first, then add mailto-->
     <div id="feedback-triangle">
-      <a href="https://github.com/ideaq/time/issues" target="_blank">
-        <i class="fa fa-question" aria-hidden="true"></i>
+      <a href="https://github.com/ideaq/time/labels/MVP" target="_blank">
+        <i class="fa fa-comment" aria-hidden="true"></i>
       </a>
     </div>
 
@@ -36,8 +36,8 @@
 
     <section id="past-timers">
       <div id="why">Track your time. Your past timers will appear here.</div>
-      <div id="past-timers-list">
-      </div>
+      <ul id="past-timers-list">
+      </ul>
     </section>
 
     <section id="register-login">
@@ -66,11 +66,11 @@
 
 <!-- HANDLEBARS TEMPLATE -->
   <script id="timer_list_template" type="text/x-handlebars-template">
-    <div id="\{{id}}" class="timer-one-line">
+    <li id="\{{id}}" class="timer-one-line">
         <i class="fa fa-check-circle-o"></i>
         <span class="timer-desc">\{{desc}}</span>
         <span class="timer-time">\{{took}}</span>
-    </div>
+    </li>
   </script>
 
 <!-- Handlebars form for updating the description of the timer -->