From 75459b0472a1159b51f9f76d7b56216ac7183eb0 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 29 Mar 2021 16:38:38 +0800
Subject: [PATCH 1/3]  * Finish task #37125,#37097.

---
 module/index/css/index.css | 5 +++--
 module/index/js/index.js   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/index/css/index.css b/module/index/css/index.css
index b9766ee0c6..3a4e82a8d8 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -53,8 +53,9 @@ body.menu-hide {padding-left: 0;}
 #bars {position: absolute; left: 0; top: 0; bottom: 0; padding: 0 5px;}
 #bars > li {padding: 8px 2px;}
 #bars > li > a {height: 24px; color: #000; padding: 2px 8px; line-height: 20px; border-radius: 2px;}
-#bars > li > a:hover, #bars > li > a:active, #bars > li > a:focus {background: #16a8f8;}
-#bars > li.active > a, #bars > li.active > a:active, #bars > li.active > a:focus {font-weight: 600; border-bottom: 2px solid #16a8f8;}
+#bars > li.active > a {background: #fff!important;}
+#bars > li > a:hover, #bars > li > a:active, #bars > li > a:focus {background: #16a8f8!important; color: #fff;}
+#bars > li.active > a > span, #bars > li.active > a:active > span, #bars > li.active > a:focus > span {padding-bottom: 2px; font-weight: 600; border-bottom: 2px solid #16a8f8;}
 #bars > li.active:after {content: ' '; display: block; position: absolute; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;}
 #bars > li.divider{margin-right: 5px; margin-top: 10px; height: 20px; border-right: 1px solid #d9d9d9;}
 
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 09cc085a75..e7a35349cd 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -229,7 +229,7 @@
             var $link= $('<a data-pos="bar"></a>')
                 .attr('data-app', appCode)
                 .attr('class', 'show-in-app')
-                .html(app.text);
+                .html('<span>' + app.text + '</span>');
             var barCount = $('#bars li').length;
 
             if(barCount) $bar = $('<li class="divider"></li>').appendTo($bars);

From 669b0794abae4195aea576310798216a599fede2 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 29 Mar 2021 16:41:50 +0800
Subject: [PATCH 2/3] * Fix bug#11577.

---
 module/block/view/projectdynamicblock.html.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/module/block/view/projectdynamicblock.html.php b/module/block/view/projectdynamicblock.html.php
index e89f1118ce..f60048f555 100644
--- a/module/block/view/projectdynamicblock.html.php
+++ b/module/block/view/projectdynamicblock.html.php
@@ -1,6 +1,10 @@
 <?php if(empty($actions)): ?>
 <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; }
+.panel-body {padding-top: 0;}
+</style>
 <div class='panel-body scrollbar-hover'>
   <ul class="timeline timeline-tag-left no-margin">
     <?php

From 39a4a0ce7c653550c1e493ec92cff6fc8a5d3131 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 29 Mar 2021 16:44:15 +0800
Subject: [PATCH 3/3]  * Finish task #37033.

---
 module/block/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/block/control.php b/module/block/control.php
index fab109b185..6f294f2670 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1330,7 +1330,7 @@ class block extends control
     {
         if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
         $count = isset($this->params->count) ? (int)$this->params->count : 15;
-        $type  = isset($this->params->type) ? $this->params->type : 'all';
+        $type  = isset($this->params->type) ? $this->params->type : 'wait';
 
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init(0, $count, 1);