diff --git a/WebKit/css/default.css b/WebKit/css/default.css index 0ce7f2b..8576c17 100644 --- a/WebKit/css/default.css +++ b/WebKit/css/default.css @@ -173,7 +173,7 @@ p { font-weight: bold; } -li .date { +li .from { position: absolute; top: -1.8em; right: 10px; @@ -188,12 +188,12 @@ li .date { font-size: 0.9em; } -li:hover .date { +li:hover .from { display: block; } -li:first-child:hover .date { +li:first-child:hover .from { top: auto; bottom: -1.6em; z-index: 2; @@ -209,7 +209,6 @@ li:first-child:hover .date { aside { float: right; margin: 0 3px 3px 3px; - visibility: hidden; } .reply_to, .repost, .remove { @@ -218,12 +217,28 @@ aside { background: url(../img/sprite-icons.png) no-repeat -16px 0; float: right; margin-left: 2px; + visibility: hidden; } -li:hover aside { +li:hover aside .reply_to, li:hover aside .repost, li:hover aside .remove, li:hover aside .ago:before { visibility: visible; } +.ago { + float: right; + color: #666; +} + +.ago:before { + content: " "; + display: inline-block; + background: url(../img/conversation.png) no-repeat; + height: 12px; + width: 15px; + margin-right: 5px; + visibility: hidden; +} + .repost { background-position: -192px 0; } diff --git a/WebKit/img/conversation.png b/WebKit/img/conversation.png new file mode 100644 index 0000000..6afe4dd Binary files /dev/null and b/WebKit/img/conversation.png differ diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js index 37439c9..696739c 100644 --- a/WebKit/scripts/helper/Core.js +++ b/WebKit/scripts/helper/Core.js @@ -26,6 +26,10 @@ function(jQuery, Paths, URI, HostApp, Cache) { var aside = document.createElement("aside"); item.appendChild(aside); + var ago = a.cloneNode(); + ago.className = "ago"; + aside.appendChild(ago); + var reply_to = a.cloneNode(); reply_to.className = "reply_to" reply_to.innerText = " "; @@ -111,19 +115,16 @@ function(jQuery, Paths, URI, HostApp, Cache) { images.className = "images"; data.appendChild(images); - var date = message.cloneNode(); - date.className = "date"; - data.appendChild(date); + var from = message.cloneNode(); + from.className = "from"; + data.appendChild(from); - var ago = a.cloneNode(); - date.appendChild(ago); - - var from = document.createTextNode(" from "); - date.appendChild(from) + var from_text = document.createTextNode("from "); + from.appendChild(from_text) var source = document.createElement("a"); source.className = "source"; - date.appendChild(source) + from.appendChild(source) this.template = { item: item, diff --git a/WebKit/scripts/lib/Timeago.js b/WebKit/scripts/lib/Timeago.js index 7861893..8619c0d 100644 --- a/WebKit/scripts/lib/Timeago.js +++ b/WebKit/scripts/lib/Timeago.js @@ -43,11 +43,11 @@ function($) { prefixFromNow: null, suffixAgo: null, suffixFromNow: "from now", - seconds: "%d sec", - minute: "1 min", - minutes: "%d min", - hour: "1 h", - hours: "%d h", + seconds: "%ds", + minute: "1m", + minutes: "%dm", + hour: "1h", + hours: "%dh", day: "1 day", days: "%d day", month: "1 month",