diff --git a/index/index.html b/index/index.html index 9e24634..7449ac8 100644 --- a/index/index.html +++ b/index/index.html @@ -11,7 +11,7 @@ - + diff --git a/resource/public/commoncss.css b/resource/public/commoncss.css index e1ebdc9..38ceb3e 100644 --- a/resource/public/commoncss.css +++ b/resource/public/commoncss.css @@ -4,9 +4,11 @@ html,body{ background-color: #f6f7fb; min-width: 1200px; + font-family:”微软雅黑”; } ul,li{ list-style: none; + padding-left: 0; } .float-left{ float: left; @@ -46,7 +48,7 @@ header{ height: 90px; line-height: 90px; border-bottom: 4px solid #fff; - margin-right: 80px; + margin-left: 80px; display: inline-block; text-align: center; } diff --git a/topages/topagesTmp.js b/topages/topagesTmp.js index 7c71057..6d302ed 100644 --- a/topages/topagesTmp.js +++ b/topages/topagesTmp.js @@ -26,7 +26,7 @@ var res = $('#main-con'); //工时查询 R.route('/workfill', function() { - $("#pageCssLink").attr("href",'../topages/workfill/workfill.css'); + $("#pageCssLink").attr("href",'../topages/workfill/workfill.css?a=1'); res.load('../topages/workfill/workfill.html'); $('.nav-bar-container li').removeClass('navbar-active'); diff --git a/topages/workfill/workfill.css b/topages/workfill/workfill.css index eb1909b..674f105 100644 --- a/topages/workfill/workfill.css +++ b/topages/workfill/workfill.css @@ -1,5 +1,6 @@ .time-opr-area{ padding-left: 80px; + margin-left: -10px; height: 66px; background: url("../../resource/img/time-opr-area.png") no-repeat 0 center; } @@ -26,4 +27,115 @@ color: rgba(0,0,0,.4); background-color: #fff; border-radius: 4px; +} + +.workfill-list-wrap li{ + width: 277px; + height: 450px; + background-color: #fff; + border-radius: 2px; + margin-bottom: 30px; + float: left; + margin-right: 30px; + padding: 22px 15px; +} +.workfill-list-wrap li:nth-of-type(4){ + margin-right: 0; +} +.workfill-list-weekday{ + font-size: 18px; + color: #363d5d; + padding-left: 20px; + position: relative; +} +.workfill-list-weekday:before{ + content: ''; + position: absolute; + left:0; + top:7px; + width: 10px; + height: 10px; + border: 2px solid rgba(0,0,0,.2); + border-radius: 100%; +} +.workfill-list-btn{ + padding: 3px 20px; + border-radius: 15px; +} +.workfill-list-wrap li:nth-of-type(1) .workfill-list-btn{ + background-color: #fedee5; + color: #f94c6e; +} +.workfill-list-wrap li:nth-of-type(2) .workfill-list-btn{ + background-color: #fef0db; + color: #fead39; +} +.workfill-list-wrap li:nth-of-type(3) .workfill-list-btn{ + background-color: #dbe7fe; + color: #4886ff; +} +.workfill-list-wrap li:nth-of-type(4) .workfill-list-btn{ + background-color: #98c74b; + color: #f1fae2; +} +.workfill-list-wrap li:nth-of-type(5) .workfill-list-btn{ + background-color: #f5f2fe; + color: #714cf9; +} +.workfill-list-wrap li:nth-of-type(6) .workfill-list-btn{ + background-color: #fbf8e0; + color: #f7e124; +} +.workfill-list-wrap li:nth-of-type(7) .workfill-list-btn{ + background-color: #bde7fe; + color: #6297fe; +} +.workfill-list-container{ + height: 280px; + border: 1px solid #f0f1f9; + overflow-y: auto; + color:rgba(0,0,0,.5); + padding: 20px 20px; +} +.workfill-list-projectnamewrap{ + border: 1px solid #f0f1f9; + height: 64px; + padding: 24px 20px 0; + margin: 20px 0 19px; + font-size: 16px; + color: #363d5d; + position: relative; +} +.workfill-list-projectnamewrap:before{ + content: ''; + position: absolute; + width: 30px; + height: 2px; + top:15px; + left: 20px; +} +.workfill-list-wrap li:nth-of-type(1) .workfill-list-projectnamewrap:before{ + background-color: #f94c6e; +} +.workfill-list-wrap li:nth-of-type(2) .workfill-list-projectnamewrap:before{ + background-color: #fead39; +} +.workfill-list-wrap li:nth-of-type(3) .workfill-list-projectnamewrap:before{ + background-color: #4886ff; +} +.workfill-list-wrap li:nth-of-type(4) .workfill-list-projectnamewrap:before{ + background-color: #98c74b; +} +.workfill-list-wrap li:nth-of-type(5) .workfill-list-projectnamewrap:before{ + background-color: #714cf9; +} +.workfill-list-wrap li:nth-of-type(6) .workfill-list-projectnamewrap:before{ + background-color: #f7e124; +} +.workfill-list-wrap li:nth-of-type(7) .workfill-list-projectnamewrap:before{ + background-color: #6297fe; +} +.workfill-list-projectname{ + + } \ No newline at end of file diff --git a/topages/workfill/workfill.html b/topages/workfill/workfill.html index c75f063..9833930 100644 --- a/topages/workfill/workfill.html +++ b/topages/workfill/workfill.html @@ -8,6 +8,134 @@
-
1
+ \ No newline at end of file