From ed2257efb0edb4bfe8588654780e36dc33492b30 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 28 May 2016 09:38:30 +0930 Subject: [PATCH] Remove space characters from in-between list items They were causing some weirdness with spacing between redraws. --- framework/core/js/admin/dist/app.js | 5 +---- framework/core/js/forum/dist/app.js | 5 +---- framework/core/js/lib/helpers/listItems.js | 6 +----- framework/core/less/forum/Post.less | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/framework/core/js/admin/dist/app.js b/framework/core/js/admin/dist/app.js index 3eff28f7d..146989a74 100644 --- a/framework/core/js/admin/dist/app.js +++ b/framework/core/js/admin/dist/app.js @@ -20965,15 +20965,12 @@ System.register('flarum/helpers/listItems', ['flarum/components/Separator', 'fla item.attrs.key = item.attrs.key || item.itemName; } - var space = new String(' '); - space.attrs = { key: '_space_' + item.itemName }; - return [isListItem ? item : m( 'li', { className: classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : '']), key: item.itemName }, item - ), space]; + )]; }); } diff --git a/framework/core/js/forum/dist/app.js b/framework/core/js/forum/dist/app.js index a34e60f7d..9b3caf819 100644 --- a/framework/core/js/forum/dist/app.js +++ b/framework/core/js/forum/dist/app.js @@ -28327,15 +28327,12 @@ System.register('flarum/helpers/listItems', ['flarum/components/Separator', 'fla item.attrs.key = item.attrs.key || item.itemName; } - var space = new String(' '); - space.attrs = { key: '_space_' + item.itemName }; - return [isListItem ? item : m( 'li', { className: classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : '']), key: item.itemName }, item - ), space]; + )]; }); } diff --git a/framework/core/js/lib/helpers/listItems.js b/framework/core/js/lib/helpers/listItems.js index 1b94e151c..d7ebe0544 100644 --- a/framework/core/js/lib/helpers/listItems.js +++ b/framework/core/js/lib/helpers/listItems.js @@ -39,9 +39,6 @@ export default function listItems(items) { item.attrs.key = item.attrs.key || item.itemName; } - const space = new String(' '); - space.attrs = {key: '_space_'+item.itemName}; - return [ isListItem ? item @@ -52,8 +49,7 @@ export default function listItems(items) { ])} key={item.itemName}> {item} - , - space + ]; }); } diff --git a/framework/core/less/forum/Post.less b/framework/core/less/forum/Post.less index 93f752f92..263f1e44a 100644 --- a/framework/core/less/forum/Post.less +++ b/framework/core/less/forum/Post.less @@ -30,7 +30,7 @@ > li { display: inline; - margin-right: 7px; + margin-right: 10px; } } }