From 3c0976a1e50efee96ddb71a42ee4b77dcac76cdc Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 28 Jul 2015 09:34:49 -0400 Subject: [PATCH 01/14] 1.0.20 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d4cdc83..e647f65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "1.0.19", + "version": "1.0.20", "nbbpm": { "compatibility": "^0.7.1" }, From 780a3a2dc05e2bf44eb82a3b3cc98d176b12d307 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 28 Jul 2015 10:12:32 -0400 Subject: [PATCH 02/14] 1.0.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e647f65..2176f3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "1.0.20", + "version": "1.0.21", "nbbpm": { "compatibility": "^0.7.1" }, From 14243e80ac5b0c8904bf2f0a98de250878d9cf69 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 12:43:02 -0400 Subject: [PATCH 03/14] Update styling and templates for nodebb/nodebb@60a6775, and also added better chat styling in general --- less/chats.less | 62 +++++++++++++++++++++++------ templates/chat.tpl | 12 +++--- templates/chats.tpl | 3 +- templates/partials/chat_message.tpl | 4 +- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/less/chats.less b/less/chats.less index b874f3d..f63e32e 100644 --- a/less/chats.less +++ b/less/chats.less @@ -56,7 +56,12 @@ font-weight: bold; i { - font-size: 1rem; + font-size: 14px; + vertical-align: center; + + &.fa-keyboard-o { + .animation(topic-reply-pulse 2s ease-in infinite); + } } } @@ -65,32 +70,63 @@ } } - ul.well { + ul { height: 250px; overflow-y: auto; resize: none; word-wrap: break-word; + padding: 0; + margin: 0; - li { + li.chat-message { list-style-type: none; - margin-bottom: 10px; font-weight: 300; + padding: 0 1.428rem; + + &:first-child { + padding-top: 1.428rem; + } - .chat-user-image { - width: 20px; - height: 20px; + &:last-child { + padding-bottom: 1.428rem; + } + + &[data-break="true"] { + padding-top: 1rem; + margin-top: 1rem; + border-top: 1px solid @gray-lighter; + } + + a { + display: block; + float: left; + + .chat-user-image { + width: 32px; + height: 32px; + } + } + + .chat-user { + display: inline-block; + margin-left: 13px; } .chat-timestamp { - color: darkgrey; - min-width: 60px; + color: @gray-light; + font-size: 1rem; display: inline-block; - text-align: right; + margin-left: 10px; .user-select(none); } .message-body { - clear: both; + margin-left: 45px; + + p { + margin: 7px 0 0 0; + line-height: 2rem; + } } &[data-self="0"] + [data-self="0"], &[data-self="1"] + [data-self="1"] { @@ -104,8 +140,8 @@ } .user-typing { - margin-top: -1.5em; - .opacity(0.5); + color: @gray-light; + margin: 1.428rem 0; } .selected[data-since] { diff --git a/templates/chat.tpl b/templates/chat.tpl index 25ee726..8db82cd 100644 --- a/templates/chat.tpl +++ b/templates/chat.tpl @@ -5,18 +5,18 @@
-

[[modules:chat.chatting_with]]

+

+ + [[modules:chat.chatting_with]] + +

[[recent:title]] • [[modules:chat.seven_days]] • [[modules:chat.thirty_days]] • [[modules:chat.three_months]] -
    - - -
+
    - diff --git a/templates/chats.tpl b/templates/chats.tpl index 8c96893..8752625 100644 --- a/templates/chats.tpl +++ b/templates/chats.tpl @@ -12,9 +12,8 @@
    [[recent:title]] • [[modules:chat.seven_days]] • [[modules:chat.thirty_days]] • [[modules:chat.three_months]] -
      +
        - [[modules:chat.user_typing, {meta.username}]]
      diff --git a/templates/partials/chat_message.tpl b/templates/partials/chat_message.tpl index 8ea027b..8567758 100644 --- a/templates/partials/chat_message.tpl +++ b/templates/partials/chat_message.tpl @@ -1,8 +1,8 @@
    • - - + {messages.fromUser.username} +
      {messages.content}
      • \ No newline at end of file From 9418fcb1dec2b772c4342fe7acc2f60fb5f2bb85 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 12:43:05 -0400 Subject: [PATCH 04/14] 1.0.22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2176f3d..0b30b06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "1.0.21", + "version": "1.0.22", "nbbpm": { "compatibility": "^0.7.1" }, From 4518c9293d918efbb29775d229665b434e2387d2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 12:59:22 -0400 Subject: [PATCH 05/14] nodebb/nodebb@2593f1b --- templates/chat.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/chat.tpl b/templates/chat.tpl index 8db82cd..1ae2536 100644 --- a/templates/chat.tpl +++ b/templates/chat.tpl @@ -14,7 +14,7 @@
      [[recent:title]] • [[modules:chat.seven_days]] • [[modules:chat.thirty_days]] • [[modules:chat.three_months]] -
        +
          From 0b959083bdd5e60c6ced833c3df85ee45cd761c0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 12:59:24 -0400 Subject: [PATCH 06/14] 1.0.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b30b06..645e2ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "1.0.22", + "version": "1.0.23", "nbbpm": { "compatibility": "^0.7.1" }, From 5c0d508dc98456d4902b3daf48d26dbdddf5109d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 15:21:32 -0400 Subject: [PATCH 07/14] Fix list behaviour in chats --- less/chats.less | 3 ++- less/mixins.less | 18 ++++++++++++++++++ less/topic.less | 16 +--------------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/less/chats.less b/less/chats.less index f63e32e..493fea3 100644 --- a/less/chats.less +++ b/less/chats.less @@ -70,7 +70,8 @@ } } - ul { + .chat-content { + .fix-lists; height: 250px; overflow-y: auto; resize: none; diff --git a/less/mixins.less b/less/mixins.less index fa9e0e0..e3f0449 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -46,4 +46,22 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; +} + +.fix-lists { + ul { + > li { + list-style-type: disc; + + ul > li { + list-style-type: circle; + + ul > li { + list-style-type: square; + } + } + } + + margin-bottom: 10px; + } } \ No newline at end of file diff --git a/less/topic.less b/less/topic.less index 0152acc..9b3dd87 100644 --- a/less/topic.less +++ b/less/topic.less @@ -239,21 +239,7 @@ } .content { - ul { - > li { - list-style-type: disc; - - ul > li { - list-style-type: circle; - - ul > li { - list-style-type: square; - } - } - } - - margin-bottom: 10px; - } + .fix-lists; blockquote { font-size: 85%; From fc590973a843b03649f0144ea766fff7f1682b54 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 15:21:34 -0400 Subject: [PATCH 08/14] 1.0.24 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 645e2ef..c997a99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "1.0.23", + "version": "1.0.24", "nbbpm": { "compatibility": "^0.7.1" }, From 6913d94e0808c0ca207c0e02395e74cb09ed2392 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 16:49:07 -0400 Subject: [PATCH 09/14] removed horizontal scrollbar in chat --- less/chats.less | 1 + 1 file changed, 1 insertion(+) diff --git a/less/chats.less b/less/chats.less index 493fea3..d72a987 100644 --- a/less/chats.less +++ b/less/chats.less @@ -74,6 +74,7 @@ .fix-lists; height: 250px; overflow-y: auto; + overflow-x: hidden; resize: none; word-wrap: break-word; padding: 0; From 65727fa6f1b5603dde5a9d145a18c77753607827 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2015 16:49:16 -0400 Subject: [PATCH 10/14] 1.0.25 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c997a99..33b5ac0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "1.0.24", + "version": "1.0.25", "nbbpm": { "compatibility": "^0.7.1" }, From e085992c648a196b40c4dd00aadae4121c96fe54 Mon Sep 17 00:00:00 2001 From: Raphael Beer Date: Thu, 30 Jul 2015 12:34:58 +0200 Subject: [PATCH 11/14] signature outside of content --- templates/partials/topic/post.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl index f917b45..fd60ccf 100644 --- a/templates/partials/topic/post.tpl +++ b/templates/partials/topic/post.tpl @@ -54,10 +54,10 @@
          {posts.content} - -
          {posts.user.signature}
          -
          + +
          {posts.user.signature}
          + From 60345c704017fcf445e955bb2fddf09b6b3c9639 Mon Sep 17 00:00:00 2001 From: Raphael Beer Date: Thu, 30 Jul 2015 12:48:18 +0200 Subject: [PATCH 12/14] added signature component and uid --- templates/partials/topic/post.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl index fd60ccf..56a62c8 100644 --- a/templates/partials/topic/post.tpl +++ b/templates/partials/topic/post.tpl @@ -56,7 +56,7 @@ {posts.content}
          -
          {posts.user.signature}
          +
          {posts.user.signature}
          From 19e7eb751cc3d9666867d0939f342fe18b7f1c0b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 30 Jul 2015 15:24:00 -0400 Subject: [PATCH 13/14] https://github.com/NodeBB/NodeBB/issues/3370 --- templates/notifications.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/notifications.tpl b/templates/notifications.tpl index 2161477..84b6e04 100644 --- a/templates/notifications.tpl +++ b/templates/notifications.tpl @@ -29,7 +29,7 @@

          - {notifications.bodyShort} + {notifications.bodyShort}

          From 0aef41cd58f476d901dacebadd2768b36e917ec2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 30 Jul 2015 15:25:19 -0400 Subject: [PATCH 14/14] 1.0.26 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33b5ac0..2e0bb46 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "1.0.25", + "version": "1.0.26", "nbbpm": { "compatibility": "^0.7.1" },