From eebcfaad58da3d8fcba729d3565b7aba9672625f Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 24 Jun 2022 13:33:11 +0800
Subject: [PATCH] * Adjust the spacing of dynamic block and dynamic page.

---
 module/block/lang/de.php                       |  4 ++--
 module/block/lang/en.php                       |  4 ++--
 module/block/lang/fr.php                       |  4 ++--
 module/block/lang/zh-cn.php                    |  4 ++--
 module/block/view/dynamic.html.php             | 10 +++++++---
 module/block/view/projectdynamicblock.html.php | 13 ++++++++++---
 module/company/css/dynamic.css                 | 11 ++++++++---
 module/company/view/dynamic.html.php           |  2 +-
 module/execution/css/dynamic.css               | 10 ++++++++--
 module/execution/css/view.css                  | 10 ++++++++--
 module/execution/view/dynamic.html.php         |  2 +-
 module/execution/view/importtask.html.php      |  2 +-
 module/execution/view/view.html.php            |  2 +-
 module/my/css/dynamic.css                      | 11 ++++++++---
 module/my/view/dynamic.html.php                |  4 ++--
 module/product/css/dashboard.css               | 10 ++++++++--
 module/product/css/dynamic.css                 | 10 ++++++++--
 module/product/view/dashboard.html.php         |  2 +-
 module/product/view/dynamic.html.php           |  2 +-
 module/project/css/dynamic.css                 | 10 ++++++++--
 module/project/css/view.css                    | 10 ++++++++--
 module/project/view/view.html.php              |  2 +-
 module/user/css/dynamic.css                    | 10 ++++++++--
 module/user/view/dynamic.html.php              |  2 +-
 24 files changed, 107 insertions(+), 44 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index b2806436ea..bd28ed720d 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -90,8 +90,8 @@ $lang->block->remove             = 'Entfernen';
 $lang->block->refresh            = 'Aktualisieren';
 $lang->block->nbsp               = '';
 $lang->block->hidden             = 'Verstecken';
-$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
-$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <em>%s</em> %s %s</span>";
+$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s<em class='label-action'>%s</em>%s<a href='%s' title='%s'>%s</a></span>";
+$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s<em class='label-action'>%s</em>%s<span class='label-name'>%s</span></span>";
 $lang->block->cannotPlaceInLeft  = 'Kann den Block nicht auf der linken Seite platzieren.';
 $lang->block->cannotPlaceInRight = 'Kann den Block nicht auf der rechten Seite platzieren.';
 
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 737031e7b6..4468cf9cc6 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -90,8 +90,8 @@ $lang->block->remove             = 'Remove';
 $lang->block->refresh            = 'Refresh';
 $lang->block->nbsp               = ' ';
 $lang->block->hidden             = 'Hide';
-$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <span class='label-action'>%s</span> %s <a href='%s' title='%s'>%s</a></span>";
-$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <span class='label-action'>%s</span> %s <span class='label-name'>%s</span></span>";
+$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s<em class='label-action'>%s</em>%s<a href='%s' title='%s'>%s</a></span>";
+$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s<em class='label-action'>%s</em>%s<span class='label-name'>%s</span></span>";
 $lang->block->cannotPlaceInLeft  = 'Cannot place the block at left side.';
 $lang->block->cannotPlaceInRight = 'Cannot place the block at right side.';
 
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index d9309801ab..251cf50757 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -90,8 +90,8 @@ $lang->block->remove             = 'Supprimer';
 $lang->block->refresh            = 'Rafraichir';
 $lang->block->nbsp               = ' ';
 $lang->block->hidden             = 'Masquer';
-$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s' title='%s'>%s</a></span>";
-$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <em>%s</em> %s %s</span>";
+$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s<em class='label-action'>%s</em>%s<a href='%s' title='%s'>%s</a></span>";
+$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s<em class='label-action'>%s</em>%s<span class='label-name'>%s</span></span>";
 $lang->block->cannotPlaceInLeft  = 'Impossible de placer le bloc à gauche.';
 $lang->block->cannotPlaceInRight = 'Impossible de placer le bloc à droite.';
 
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 48c3a2019d..8aa16f8abb 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -90,8 +90,8 @@ $lang->block->remove             = '移除';
 $lang->block->refresh            = '刷新';
 $lang->block->nbsp               = '';
 $lang->block->hidden             = '隐藏';
-$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <span class='label-action'>%s</span> %s <a href='%s' title='%s'>%s</a></span>";
-$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <span class='label-action'>%s</span> %s <span class='label-name'>%s</span></span>";
+$lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s<em class='label-action'>%s</em>%s<a href='%s' title='%s'>%s</a></span>";
+$lang->block->noLinkDynamic      = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s<em class='label-action'>%s</em>%s<span class='label-name'>%s</span></span>";
 $lang->block->cannotPlaceInLeft  = '此区块无法放置在左侧。';
 $lang->block->cannotPlaceInRight = '此区块无法放置在右侧。';
 
diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index f9f3b99159..2aa17ecc16 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -4,9 +4,13 @@
 <style>
 .block-dynamic .timeline > li .timeline-text {max-width: 600px; display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-height: 20px;}
 .block-dynamic .panel-body {padding-top: 0;}
-.block-dynamic .label-action {margin-left: 12px;}
-.block-dynamic .label-action + a,
-.block-dynamic .label-name {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.block-dynamic .label-action {padding: 0 6px;}
+.block-dynamic .label-action + a {padding-left: 6px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
 </style>
 <div class='panel-body scrollbar-hover'>
   <ul class="timeline timeline-tag-left no-margin">
diff --git a/module/block/view/projectdynamicblock.html.php b/module/block/view/projectdynamicblock.html.php
index eace41cf29..b38d31c1d6 100644
--- a/module/block/view/projectdynamicblock.html.php
+++ b/module/block/view/projectdynamicblock.html.php
@@ -2,10 +2,17 @@
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <style>
-.timeline > li .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; max-height: 20px; display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; }
+.timeline > li .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; max-height: 20px; -webkit-line-clamp: 1; -webkit-box-orient: vertical; }
 .panel-body {padding-top: 0;}
-.block-projectdynamic .label-action {margin-left: 12px;}
-.block-projectdynamic .label-action + a {color: #838A9D;}
+
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.block-projectdynamic .label-action {padding: 0 6px;}
+.block-projectdynamic .label-action + a {padding-left: 6px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 </style>
 <div class='panel-body scrollbar-hover'>
   <ul class="timeline timeline-tag-left no-margin">
diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css
index 3d3a827277..bde70fd5a0 100644
--- a/module/company/css/dynamic.css
+++ b/module/company/css/dynamic.css
@@ -22,6 +22,11 @@
 .c-user, .c-order {width: 96px !important; overflow: unset;}
 .c-date {width: 200px;}
 
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-name,
-.dynamic .label-name a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index a9a4c4f724..dddc0dd327 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -70,7 +70,7 @@
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
               <?php echo zget($accountPairs, $action->actor);?>
-              <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
+              <span class='label-action'><?php echo $action->actionLabel;?></span>
               <?php if($action->action != 'login' and $action->action != 'logout'):?>
               <span class="text"><?php echo $action->objectLabel;?></span>
               <?php if($action->objectID):?>
diff --git a/module/execution/css/dynamic.css b/module/execution/css/dynamic.css
index 6efa8fdb96..0858328480 100644
--- a/module/execution/css/dynamic.css
+++ b/module/execution/css/dynamic.css
@@ -20,5 +20,11 @@
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
 
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-id + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/execution/css/view.css b/module/execution/css/view.css
index e8b4ed2ea1..f3bfe055e9 100644
--- a/module/execution/css/view.css
+++ b/module/execution/css/view.css
@@ -11,5 +11,11 @@
 .block-dynamic .panel-body {height: 230px; overflow: auto; position: relative;}
 .block-team div.col-xs-6 {white-space: nowrap; overflow: hidden;}
 
-.block-dynamic .label-action {margin-left: 12px;}
-.block-dynamic .label-action + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.block-dynamic .label-action {padding: 0 6px;}
+.block-dynamic .label-action + a {padding-left: 6px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/execution/view/dynamic.html.php b/module/execution/view/dynamic.html.php
index 2ec2c6d673..545b6805bb 100755
--- a/module/execution/view/dynamic.html.php
+++ b/module/execution/view/dynamic.html.php
@@ -84,7 +84,7 @@
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
               <?php echo zget($accountPairs, $action->actor);?>
-              <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
+              <span class='label-action'><?php echo $action->actionLabel;?></span>
               <span class="text"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php if($action->objectName) echo html::a($action->objectLink, $action->objectName);?>
diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php
index 95404c7cbc..b47802bb63 100644
--- a/module/execution/view/importtask.html.php
+++ b/module/execution/view/importtask.html.php
@@ -65,7 +65,7 @@
           <td title="<?php echo $task->left . ' ' . $lang->execution->workHour;?>"><?php echo $task->left . ' ' . $lang->execution->workHourUnit;?></td>
           <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
           <td><span class='status-task status-<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></span></td>
-	  <td class='text-left text-ellipsis' title="<?php echo $task->storyTitle;?>">
+          <td class='text-left text-ellipsis' title="<?php echo $task->storyTitle;?>">
             <?php
             if($task->storyID)
             {
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 1263534bf9..108e4a756b 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -53,7 +53,7 @@
               <ul class="timeline timeline-tag-left no-margin">
                 <?php foreach($dynamics as $action):?>
                 <li <?php if($action->major) echo "class='active'";?>>
-                  <div class='text-ellipsis'>
+                  <div>
                     <span class="timeline-tag"><?php echo $action->date;?></span>
                     <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . "<span class='label-action'>{$action->actionLabel}</span>" . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName, '', "title='$action->objectName'");?></span>
                   </div>
diff --git a/module/my/css/dynamic.css b/module/my/css/dynamic.css
index 63dd739080..071ed48304 100644
--- a/module/my/css/dynamic.css
+++ b/module/my/css/dynamic.css
@@ -19,6 +19,11 @@
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
 
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-name,
-.dynamic .label-name a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index f8dd4a9007..885973e447 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -54,9 +54,9 @@
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
               <?php echo $app->user->realname;?>
-              <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
+              <span class='label-action'><?php echo $action->actionLabel;?></span>
               <?php if($action->action != 'login' and $action->action != 'logout'):?>
-              <span><?php echo $action->objectLabel;?></span>
+              <?php echo $action->objectLabel;?>
               <?php if($action->objectID):?>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php endif;?>
diff --git a/module/product/css/dashboard.css b/module/product/css/dashboard.css
index 9d4efaf435..3ba63973c7 100644
--- a/module/product/css/dashboard.css
+++ b/module/product/css/dashboard.css
@@ -3,5 +3,11 @@
 .block-release .panel-body > .btn.pull-right {position: absolute; right: 20px; bottom: 20px;}
 .release-line li .title {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 
-.block-dynamic .label-action {margin-left: 12px;}
-.block-dynamic .label-action + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.block-dynamic .label-action {padding: 0 6px;}
+.block-dynamic .label-action + a {padding-left: 6px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/product/css/dynamic.css b/module/product/css/dynamic.css
index 6efa8fdb96..0858328480 100644
--- a/module/product/css/dynamic.css
+++ b/module/product/css/dynamic.css
@@ -20,5 +20,11 @@
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
 
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-id + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/product/view/dashboard.html.php b/module/product/view/dashboard.html.php
index 6073d92667..7223110f13 100644
--- a/module/product/view/dashboard.html.php
+++ b/module/product/view/dashboard.html.php
@@ -61,7 +61,7 @@
             <ul class="timeline timeline-tag-left no-margin">
               <?php foreach($dynamics as $action):?>
               <li <?php if($action->major) echo "class='active'";?>>
-                <div class='text-ellipsis'>
+                <div>
                   <span class="timeline-tag"><?php echo $action->date;?></span>
                   <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . "<span class='label-action'>{$action->actionLabel}</span>" . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
                 </div>
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 2ebd40cf3b..fb983ee881 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -83,7 +83,7 @@
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
               <?php echo zget($accountPairs, $action->actor);?>
-              <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
+              <span class='label-action'><?php echo $action->actionLabel;?></span>
               <span class="text"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php if($action->objectName) echo html::a($action->objectLink, $action->objectName);?>
diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css
index 6efa8fdb96..0858328480 100644
--- a/module/project/css/dynamic.css
+++ b/module/project/css/dynamic.css
@@ -20,5 +20,11 @@
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
 
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-id + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/project/css/view.css b/module/project/css/view.css
index 196e87c506..f8bcc66346 100644
--- a/module/project/css/view.css
+++ b/module/project/css/view.css
@@ -2,5 +2,11 @@
 .block-team div.col-xs-6 {white-space: nowrap; overflow: hidden;}
 .cell .detail .row-grid {display: block;}
 
-.block-dynamic .label-action {margin-left: 12px;}
-.block-dynamic .label-action + a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.block-dynamic .label-action {padding: 0 6px;}
+.block-dynamic .label-action + a {padding-left: 6px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 0d324492d6..48457ad88d 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -27,7 +27,7 @@
             <ul class="timeline timeline-tag-left no-margin">
               <?php foreach($dynamics as $action):?>
               <li <?php if($action->major) echo "class='active'";?>>
-                <div class='text-ellipsis'>
+                <div>
                   <span class="timeline-tag"><?php echo $action->date;?></span>
                   <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . "<span class='label-action'>{$action->actionLabel}</span>" . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName, '', "title='$action->objectName'");?></span>
                 </div>
diff --git a/module/user/css/dynamic.css b/module/user/css/dynamic.css
index 9d3825b4c8..2151548788 100644
--- a/module/user/css/dynamic.css
+++ b/module/user/css/dynamic.css
@@ -19,5 +19,11 @@
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
 
-.dynamic .label-action {margin-left: 12px;}
-.dynamic .label-name a {color: #838A9D;}
+.timeline>li:before {left: -26px;}
+.timeline>li+li:after {left: -23px;}
+.timeline-text {margin-left: -18px;}
+.label-action {padding: 0 4px;}
+.label-id {margin-left: 4px;}
+.timeline>li.active:before {left: -30px;}
+.timeline>li>div:after {left: -27px;}
+.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 6a33e0a05f..e01b4e7e55 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -52,7 +52,7 @@
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
               <?php echo zget($users, $action->actor);?>
-              <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
+              <span class='label-action'><?php echo $action->actionLabel;?></span>
               <span><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php if($action->objectName) echo "<sapn class='label-name'>" . html::a($action->objectLink, $action->objectName) . '</span>';?>