Merge branch 'master' into zenops_46

module/task/css/recordestimate.css

@@ -1,3 +1,4 @@
+#mainContent {min-height: 500px;}
 .table-recorded thead{background: rgb(245 245 245);}
 .form-condensed .table-form {margin-bottom: 20px;}
 .hours {display: flex; float: left; transform: translate(0, 50%); margin: 0;}
@@ -7,12 +8,16 @@
 .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; }
 .table-recorded thead { background: #F5F6F8}
-.table>thead>tr>th{ border-bottom: 1px solid #EEEEEE}
+.table>thead>tr>th{border-bottom: 1px solid #EEEEEE; font-weight: 400;}
 #linearefforts .nav li.active a{color: #0c64eb !important}
 .input-group-addon {background: #fff}
 .icon-calendar {color: rgb(22, 168, 248)}
-#recordForm .table>thead>tr>th{ border: none}
+#recordForm .table > thead > tr > th {border: none; font-weight: 400;}
 .main-header {border-bottom: none !important}
 .main-header ul.hours:before{content:"（"}
 .main-header ul.hours:after{content:"）"}
 .body-modal .main-header>h2 { max-width: 70% !important; margin-right:0px;}
+.table-record .form-date {border-right: none;}
+
+.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;}

module/task/css/view.css

@@ -7,7 +7,6 @@
 
 #assignedTo a {border-color: transparent;}
 #assignedTo a:hover {border-color: rgba(0,0,0,.2);}
-#childrenTable tbody > tr:nth-child(odd) {background-color: #f5f5f5;}
 
 .c-id {width: 50px;}
 .c-pri {width: 40px;}