Merge branch 'master' into zenops_46

module/task/css/common.css

@@ -7,7 +7,6 @@
 #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
 #taskTeamEditor tr {padding: 8px 7px 8px 7px;}
 #taskTeamEditor td .chosen-single .chosen-search input,
-#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
 #taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
 #taskTeamEditor tr td:first-child {width: 40px; position: relative;}
 .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}

module/task/css/create.css

@@ -29,6 +29,6 @@
 
 .keep-row-height {height: 32px;}
 #modalTeam .modal-dialog {min-height: 120px; width: 520px; color: #3c4353;}
-#taskTeamEditor .chosen-single {width: 200px;}
+#taskTeamEditor .hourBox {padding-bottom: 7px; width: 135px;}
 #taskTeamEditor .estimateBox {width: 120px;}
 #modalTeam .modal-content {padding: 0;}

module/task/css/editteam.css

@@ -0,0 +1 @@
+#mainContent {padding-left: 0;}

module/task/css/recordestimate.css

@@ -3,7 +3,6 @@
 .form-condensed .table-form {margin-bottom: 20px;}
 .hours {display: flex; float: left; transform: translate(0, 50%); margin: 0;}
 .estimateTotally, .consumedTotally {border-radius: 9px; padding: 3px 7px; margin: 0 5px 0 5px; min-width: 18px;}
-.consumedTotally {background: #EAF3FF; color: #2B80FF;}
 .estimateTotally {background: #FFEFEF; color: #FF6262;}
 .nav > li.divider {margin: 0 10px 0 5px; background-color: #000; opacity: 0.06; width: 1px ; height: 15px; padding: 0 !important;}
 .table-bordered td, .table-bordered th { border: 1px solid #EEEEEE; }
@@ -21,3 +20,6 @@
 
 .table.has-sort-head thead>tr>th>a:after, .table.has-sort-head thead>tr>th>a:before {top: -7px;}
 .table.has-sort-head thead>tr>th>a:hover, .table.has-sort-head thead>tr>th>a:hover:after, .table.has-sort-head thead>tr>th>a:hover:before {color: #000;}
+
+#toggleFoldIcon:hover {cursor: pointer;}
+#toggleFoldIcon .icon-border {width: 20px; height: 20px; border-radius: 8px;}