UI Tweak: column headers, re-alignments.
- Added 'start' and 'duration' headers to day seperators. - Right-aligned start and duration columns. - Changed duration to 'Xhr Ym' instead of 'HH:MM:SS'. - Added a section using 12hr time format instead of 24hr for comparison.
This commit is contained in:
Jonathan Bernard
parent
dd3387a0f1
commit
06556020d4
@ -23,6 +23,7 @@ input {
|
||||
#top {
|
||||
background: #222222;
|
||||
color: #eeeeee;
|
||||
padding: 0.5em 0;
|
||||
padding: 0.5rem 0;
|
||||
position: fixed;
|
||||
top: 0px;
|
||||
@ -34,6 +35,8 @@ input {
|
||||
|
||||
#user {
|
||||
font-family: "Josefin Sans";
|
||||
margin-top: -0.3em;
|
||||
padding: 0 2em;
|
||||
margin-top: -0.3rem;
|
||||
padding: 0 2rem;
|
||||
width: 100%; }
|
||||
@ -59,6 +62,7 @@ input {
|
||||
border-bottom: thin solid #eeeeee;
|
||||
font-family: Arvo;
|
||||
font-size: 1.5em;
|
||||
padding: 0 2em;
|
||||
padding: 0 2rem; }
|
||||
#timeline .timeline-desc {
|
||||
display: inline-block;
|
||||
@ -89,46 +93,49 @@ input {
|
||||
font-size: medium; }
|
||||
|
||||
#entry-list {
|
||||
margin-top: 6em;
|
||||
padding-bottom: 1em;
|
||||
margin-top: 6rem;
|
||||
padding-bottom: 1rem; }
|
||||
|
||||
#new-entry {
|
||||
margin-top: 0.5rem;
|
||||
padding: 0 2rem; }
|
||||
#new-entry .mark-input {
|
||||
width: 78%; }
|
||||
|
||||
#entries .entry {
|
||||
font-family: Cantarell;
|
||||
padding: 0 2rem; }
|
||||
#entries .entry div {
|
||||
display: inline-block; }
|
||||
#entries .entry .timestamp, #entries .entry .timestamp-input {
|
||||
#entry-list .day-seperator {
|
||||
background: #cccccc;
|
||||
color: #222222;
|
||||
font-family: Cantarell;
|
||||
font-weight: bold;
|
||||
margin-top: 1em;
|
||||
padding: 0 2em;
|
||||
margin-top: 1rem;
|
||||
padding: 0 2rem; }
|
||||
#entry-list .day-seperator h4, #entry-list .day-seperator h5 {
|
||||
display: inline-block; }
|
||||
#entry-list #new-entry {
|
||||
margin-top: 0.5em;
|
||||
padding: 0 2em;
|
||||
margin-top: 0.5rem;
|
||||
padding: 0 2rem; }
|
||||
#entry-list .timestamp, #entry-list .timestamp-input, #entry-list .duration {
|
||||
text-align: right;
|
||||
width: 10%; }
|
||||
#entries .entry .duration {
|
||||
width: 10%; }
|
||||
#entries .entry .mark {
|
||||
#entry-list .mark, #entry-list .mark-input {
|
||||
width: 78%; }
|
||||
#entries .entry .mark-input, #entries .entry .timestamp-input {
|
||||
display: none; }
|
||||
#entries .entry .notes {
|
||||
display: none; }
|
||||
#entries .entry.edit-mark .mark-input {
|
||||
display: inline-block; }
|
||||
#entries .entry.edit-mark .mark {
|
||||
display: none; }
|
||||
#entries .entry.edit-timestamp .timestamp-input {
|
||||
display: inline-block; }
|
||||
#entries .entry.edit-timestamp .timestamp {
|
||||
display: none; }
|
||||
|
||||
.day-seperator {
|
||||
background: #cccccc;
|
||||
color: #222222;
|
||||
font-family: Cantarell;
|
||||
font-weight: bold;
|
||||
margin-top: 1rem;
|
||||
padding: 0 2rem; }
|
||||
#entry-list .entry {
|
||||
font-family: Cantarell;
|
||||
padding: 0 2em;
|
||||
padding: 0 2rem; }
|
||||
#entry-list .entry div {
|
||||
display: inline-block; }
|
||||
#entry-list .entry .mark-input, #entry-list .entry .timestamp-input {
|
||||
display: none; }
|
||||
#entry-list .entry .notes {
|
||||
display: none; }
|
||||
#entry-list .entry.edit-mark .mark-input {
|
||||
display: inline-block; }
|
||||
#entry-list .entry.edit-mark .mark {
|
||||
display: none; }
|
||||
#entry-list .entry.edit-timestamp .timestamp-input {
|
||||
display: inline-block; }
|
||||
#entry-list .entry.edit-timestamp .timestamp {
|
||||
display: none; }
|
||||
|
||||
.drop-menu {
|
||||
position: relative; }
|
||||
@ -151,6 +158,7 @@ input {
|
||||
background: #222222;
|
||||
color: #eeeeee;
|
||||
font-family: Bentham;
|
||||
padding: 1em 0;
|
||||
padding: 1rem 0;
|
||||
text-align: center;
|
||||
width: 100%; }
|
||||
|
||||
@ -27,13 +27,14 @@ input {
|
||||
border: solid thin lighten($darkTxt, 20%);
|
||||
-webkit-box-shadow: inset 0px 2px 4px #CCC;
|
||||
box-shadow: inset 0px 2px 4px #CCC;
|
||||
margin-bottom: 0.5em;
|
||||
margin-bottom: 0.5em; // IE fix
|
||||
font-family: Cantarell;
|
||||
}
|
||||
|
||||
#top {
|
||||
background: $darkBg;
|
||||
color: $lightTxt;
|
||||
padding: 0.5em 0; // IE Fix
|
||||
padding: 0.5rem 0;
|
||||
position: fixed;
|
||||
top: 0px;
|
||||
@ -49,6 +50,8 @@ input {
|
||||
#user {
|
||||
|
||||
font-family: "Josefin Sans";
|
||||
margin-top: -0.3em; // IE fix
|
||||
padding: 0 2em;
|
||||
margin-top: -0.3rem;
|
||||
padding: 0 2rem;
|
||||
width: 100%;
|
||||
@ -83,6 +86,7 @@ input {
|
||||
border-bottom: thin solid $lightBg;
|
||||
font-family: Arvo;
|
||||
font-size: 1.5em;
|
||||
padding: 0 2em;
|
||||
padding: 0 2rem;
|
||||
|
||||
.timeline-desc {
|
||||
@ -124,37 +128,53 @@ input {
|
||||
}
|
||||
|
||||
#entry-list {
|
||||
|
||||
margin-top: 6em;
|
||||
padding-bottom: 1em;
|
||||
margin-top: 6rem;
|
||||
padding-bottom: 1rem;
|
||||
}
|
||||
|
||||
#new-entry {
|
||||
margin-top: 0.5rem;
|
||||
padding: 0 2rem;
|
||||
.day-seperator {
|
||||
|
||||
.mark-input { width: 78%; }
|
||||
background: $medBg;
|
||||
color: $darkBg;
|
||||
font-family: Cantarell;
|
||||
font-weight: bold;
|
||||
margin-top: 1em;
|
||||
padding: 0 2em;
|
||||
margin-top: 1rem;
|
||||
padding: 0 2rem;
|
||||
|
||||
}
|
||||
h4, h5 { display: inline-block; }
|
||||
}
|
||||
|
||||
#entries {
|
||||
#new-entry {
|
||||
margin-top: 0.5em;
|
||||
padding: 0 2em;
|
||||
margin-top: 0.5rem;
|
||||
padding: 0 2rem;
|
||||
|
||||
}
|
||||
|
||||
.timestamp, .timestamp-input, .duration {
|
||||
text-align: right;
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
.mark, .mark-input { width: 78%; }
|
||||
|
||||
.entry {
|
||||
|
||||
font-family: Cantarell;
|
||||
padding: 0 2em;
|
||||
padding: 0 2rem;
|
||||
|
||||
div { display: inline-block; }
|
||||
|
||||
.timestamp, .timestamp-input { width: 10%; }
|
||||
|
||||
.duration { width: 10%; }
|
||||
|
||||
.mark { width: 78%; }
|
||||
|
||||
.mark-input, .timestamp-input { display: none; }
|
||||
|
||||
.notes { display: none; }
|
||||
|
||||
|
||||
&.edit-mark {
|
||||
.mark-input { display: inline-block; }
|
||||
.mark { display: none; }
|
||||
@ -169,15 +189,6 @@ input {
|
||||
|
||||
}
|
||||
|
||||
.day-seperator {
|
||||
background: $medBg;
|
||||
color: $darkBg;
|
||||
font-family: Cantarell;
|
||||
font-weight: bold;
|
||||
margin-top: 1rem;
|
||||
padding: 0 2rem;
|
||||
}
|
||||
|
||||
.drop-menu {
|
||||
position: relative;
|
||||
|
||||
@ -209,6 +220,7 @@ input {
|
||||
background: $darkBg;
|
||||
color: $lightTxt;
|
||||
font-family: Bentham;
|
||||
padding: 1em 0;
|
||||
padding: 1rem 0;
|
||||
text-align: center;
|
||||
width: 100%;
|
||||
|
||||
@ -41,7 +41,11 @@
|
||||
</div>
|
||||
|
||||
<div id="entry-list">
|
||||
<div class="day-seperator">Today</div>
|
||||
<div class="day-seperator">
|
||||
<h4 class='mark'>Today</h4>
|
||||
<h5 class='timestamp'>start</h5>
|
||||
<h5 class='duration'>duration</h5>
|
||||
</div>
|
||||
<div id="new-entry">
|
||||
<input id="new-entry-input" class="mark-input"
|
||||
placeholder="Start a new task..." type="text" />
|
||||
@ -53,7 +57,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">12:32</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">4<span class="tick-tock">:</span>03<span class="tick-tock">:</span>57</div>
|
||||
<div class="duration">4<span class="tick-tock">hr </span>3<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -61,7 +65,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">9:56</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">1<span class="tick-tock">:</span>15<span class="tick-tock">:</span>00</div>
|
||||
<div class="duration">1<span class="tick-tock">hr </span>15<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -69,49 +73,57 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">9:10</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>47<span class="tick-tock">:</span>23</div>
|
||||
<div class="duration">47<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="day-seperator">Yesterday</div>
|
||||
<div class="day-seperator">
|
||||
<h4 class='mark'>Yesterday</h4>
|
||||
<h5 class='timestamp'>start</h5>
|
||||
<h5 class='duration'>duration</h5>
|
||||
</div>
|
||||
<div class="entry">
|
||||
<div class="mark">ITHelp: Working #7801.</div>
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">15:12</div>
|
||||
<div class="timestamp">3:12 pm</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>12<span class="tick-tock">:</span>57</div>
|
||||
<div class="duration">12<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
<div class="mark">Lunch.</div>
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">11:47</div>
|
||||
<div class="timestamp">11:47 am</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">3<span class="tick-tock">:</span>25<span class="tick-tock">:</span>33</div>
|
||||
<div class="duration">3<span class="tick-tock">hr </span>25<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
<div class="mark">ITHelp: Entering tickets.</div>
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">9:20</div>
|
||||
<div class="timestamp">9:20 am</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">2<span class="tick-tock">:</span>27<span class="tick-tock">:</span>57</div>
|
||||
<div class="duration">2<span class="tick-tock">hr </span>27<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
<div class="mark">ITHelp: Reproducing #7796.</div>
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">9:11</div>
|
||||
<div class="timestamp">9:11 am</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>09<span class="tick-tock">:</span>41</div>
|
||||
<div class="duration">9<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="day-seperator">Monday</div>
|
||||
<div class="day-seperator">
|
||||
<h4 class='mark'>Monday</h4>
|
||||
<h5 class='timestamp'>start</h5>
|
||||
<h5 class='duration'>duration</h5>
|
||||
</div>
|
||||
<div class="entry">
|
||||
<div class="mark">ITHelp: Working #7733.</div>
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">16:41</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">1<span class="tick-tock">:</span>08<span class="tick-tock">:</span>07</div>
|
||||
<div class="duration">1<span class="tick-tock">hr </span>8<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -119,7 +131,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">10:30</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">4<span class="tick-tock">:</span>11<span class="tick-tock">:</span>03</div>
|
||||
<div class="duration">4<span class="tick-tock">hr </span>11<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -127,16 +139,20 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">8:40</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">1<span class="tick-tock">:</span>50<span class="tick-tock">:</span>28</div>
|
||||
<div class="duration">1<span class="tick-tock">hr </span>50<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="day-seperator">Friday, April 29th</div>
|
||||
<div class="day-seperator">
|
||||
<h4 class='mark'>Friday, April 29th</h4>
|
||||
<h5 class='timestamp'>start</h5>
|
||||
<h5 class='duration'>duration</h5>
|
||||
</div>
|
||||
<div class="entry">
|
||||
<div class="mark">Training Steve: Databases and SQL</div>
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">16:09</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>55<span class="tick-tock">:</span>34</div>
|
||||
<div class="duration">55<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -144,7 +160,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">15:12</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>57<span class="tick-tock">:</span>05</div>
|
||||
<div class="duration">57<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -152,7 +168,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">15:09</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>03<span class="tick-tock">:</span>07</div>
|
||||
<div class="duration">3<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -160,7 +176,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">14:44</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>25<span class="tick-tock">:</span>20</div>
|
||||
<div class="duration">25<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -168,7 +184,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">14:41</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>03<span class="tick-tock">:</span>42</div>
|
||||
<div class="duration">3<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -176,7 +192,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">14:00</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>41<span class="tick-tock">:</span>00</div>
|
||||
<div class="duration">41<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -184,7 +200,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">13:05</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>55<span class="tick-tock">:</span>56</div>
|
||||
<div class="duration">55<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -192,7 +208,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">12:40</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>20<span class="tick-tock">:</span>20</div>
|
||||
<div class="duration">20<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -200,7 +216,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">10:30</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">2<span class="tick-tock">:</span>10<span class="tick-tock">:</span>14</div>
|
||||
<div class="duration">2<span class="tick-tock">hr </span>10<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -208,7 +224,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">09:25</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">1<span class="tick-tock">:</span>05<span class="tick-tock">:</span>49</div>
|
||||
<div class="duration">1<span class="tick-tock">hr </span>5<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
<div class="entry">
|
||||
@ -216,7 +232,7 @@
|
||||
<input class="mark-input" type="text"/>
|
||||
<div class="timestamp">09:17</div>
|
||||
<input class="timestamp-input" type="text"/>
|
||||
<div class="duration">0<span class="tick-tock">:</span>08<span class="tick-tock">:</span>20</div>
|
||||
<div class="duration">8<span class="tick-tock">m </span></div>
|
||||
<div class="notes">Some notes should go here, but they should be hidden by default</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user