From 603fa54fc7582034e83378687cac24bfa2680950 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 18:08:38 -0400 Subject: [PATCH 1/8] chats refactor - styling init --- less/chats.less | 11 ++++++ templates/chats.tpl | 87 ++++++++++++++++++++++----------------------- 2 files changed, 53 insertions(+), 45 deletions(-) diff --git a/less/chats.less b/less/chats.less index 1a1d550..27e7bf3 100644 --- a/less/chats.less +++ b/less/chats.less @@ -163,4 +163,15 @@ textarea { resize: none; } +} + +.expanded-chat { + h1 { + margin: 0px; + padding-bottom: 20px; + } + + .chat-content { + padding-top: 10px; + } } \ No newline at end of file diff --git a/templates/chats.tpl b/templates/chats.tpl index 0d95b58..9e9071b 100644 --- a/templates/chats.tpl +++ b/templates/chats.tpl @@ -1,36 +1,6 @@
-
- -
- [[error:chat-restricted]] -
- - -
-
- -

[[modules:chat.message-history]]

-
-
- [[recent:title]] • [[modules:chat.seven_days]] • [[modules:chat.thirty_days]] • [[modules:chat.three_months]] -
    - -
-
- - - - -
-
-
- -
- [[modules:chat.no-messages]] -
- -
+ -
  • - - - {chats.username} -
    • - - + --> + +
      + +
    • + + + {chats.username} +
      • + +
    + +
    + +
    + +
    + [[error:chat-restricted]] +
    + + +
    + + +

    {meta.username}

    + + + [[recent:title]] • [[modules:chat.seven_days]] • [[modules:chat.thirty_days]] • [[modules:chat.three_months]] +
      + +
    +
    + + + +
    + +
    + [[modules:chat.no-messages]] +
    +
    From 147343028bd218abb13d44d5d6107fdb159baa9a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 18:29:42 -0400 Subject: [PATCH 2/8] added teaser content and timeago --- templates/chats.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/chats.tpl b/templates/chats.tpl index 9e9071b..20f07d4 100644 --- a/templates/chats.tpl +++ b/templates/chats.tpl @@ -25,6 +25,8 @@ {chats.username} + {chats.teaser.content} + From 4ecd12c6efe554e978b968f0858a91121e44443d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 18:39:41 -0400 Subject: [PATCH 3/8] more chat styling --- less/chats.less | 28 ++++++++++++++++++++++++---- templates/chats.tpl | 10 +++++----- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/less/chats.less b/less/chats.less index 27e7bf3..121f186 100644 --- a/less/chats.less +++ b/less/chats.less @@ -8,10 +8,11 @@ clear: both; list-style-type: none; padding: 0.5em; + height: 70px; .pointer; &.typing { - span:after { + .username:after { visibility: visible; } } @@ -20,7 +21,9 @@ .bg-variant(@state-warning-bg); } - span { + .username { + font-size: 18px; + &:after { display: inline-block; font-family: "FontAwesome"; @@ -30,6 +33,13 @@ } } + .teaser-timestamp { + font-size: 10px; + position: absolute; + top: 8px; + right: 24px; + } + a { display: block; .text-ellipsis; @@ -40,11 +50,21 @@ } .user-img { - width:24px; - height:24px; + width: 50px; + height: 50px; + float: left; + margin-top: 4px; + margin-right: 13px; margin-left: 0.5em; border-radius: 50%; } + + .status { + position: absolute; + left: 65px; + font-size: 20px; + top: 11px; + } } } diff --git a/templates/chats.tpl b/templates/chats.tpl index 20f07d4..d764120 100644 --- a/templates/chats.tpl +++ b/templates/chats.tpl @@ -1,5 +1,5 @@
    -
    +
  • - - {chats.username} + + {chats.username} {chats.teaser.content} - +
    • -
    +
    [[error:chat-restricted]] From f7c15046c664716f0f7e8a05102f830dd64afd5c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 28 Aug 2015 20:54:42 -0400 Subject: [PATCH 4/8] add contacts below recent chats --- templates/chats.tpl | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/templates/chats.tpl b/templates/chats.tpl index d764120..9df480c 100644 --- a/templates/chats.tpl +++ b/templates/chats.tpl @@ -1,24 +1,5 @@
    - -
  • - - - {contacts.username} -
    • - - -
    -
    - --> -
    • @@ -29,6 +10,13 @@
      • + +
    • + + + {contacts.username} +
      • +
    From 39841df84079561f6e6d7b58736282dc9ebe3565 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 31 Aug 2015 16:11:05 -0400 Subject: [PATCH 5/8] styling unread vs active chats --- less/chats.less | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/less/chats.less b/less/chats.less index 121f186..c78f31d 100644 --- a/less/chats.less +++ b/less/chats.less @@ -11,6 +11,8 @@ height: 70px; .pointer; + background: @body-bg; + &.typing { .username:after { visibility: visible; @@ -18,7 +20,11 @@ } &.unread { - .bg-variant(@state-warning-bg); + background: lighten(@brand-primary, 25%); + } + + &.bg-primary { + background: @brand-primary; } .username { From 86d73bfdd1fea825aa6d2f958f52ca46fd5093f2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 31 Aug 2015 16:16:35 -0400 Subject: [PATCH 6/8] more styling of chats page --- less/chats.less | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/less/chats.less b/less/chats.less index c78f31d..b356954 100644 --- a/less/chats.less +++ b/less/chats.less @@ -3,14 +3,21 @@ max-height: 608px; overflow-x: hidden; overflow-y: auto; + border-top: 1px solid @gray-lighter; li { + position: relative; clear: both; list-style-type: none; padding: 0.5em; height: 70px; .pointer; + border-left: 1px solid; + border-right: 1px solid; + border-bottom: 1px solid; + border-color: @gray-lighter; + background: @body-bg; &.typing { @@ -67,9 +74,9 @@ .status { position: absolute; - left: 65px; + left: 50px; font-size: 20px; - top: 11px; + top: 10px; } } } From aa242897ba5af4f1feac8847fe2b244e5999493c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 31 Aug 2015 16:36:41 -0400 Subject: [PATCH 7/8] last bit of styling for chats page --- less/chats.less | 4 ++++ templates/chats.tpl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/less/chats.less b/less/chats.less index b356954..a96b980 100644 --- a/less/chats.less +++ b/less/chats.less @@ -207,4 +207,8 @@ .chat-content { padding-top: 10px; } + + .input-group { + position: absolute; + } } \ No newline at end of file diff --git a/templates/chats.tpl b/templates/chats.tpl index 9df480c..23457b1 100644 --- a/templates/chats.tpl +++ b/templates/chats.tpl @@ -14,7 +14,7 @@
  • - {contacts.username} + {contacts.username}
    • From aeee17866cb35b817dfb44b247814db48b555940 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 31 Aug 2015 16:37:00 -0400 Subject: [PATCH 8/8] 2.1.18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 577af91..acc84c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "2.1.17", + "version": "2.1.18", "nbbpm": { "compatibility": "^0.8.0" },