Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' into 'sprint213_zg'

Browse Source 
# Conflicts:
#   module/execution/css/cfd.css
#   module/execution/js/cfd.js
This commit is contained in:
孙广明
2022-07-06 07:02:38 +00:00
parent 4c0375925c 48aa86d1d1
commit c97ff18621
27 changed files with 326 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/cfd.css
+13 -5
View File
@@ -1,13 +1,21 @@
.main-content > h2 {font-size: 16px;}
#cfdWrapper {max-width: 1400px; margin: 0 auto; padding: 25px 0px 10px; position: relative;}
#cfdYUnit {position: absolute; color: #CBD0DB; top: 27px; left: 130px;}
#cfdXUnit {position: absolute; color: #CBD0DB; bottom: 35px; right: 60px;}
.pull-left .input-control {margin-right: 10px;}
@media screen and (max-width: 1920px)
{
#cfdWrapper {max-width: 1400px; margin: 0 auto; padding: 25px 0px 10px; position: relative}
#cfdChart {width:1400px !important; height:600px !important}
#cfdYUnit {position: absolute; color: #CBD0DB; top: 40px; left: 30px}
#cfdXUnit {position: absolute; color: #CBD0DB; bottom: 20px; right: 0px}
}
@media screen and (max-width: 1366px)
{
#cfdChart {width:1150px !important; height:400px !important};
}
#mainContent {min-width: 1400px;}
#burnStatistics {position: absolute; left: 1200px; width: 180px; height: 200px; top: 20%; margin-top: -30px; line-height: 30px; color: #838A9D; font-size: 12px; border: 1px solid #dcdcdc; background-color: #F8F8F8; padding: 15px 20px; color: #3c4353; border-radius: 8px;}
#burnStatistics .bg-primary {margin-right: 5px;}
#burnStatistics .icon-help {color: black;}
#burnStatistics h3 {margin-top: 10px; text-indent: 10px; margin-bottom: 30px;}
#burnStatistics h3 {margin-top: 10px; text-indent: 10px; margin-bottom: 30px;}