Merge branch 'sprint/master_zhouxudong_61110' into 'master'

Sprint/master zhouxudong 61110 See merge request easycorp/zentaopms!4598
2022-07-20 00:29:16 +00:00
parent 3120ef2aa2 da232983e5
commit 9abacbd0c9
2 changed files with 3 additions and 0 deletions
@@ -1,3 +1,5 @@
 .tree .active{font-weight: bold;}
 .with-side .side {position: absolute; width: 130px;}
 .with-side .main {padding-left: 145px; float: left;}
+.side-col {width: 140px;}
+.panel-sm .panel-body {padding: 10px;}
@@ -17,6 +17,7 @@ include '../../common/view/chosen.html.php';
 $formId = 'searchForm-' . uniqid('');
 ?>
 <style>
+.btn-active-text .text {font-weight: 400; font-size: 14px;}
 #selectPeriod {padding: 4px 0; height: 197px; min-width: 120px}
 #selectPeriod > .dropdown-header {background: #f1f1f1; display: block; text-align: center; padding: 4px 0; line-height: 20px; margin: 5px 10px; font-size: 14px; border-radius: 2px; color: #333; font-size: 12px}
 #groupAndOr {display: inline-block;}