From f6f4d7f3e5a33458282f5cd8339f9a3380bfc9a3 Mon Sep 17 00:00:00 2001 From: psychobunny <rodrigues.andrew@gmail.com> Date: Wed, 1 Mar 2017 12:59:07 -0500 Subject: [PATCH 01/12] closes https://github.com/NodeBB/NodeBB/issues/5494 --- templates/header.tpl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/templates/header.tpl b/templates/header.tpl index 5769fe0..61d99ad 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -7,13 +7,6 @@ <!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS --> <!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags --> - <!--[if lt IE 9]> - <script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/2.3.0/es5-shim.min.js"></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.min.js"></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script> - <script>__lt_ie_9__ = 1;</script> - <![endif]--> - <script> var RELATIVE_PATH = "{relative_path}"; var config = JSON.parse('{{configJSON}}'); From 71c446dab6ff25d0b05e04c242feb63027152440 Mon Sep 17 00:00:00 2001 From: RoiEX <RoiEXLab@users.noreply.github.com> Date: Sat, 4 Mar 2017 23:41:41 +0100 Subject: [PATCH 02/12] Add additional css --- less/style.less | 55 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/less/style.less b/less/style.less index 7863e72..55b6158 100644 --- a/less/style.less +++ b/less/style.less @@ -149,11 +149,56 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { width: 100%; margin: 0; padding: 30px 0; - background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, white)); - background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), white); - background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), white); - background-image: -ms-linear-gradient(top, transparent, white); - background-image: -o-linear-gradient(top, transparent, white); +} + +.skin-default, .skin-cerulean, .skin-cosmo, .skin-flatly, .skin-journal, .skin-lumen, .skin-paper, .skin-readable, .skin-sandstone, .skin-spacelab, .skin-united, .skin-yeti { + .fade-out { + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, white)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), white); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), white); + background-image: -ms-linear-gradient(top, transparent, white); + background-image: -o-linear-gradient(top, transparent, white); + } +} + +.skin-cyborg .fade-out { + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #060606)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #060606); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #060606); + background-image: -ms-linear-gradient(top, transparent, #060606); + background-image: -o-linear-gradient(top, transparent, #060606); +} + +.skin-darkly .fade-out { + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #222222)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #222222); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #222222); + background-image: -ms-linear-gradient(top, transparent, #222222); + background-image: -o-linear-gradient(top, transparent, #222222); +} + +.skin-simplex .fade-out { + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #fcfcfc)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #fcfcfc); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #fcfcfc); + background-image: -ms-linear-gradient(top, transparent, #fcfcfc); + background-image: -o-linear-gradient(top, transparent, #fcfcfc); +} + +.skin-slate .fade-out { + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #272b30)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #272b30); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #272b30); + background-image: -ms-linear-gradient(top, transparent, #272b30); + background-image: -o-linear-gradient(top, transparent, #272b30); +} + +.skin-superhero .fade-out { + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, transparent),color-stop(1, #2b3e50)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #2b3e50); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #2b3e50); + background-image: -ms-linear-gradient(top, transparent, #2b3e50); + background-image: -o-linear-gradient(top, transparent, #2b3e50); } .icon-container { From a09abafb9b8a374272cd7f07a7f2cc0a684e7f20 Mon Sep 17 00:00:00 2001 From: barisusakli <barisusakli@gmail.com> Date: Wed, 8 Mar 2017 14:22:48 +0300 Subject: [PATCH 03/12] add timestamp --- templates/partials/chats/message.tpl | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/templates/partials/chats/message.tpl b/templates/partials/chats/message.tpl index eda371e..27fa142 100644 --- a/templates/partials/chats/message.tpl +++ b/templates/partials/chats/message.tpl @@ -1,27 +1,27 @@ -<li component="chat/message" class="chat-message clear" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}"> - <div class="message-header"> - <a href="{config.relative_path}/user/{messages.fromUser.userslug}"> - <!-- IF messages.fromUser.picture --> - <img class="chat-user-image not-responsive" src="{messages.fromUser.picture}"> - <!-- ELSE --> - <div class="user-icon chat-user-image" style="background-color: {messages.fromUser.icon:bgColor};">{messages.fromUser.icon:text}</div> - <!-- ENDIF messages.fromUser.picture --> - </a> - <strong><span class="chat-user">{messages.fromUser.username}</span></strong> - <span class="chat-timestamp timeago" title="{messages.timestampISO}"></span> - </div> - <div component="chat/message/body" class="message-body"> - <!-- IF messages.edited --> - <small class="text-muted pull-right" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small> - <!-- ENDIF messages.edited --> - <!-- IF !config.disableChatMessageEditing --> - <!-- IF messages.self --> - <div class="pull-right btn-group controls"> - <button class="btn btn-xs btn-link" data-action="edit"><i class="fa fa-pencil"></i></button> - <button class="btn btn-xs btn-link" data-action="delete"><i class="fa fa-times"></i></button> - </div> - <!-- ENDIF messages.self --> - <!-- ENDIF !config.disableChatMessageEditing --> - {messages.content} - </div> +<li component="chat/message" class="chat-message clear" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}" data-timestamp="{messages.timestamp}"> + <div class="message-header"> + <a href="{config.relative_path}/user/{messages.fromUser.userslug}"> + <!-- IF messages.fromUser.picture --> + <img class="chat-user-image not-responsive" src="{messages.fromUser.picture}"> + <!-- ELSE --> + <div class="user-icon chat-user-image" style="background-color: {messages.fromUser.icon:bgColor};">{messages.fromUser.icon:text}</div> + <!-- ENDIF messages.fromUser.picture --> + </a> + <strong><span class="chat-user">{messages.fromUser.username}</span></strong> + <span class="chat-timestamp timeago" title="{messages.timestampISO}"></span> + </div> + <div component="chat/message/body" class="message-body"> + <!-- IF messages.edited --> + <small class="text-muted pull-right" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small> + <!-- ENDIF messages.edited --> + <!-- IF !config.disableChatMessageEditing --> + <!-- IF messages.self --> + <div class="pull-right btn-group controls"> + <button class="btn btn-xs btn-link" data-action="edit"><i class="fa fa-pencil"></i></button> + <button class="btn btn-xs btn-link" data-action="delete"><i class="fa fa-times"></i></button> + </div> + <!-- ENDIF messages.self --> + <!-- ENDIF !config.disableChatMessageEditing --> + {messages.content} + </div> </li> \ No newline at end of file From a843f0ce2098974b106a6bf3676efec6957be364 Mon Sep 17 00:00:00 2001 From: barisusakli <barisusakli@gmail.com> Date: Wed, 8 Mar 2017 19:55:24 +0300 Subject: [PATCH 04/12] hide overflow --- less/search.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/less/search.less b/less/search.less index eb648ed..ff63a25 100644 --- a/less/search.less +++ b/less/search.less @@ -7,6 +7,9 @@ display: block; } } + #posted-in-categories { + overflow-y: hidden; + } } .search-result-text { From bce6a7f30de4ca4ce672902ab95075c65140b598 Mon Sep 17 00:00:00 2001 From: barisusakli <barisusakli@gmail.com> Date: Wed, 8 Mar 2017 20:06:38 +0300 Subject: [PATCH 05/12] revert overflow --- less/search.less | 3 --- 1 file changed, 3 deletions(-) diff --git a/less/search.less b/less/search.less index ff63a25..eb648ed 100644 --- a/less/search.less +++ b/less/search.less @@ -7,9 +7,6 @@ display: block; } } - #posted-in-categories { - overflow-y: hidden; - } } .search-result-text { From 32da035e193f46a5216119330e5c10804a853b85 Mon Sep 17 00:00:00 2001 From: barisusakli <barisusakli@gmail.com> Date: Thu, 9 Mar 2017 16:45:35 +0300 Subject: [PATCH 06/12] closes https://github.com/NodeBB/NodeBB/issues/5512 --- less/chats.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/chats.less b/less/chats.less index 2bd1789..e828990 100644 --- a/less/chats.less +++ b/less/chats.less @@ -36,7 +36,7 @@ &.unread { background: lighten(@brand-primary, 35%); border-bottom: 0; - + } .teaser-content { @@ -162,7 +162,7 @@ } .chat-modal { - z-index: 10000 !important; + z-index: 10000; } .expanded-chat, .chat-modal { From 0d2983ccd684b35924a63c8dc23f631e0077c130 Mon Sep 17 00:00:00 2001 From: barisusakli <barisusakli@gmail.com> Date: Thu, 9 Mar 2017 17:21:50 +0300 Subject: [PATCH 07/12] readonly input for system groups --- templates/groups/details.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl index 472ffb6..32a66e9 100644 --- a/templates/groups/details.tpl +++ b/templates/groups/details.tpl @@ -157,7 +157,7 @@ <form component="groups/settings" role="form"> <div class="form-group"> <label for="name">[[groups:details.group_name]]</label> - <input class="form-control" name="name" id="name" type="text" value="{group.displayName}" /> + <input <!-- IF group.system -->readonly<!-- ENDIF group.system --> class="form-control" name="name" id="name" type="text" value="{group.displayName}" /> </div> <div class="form-group"> <label for="name">[[groups:details.description]]</label> From fcca574ac3cfe7d99b3a276a9a556b79f78ae035 Mon Sep 17 00:00:00 2001 From: barisusakli <barisusakli@gmail.com> Date: Fri, 10 Mar 2017 20:12:56 +0300 Subject: [PATCH 08/12] fix spacing issue --- templates/groups/details.tpl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl index 32a66e9..fb2a776 100644 --- a/templates/groups/details.tpl +++ b/templates/groups/details.tpl @@ -108,10 +108,15 @@ <div class="input-group"> <input class="form-control" type="text" component="groups/members/invite" placeholder="[[groups:invited.search]]"/> <span class="input-group-addon search-button"><i class="fa fa-search"></i></span> - </div><br /> + </div> + + <div class="form-group"> + <textarea class="form-control" component="groups/members/bulk-invite" placeholder="[[groups:bulk-invite-instructions]]"></textarea> + </div> - <textarea class="form-control" component="groups/members/bulk-invite" placeholder="[[groups:bulk-invite-instructions]]"></textarea> - <button class="btn btn-default btn-sm pull-right" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button><br/><br/> + <div class="form-group"> + <button class="btn btn-default btn-sm pull-right" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button> + </div> <table component="groups/invited" class="table table-striped table-hover"> <!-- IF !group.invited.length --> From 6b928f9f22da0aab8a466e02178a352ed5ba8b96 Mon Sep 17 00:00:00 2001 From: psychobunny <rodrigues.andrew@gmail.com> Date: Fri, 10 Mar 2017 13:35:29 -0500 Subject: [PATCH 09/12] https://github.com/NodeBB/NodeBB/issues/5510 --- templates/topic.tpl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/topic.tpl b/templates/topic.tpl index 18cb539..255e322 100644 --- a/templates/topic.tpl +++ b/templates/topic.tpl @@ -13,7 +13,17 @@ <span class="topic-title" component="topic/title">{title}</span> </h1> - <div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted -->">[[topic:deleted_message]]</div> + <div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix"> + <span class="pull-left">[[topic:deleted_message]]</span> + <span class="pull-right"> + <!-- IF deleter --> + <a href="{config.relative_path}/user/{deleter.userslug}"> + <strong>{deleter.username}</strong> + </a> + <small class="timeago" title="{deleter.timestampISO}"></small> + <!-- ENDIF deleter --> + </span> + </div> <hr class="visible-xs" /> From 0432c5a5cfa14cc2fe94b807a90fd6da8765e918 Mon Sep 17 00:00:00 2001 From: psychobunny <rodrigues.andrew@gmail.com> Date: Fri, 10 Mar 2017 13:36:40 -0500 Subject: [PATCH 10/12] 4.2.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f56332..46b7bad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "4.2.4", + "version": "4.2.5", "nbbpm": { "compatibility": "^1.4.4" }, From de7b2bb8b9ad64a3e9390c3d00802a8d011fb297 Mon Sep 17 00:00:00 2001 From: psychobunny <rodrigues.andrew@gmail.com> Date: Fri, 10 Mar 2017 14:55:22 -0500 Subject: [PATCH 11/12] update persona for deleter refactor --- templates/topic.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/topic.tpl b/templates/topic.tpl index 255e322..befd46f 100644 --- a/templates/topic.tpl +++ b/templates/topic.tpl @@ -20,7 +20,7 @@ <a href="{config.relative_path}/user/{deleter.userslug}"> <strong>{deleter.username}</strong> </a> - <small class="timeago" title="{deleter.timestampISO}"></small> + <small class="timeago" title="{deletedTimestamp}"></small> <!-- ENDIF deleter --> </span> </div> From b805747752e0d4c9fe4d5ae340032a95dfc6f4ef Mon Sep 17 00:00:00 2001 From: psychobunny <rodrigues.andrew@gmail.com> Date: Fri, 10 Mar 2017 14:55:29 -0500 Subject: [PATCH 12/12] 4.2.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 46b7bad..9a1edbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "4.2.5", + "version": "4.2.6", "nbbpm": { "compatibility": "^1.4.4" },