diff --git a/public/css/gitlink.min.css b/public/css/gitlink.min.css index c41939af0..bd6068721 100644 --- a/public/css/gitlink.min.css +++ b/public/css/gitlink.min.css @@ -1,6 +1,7 @@ @charset "utf-8"; @font-face { +<<<<<<< HEAD font-family: YouSheBiaoTiHei; src: url('../fonts/YouSheBiaoTiHei-2.ttf') format('truetype'); } @@ -46,10 +47,58 @@ .panel-inner-fourm:hover { background: #eff9fd +======= + font-family: "YouSheBiaoTiHei"; + src: url("../fonts/YouSheBiaoTiHei-2.ttf"); +} +.header { + width: 100%; + height: 51px; + min-width: 1200px; + background: #171616 +} + +.animate { + -webkit-transition: all .3s; + -moz-transition: all .3s; + -ms-transition: all .3s; + -ms-transition: all .3s; + transition: all .3s; + backface-visibility: hidden; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; + -ms-backface-visibility: hidden +} + +.footer { + width: 100%; + height: 100px; + background-color: #fff +} + +.footer_con-p { + color: #888; + margin-top: 10px +} + +.inner-footer_con { + width: 1200px; + margin: 0 auto +} + +.panel-inner-fourm { + padding: 20px; + border-bottom: 1px solid #eee +} + +.panel-inner-fourm:hover { + background: #eff9fd +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a.panel-list-title, .panel-list-title { +<<<<<<< HEAD display: inline-block; font-size: 16px; color: #333; @@ -72,10 +121,35 @@ a.panel-name-small { max-width: 100px; color: #29bd8b; font-size: 12px +======= + display: inline-block; + font-size: 16px; + color: #333; + font-weight: 400; + max-width: 82% +} + +a:hover.panel-list-title { + color: #ff7500 +} + +.panel-list-img { + width: 60px; + height: 60px; + border-radius: 100px +} + +a.panel-name-small { + display: inline-block; + max-width: 100px; + color: #29bd8b; + font-size: 12px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .panel-lightgrey, .panel-lightgrey span { +<<<<<<< HEAD font-size: 12px; color: #888 } @@ -145,10 +219,82 @@ a.panel-name-small { .homepagePostReplyPortrait a img { border-radius: 100px +======= + font-size: 12px; + color: #888 +} + +.panel-comment_item { + width: 100% +} + +.panel-comment_item .t_area { + color: #888 +} + +.comment_item_cont { + padding: 15px; + border-bottom: 1px solid #e3e3e3 +} + +.comment_item_cont .J_Comment_Face { + height: 50px +} + +.comment_item_cont .J_Comment_Face img { + width: 50px; + height: 50px; + border-radius: 100px +} + +.panel-comment_item .t_content { + width: 93%; + margin-left: 15px +} + +.panel-comment_item a.content-username { + font-size: 14px; + margin-right: 15px; + display: inline-block; + max-width: 100px; + color: #888 +} + +.J_Comment_Info { + height: 20px; + line-height: 22px +} + +.panel-comment_item .comment_orig_content { + margin: 10px 0; + color: #999 +} + +.panel-comment_item .comment_orig_content .comment_orig_content { + margin-top: 0; + color: #666 +} + +.panel-comment_item .comment_content { + color: #666 +} + +.comment_content img { + max-width: 100% +} + +.orig_reply { + font-size: 12px +} + +.homepagePostReplyPortrait a img { + border-radius: 100px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .pages_user_show a:hover, .pages_user_show a.active { +<<<<<<< HEAD background-color: #fc7033; color: #fff; border: 1px solid #fc7033 @@ -194,35 +340,98 @@ a.panel-name-small { -ms-box-sizing: border-box; box-sizing: border-box; border-radius: 3px +======= + background-color: #fc7033; + color: #fff; + border: 1px solid #fc7033 +} + +.pages_user_show a { + display: inline-block; + border: 1px solid #d1d1d1; + color: #888; + float: left; + text-align: center; + padding: 3px 10px; + line-height: 1.9; + margin: 0 5px +} + +.pages_user_show li { + float: left; + list-style-type: none +} + +.pages_user_show ul li { + list-style-type: none !important +} + +.pages_user_show ul li a { + color: #888 +} + +.panel-form-label { + display: inline-block; + width: 10%; + min-width: 90px; + text-align: right; + line-height: 40px; + font-weight: 400 +} + +.panel-box-sizing { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -o-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + border-radius: 3px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input.task-form-80, textarea.task-form-80, select.task-form-80, .task-form-80 { +<<<<<<< HEAD padding: 5px; width: 80%; box-sizing: border-box +======= + padding: 5px; + width: 80%; + box-sizing: border-box +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input.task-form-100, textarea.task-form-100, select.task-form-100, .task-form-100 { +<<<<<<< HEAD padding: 5px; width: 100% +======= + padding: 5px; + width: 100% +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input.task-height-40, textarea.task-height-40, .task-height-40, select.task-height-40 { +<<<<<<< HEAD height: 40px +======= + height: 40px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input.task-height-150, textarea.task-height-150, .task-height-150 { +<<<<<<< HEAD height: 150px } @@ -251,25 +460,68 @@ img.edu-nodata-img { -webkit-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1); -moz-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1); box-shadow: 0 0 8px rgba(142, 142, 142, .1) +======= + height: 150px +} + +.handler_bg { + background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==)no-repeat 50% +} + +.handler_ok_bg { + background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==)no-repeat 50% +} + +img.edu-nodata-img { + width: 200px; + margin: 50px auto 20px; + display: block +} + +.edu-nodata-p { + font-size: 16px; + text-align: center; + color: #888; + border-bottom: none !important +} + +.user_bg_shadow { + -webkit-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1); + -moz-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1); + box-shadow: 0 0 8px rgba(142, 142, 142, .1) +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { +<<<<<<< HEAD color: #ccc +======= + color: #ccc +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-moz-placeholder, textarea::-moz-placeholder { +<<<<<<< HEAD color: #ccc +======= + color: #ccc +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-moz-placeholder, textarea::-moz-placeholder { +<<<<<<< HEAD color: #ccc +======= + color: #ccc +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-ms-input-placeholder, textarea::-ms-input-placeholder { +<<<<<<< HEAD color: #ccc } @@ -422,10 +674,165 @@ a.leftnav-box-inner { text-align: center; padding: 10px 0; color: #575f6c +======= + color: #ccc +} + +.btn-cir { + display: inline-block; + padding: 0 5px; + border-radius: 25px; + line-height: 20px; + font-size: 12px +} + +.btn-cir:hover { + background: #fff; + color: #333 +} + +.all_work_border { + border: 1px solid #4c515d +} + +.btn-cir-red { + background: red; + color: #fff; + font-weight: 400 +} + +.btn-cir-red:hover { + background: red +} + +.btn-cir-orange { + background: #ff7500; + color: #fff; + font-weight: 400; + border: 1px solid #ff7500 +} + +.btn-top { + display: inline-block; + padding: 0 5px; + line-height: 20px; + font-size: 12px; + border-radius: 3px +} + +.btn-cir-big { + background: #999; + color: #fff; + display: inline-block; + padding: 0 10px; + border-radius: 25px; + line-height: 25px; + height: 25px; + font-size: 12px +} + +.panel-inner-icon { + width: 22px; + height: 22px; + line-height: 22px; + border-radius: 50%; + background: #29bd8b; + display: block; + text-align: center +} + +.panel-inner-icon { + width: 22px; + height: 22px; + line-height: 22px; + border-radius: 50%; + background: #29bd8b; + display: block; + text-align: center +} + +@keyframes ball-scale { + 0% { + width: 0; + height: 0 + } + + 100% { + width: 80px; + height: 80px + } +} + +.shixun_work_div { + overflow-y: auto; + max-height: 90px +} + +html { + height: 100% +} + +.w20_center { + width: 20px; + text-align: center +} + +.user-info { + width: 80px; + height: 100px; + padding-top: 15px +} + +a.user-info-img { + display: block; + width: 50px; + height: 50px; + margin: 0 auto +} + +a.user-info-img img { + border-radius: 100px; + border: 2px solid #666 +} + +a.user-info-img img:hover { + border: 2px solid #888 +} + +a.user-info-name { + display: block; + font-size: 16px; + color: #fff; + max-width: 100px; + margin: 10px auto; + text-align: center; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis +} + +.leftnav-box { + width: 80px; + height: 60px; + background: #292b3a; + padding: 10px 0; + margin-bottom: 2px +} + +a.leftnav-box-inner { + display: block; + width: 77px; + border-left: 3px solid #292b3a; + background: #292b3a; + text-align: center; + padding: 10px 0; + color: #575f6c +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a:hover.leftnav-box-inner, a.leftnav-active { +<<<<<<< HEAD border-left: 3px solid #3498db; color: #fff !important } @@ -469,11 +876,57 @@ a:hover.leftnav-box-inner .btn-cir { .dis { display: block +======= + border-left: 3px solid #3498db; + color: #fff !important +} + +a:hover.leftnav-box-inner .btn-cir { + background: #fff; + color: #333 +} + +#tab_nav { + height: 42px; + background: #fff; + border-bottom: 1px solid #eee +} + +#tab_nav li { + float: left; + padding: 0 30px; + text-align: center; + height: 40px; + line-height: 40px +} + +#tab_nav li a { + font-size: 14px +} + +.tab_hover { + border-bottom: 2px solid #3498db; + background: #fff; + color: #3498db +} + +.tab_hover a { + color: #3498db !important +} + +.undis { + display: none +} + +.dis { + display: block +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .tab-info {} .info-partly { +<<<<<<< HEAD display: block; box-flex: 1; flex: 1; @@ -1015,23 +1468,578 @@ a.shixun-task-btn { right: 0; bottom: 0; text-align: center +======= + display: block; + box-flex: 1; + flex: 1; + -webkit-flex: 1; + position: relative +} + +.task-popup-text-center { + text-align: center; + color: #333 +} + +.task-popup-title { + border-bottom: 1px solid #eee; + padding: 10px 15px +} + +.task-popup-submit { + margin: 0 auto 15px; + width: 120px +} + +.panel-form-label { + display: inline-block; + width: 10%; + min-width: 90px; + text-align: right; + line-height: 40px; + color: #666 +} + +.panel-box-sizing { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -o-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box +} + +.mb20 { + margin-bottom: 20px +} + +#game_task_pass img { + cursor: pointer +} + +.-fit { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0 +} + +.-layout-v { + display: flex; + flex-direction: column; + -webkit-flex-direction: column +} + +.page--leftnav { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 9001; + width: 80px; + height: 100%; + background: #282c37 +} + +.page--body { + position: relative; + margin-top: 54px +} + +.-flex { + box-flex: 1; + flex: 1; + -webkit-flex: 1 +} + +.split-panel.-fit { + position: absolute +} + +.split-panel { + position: relative; + overflow: hidden; + min-height: 200px; + height: 100% +} + +.-stretch { + align-items: stretch +} + +.-layout { + display: flex +} + +.split-panel--first { + overflow: hidden +} + +.-relative { + position: relative +} + +.-bg-white { + background-color: #eee +} + +.-vertical { + flex-direction: column; + box-flex-direction: column; + -webkit-flex-direction: column +} + +.-layout-h { + display: flex; + flex-direction: row; + box-flex-direction: row; + -webkit-flex-direction: row +} + +.-horizontal { + flex-direction: row-reverse; + box-flex-direction: row-reverse; + -webkit-flex-direction: row-reverse +} + +.-scroll { + overflow: auto +} + +.-flex-basic40 { + width: 40%; + box-flex: auto; + flex: auto; + -webkit-flex: auto +} + +.-flex-basic50 { + width: 60%; + box-flex: auto; + flex: auto; + -webkit-flex: auto +} + +.b-label { + width: 4px; + cursor: ew-resize; + background: #2b2b2b +} + +.h-center { + height: 4px; + cursor: ns-resize; + background: #333 +} + +.-changebg { + height: 3px +} + +.-bg-weightblack { + background: #000 +} + +.-flex-basic70 { + box-flex: 4 9 auto; + flex: 4 9 auto; + -webkit-flex: 4 9 auto; + height: 70% +} + +.-flex-basic60 { + box-flex: 2 1 auto; + flex: 2 1 auto; + -webkit-flex: 2 1 auto; + height: 30% +} + +.-header-title { + max-width: 500px; + font-weight: 400 +} + +.-header-right { + background: #333; + border-radius: 25px; + padding: 5px 15px; + height: 30px; + position: absolute; + right: 10px; + line-height: 30px +} + +.-bg-black { + background: #2b2b2b; + color: #f4f1ed +} + +.-bg-darkblack { + background: #1d1d1d; + color: #fff +} + +#blacktab_nav { + height: 40px; + background: #292929 +} + +#blacktab_nav li { + float: left; + padding: 0 50px; + text-align: center; + height: 40px; + line-height: 40px +} + +#blacktab_nav .add-webssh { + position: relative +} + +#blacktab_nav .add-webssh span { + position: absolute; + top: 0; + right: 5px; + color: #fff; + cursor: pointer +} + +#blacktab_nav li a { + font-size: 14px +} + +#blacktab_nav li.code-file-tab { + padding: 0; + width: 120px; + box-sizing: border-box; + padding: 0 15px +} + +.code-flie-list { + display: none; + position: absolute; + z-index: 5; + top: 40px; + background: #515151; + width: 300px; + left: 0; + color: #fff +} + +.blue-line { + border-left: 3px solid #199ed8 !important; + padding-left: 5px +} + +.codefile-all { + max-height: 122px; + overflow-y: auto; + overflow-x: hidden +} + +.codefile-all p { + text-align: left; + cursor: pointer; + height: 22px; + line-height: 22px; + margin-bottom: 3px; + padding-left: 5px; + border-left: 3px solid #515151; + width: 273px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis +} + +.codefile-all p:hover { + background: #ccc; + color: #333 +} + +.blacktab_hover a { + color: #fff +} + +.-task-ces-top { + padding: 5px 15px; + background: #515151; + color: #bfbfbf +} + +.-task-ces-info-left { + display: inline-block; + width: 100px; + text-align: right +} + +.page--over { + position: fixed; + top: 0; + left: 80px; + right: 0; + z-index: 8000; + height: 100%; + color: #fff +} + +.-task-list-inner { + background: #eff2f7; + margin: 10px; + padding: 5px +} + +.-task-list-title { + font-size: 14px; + color: #666; + word-wrap: break-word; + font-weight: 400; + max-width: 80% +} + +.greytab-inner { + background: #fff +} + +.blacktab-inner { + background: #333 +} + +.task-padding16 { + padding: 16px +} + +@keyframes bounce-down { + 25% { + transform: translateY(-10px) + } + + 50%, + 100% { + transform: translateY(0) + } +} + +a.shixun-task-btn { + display: inline-block; + font-weight: 700; + border: none; + padding: 0 12px; + color: #666; + letter-spacing: 1px; + text-align: center; + font-size: 14px; + height: 30px; + line-height: 30px; + border-radius: 3px +} + +.loading-center { + text-align: center; + align-items: center; + justify-content: center +} + +.center { + vertical-align: middle; + text-align: center +} + +.searchFor { + width: auto +} + +.searchFor .searchCon { + width: 250px; + border-bottom: 1px solid #ccc; + float: left; + height: 30px +} + +.searchFor .searchCon input { + border: none; + outline: none; + height: 29px; + width: 91% +} + +.searchFor .search_close { + font-size: 18px; + float: right; + color: #666; + height: 29px; + line-height: 29px; + cursor: pointer +} + +.tab_color { + color: #bfbfbf !important +} + +.comment-input { + width: 100%; + margin: 10px; + margin-right: 17px +} + +.comment-input textarea { + border: none !important; + width: 100%; + outline: none; + height: 30px; + border-radius: 4px; + padding-left: 5px; + float: left +} + +.option-item { + border: 1px solid #e2e2e2 +} + +.option-item { + display: block; + width: 38px; + height: 38px; + text-align: center; + line-height: 38px; + border-radius: 4px +} + +.check-option-bg { + background: #ff7500; + color: #fff !important; + border: 1px solid #ff7500 +} + +.position-delete { + position: absolute; + right: -22px; + top: 12px; + cursor: pointer +} + +.-center { + align-items: center; + min-height: 66px +} + +.markdown { + letter-spacing: 0; + line-height: 1.6; + word-wrap: break-word; + word-break: break-word +} + +.markdown_anchors { + position: relative +} + +.markdown_anchors:hover .anchors { + display: inline-block +} + +.markdown_anchors .anchors:hover { + text-decoration: none +} + +.markdown_anchors .anchors { + color: inherit; + margin-left: -14px; + display: none +} + +.markdown code { + padding: 0; + line-height: 23px; + margin: 0; + font-family: 微软雅黑, 宋体 +} + +.load { + width: auto; + top: 50%; + margin-top: -100px; + position: relative +} + +.empty { + background: #494a4c; + display: inline; + margin: 0 2px; + padding: 0 3px +} + +.update_back_main { + display: none; + position: fixed; + left: 0; + top: 0; + background: rgba(0, 0, 0, .3); + width: 100%; + z-index: 7001; + height: 100% +} + +.tip-panel-animate-left { + position: absolute; + z-index: 9000; + left: 80px; + top: 290px; + background: #fff; + width: 430px; + height: 140px; + border-radius: 3px +} + +.tip-panel-animate { + position: absolute; + z-index: 10001; + right: 4px; + top: 40px; + background: #fff; + width: 430px; + height: 140px; + border-radius: 3px; + display: none +} + +.tip-operator-btn { + width: 100%; + border-top: 1px solid #eee; + height: 40px; + position: absolute; + right: 0; + bottom: 0; + text-align: center +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .tip-operator-btn a, .tip-operator-btn span { +<<<<<<< HEAD height: 100%; text-align: center; line-height: 40px; width: 50% +======= + height: 100%; + text-align: center; + line-height: 40px; + width: 50% +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .tip-operator-btn a:hover, .tip-operator-btn span:hover { +<<<<<<< HEAD background-color: #f9f9f9 +======= + background-color: #f9f9f9 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .tip-operator-btn a:first-child, .tip-operator-btn span:first-child { +<<<<<<< HEAD border-right: 1px solid #eee; width: 49.5% } @@ -1124,11 +2132,109 @@ html body { height: 100%; position: relative; padding-right: 0 !important +======= + border-right: 1px solid #eee; + width: 49.5% +} + +.animate-tip { + animation: rightToleft 1s +} + +.animate-tip-hide { + animation: leftToright 1s +} + +@keyframes rightToleft { + from { + right: -400px + } + + to { + right: 4px + } +} + +@keyframes leftToright { + from { + right: 4px + } + + to { + right: -420px + } +} + +@keyframes rightToleft-l { + from { + left: -400px + } + + to { + left: 80px + } +} + +@keyframes leftToright-l { + from { + left: 80px + } + + to { + left: -420px + } +} + +.photo_display { + box-sizing: border-box; + width: 100%; + position: fixed; + top: 0; + left: 0; + padding-top: 64px; + padding-left: 80px; + background: 0 0; + height: 100%; + z-index: 100 +} + +.photo_display .task-popup { + width: 100% !important; + height: 100% !important +} + +#picture-content img { + max-width: 100%; + height: 400px; + display: block; + margin: 0 auto; + margin-bottom: 20px +} + +@font-face { + font-family: iconfont; + src: url(iconfont.woff2?t=1631773579834)format('woff2'), url(iconfont.woff?t=1631773579834)format('woff'), url(iconfont.ttf?t=1631773579834)format('truetype') +} + +html body { + font-size: 14px; + line-height: 2; + background: #fafafa; + font-family: iconfont; + color: #05101a; + height: 100%; + position: relative; + padding-right: 0 !important +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } html, body { +<<<<<<< HEAD height: 100% +======= + height: 100% +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } body, @@ -1153,9 +2259,15 @@ textarea, th, td, span { +<<<<<<< HEAD margin: 0; padding: 0; margin-bottom: 0 !important +======= + margin: 0; + padding: 0; + margin-bottom: 0 !important +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } table, @@ -1163,6 +2275,7 @@ input, textarea, select, button { +<<<<<<< HEAD outline: none; border-radius: 3px; font-family: 微软雅黑, 宋体; @@ -1175,26 +2288,56 @@ button { textarea { resize: none +======= + outline: none; + border-radius: 3px; + font-family: 微软雅黑, 宋体; + font-size: 14px; + line-height: 1.9; + border: 1px solid #eaeaea; + background: #fff; + color: #05101a +} + +textarea { + resize: none +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { +<<<<<<< HEAD color: #ccc +======= + color: #ccc +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-moz-placeholder, textarea::-moz-placeholder { +<<<<<<< HEAD color: #ccc +======= + color: #ccc +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-moz-placeholder, textarea::-moz-placeholder { +<<<<<<< HEAD color: #ccc +======= + color: #ccc +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } input::-ms-input-placeholder, textarea::-ms-input-placeholder { +<<<<<<< HEAD color: #ccc +======= + color: #ccc +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } div, @@ -1202,23 +2345,37 @@ img, tr, td, table { +<<<<<<< HEAD border: 0 +======= + border: 0 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a:link, a:visited { +<<<<<<< HEAD text-decoration: none; color: #05101a +======= + text-decoration: none; + color: #05101a +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } ol, ul, li { +<<<<<<< HEAD list-style-type: none +======= + list-style-type: none +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } select:disabled, input:disabled { +<<<<<<< HEAD background-color: #eee } @@ -1279,17 +2436,86 @@ input:disabled { .edu-position { position: relative +======= + background-color: #eee +} + +.clearfix:after { + clear: both; + content: "."; + display: block; + font-size: 0; + height: 0; + line-height: 0; + visibility: hidden +} + +.clearfix { + clear: both; + zoom: 1 +} + +.cl { + clear: both; + overflow: hidden +} + +.fl { + float: left !important +} + +.fr { + float: right !important +} + +.break-word { + word-break: break-all; + word-wrap: break-word +} + +.break-word-firefox { + white-space: pre-wrap !important; + word-break: break-all +} + +.justify { + text-align: justify +} + +.indent { + text-indent: 2em +} + +.edu-max-h200 { + height: 200px; + overflow: auto +} + +.edu-h270 { + height: 270px +} + +.edu-position { + position: relative +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a.edu-txt-w100, .edu-txt-w100 { +<<<<<<< HEAD width: 100px; display: inline-block; text-align: center +======= + width: 100px; + display: inline-block; + text-align: center +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a.edu-txt-w80, .edu-txt-w80 { +<<<<<<< HEAD width: 80px; display: inline-block; text-align: center @@ -2319,6 +3545,1042 @@ a:hover { .color-grey-74 { color: #747a7f !important +======= + width: 80px; + display: inline-block; + text-align: center +} + +.task-hide { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis +} + +.task-hide-2 { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2 +} + +.none { + display: none !important +} + +.block { + display: block +} + +.boxsizing { + box-sizing: border-box +} + +.iconfont { + font-size: 18px !important +} + +.font-n { + font-weight: 400 !important +} + +.font-bd { + font-weight: 700 +} + +.font-n { + font-weight: 400 +} + +.font-12 { + font-size: 12px !important +} + +.font-13 { + font-size: 13px !important +} + +.font-14 { + font-size: 14px !important +} + +.font-15 { + font-size: 15px !important +} + +.font-16 { + font-size: 16px !important +} + +.weight400 { + font-weight: 400 +} + +.weight500 { + font-weight: 500 +} + +.weight { + font-weight: 700 +} + +.font-17 { + font-size: 17px !important +} + +.font-18 { + font-size: 18px !important +} + +.font-20 { + font-size: 20px !important +} + +.font-22 { + font-size: 22px !important +} + +.font-25 { + font-size: 25px !important +} + +.font-26 { + font-size: 26px !important +} + +.font-24 { + font-size: 24px !important +} + +.font-28 { + font-size: 28px !important +} + +.font-30 { + font-size: 30px !important +} + +.font-32 { + font-size: 32px !important +} + +.font-34 { + font-size: 34px !important; +} + +.font-36 { + font-size: 36px !important +} + +.font-40 { + font-size: 40px !important +} + +.font-50 { + font-size: 50px !important +} + +.font-80 { + font-size: 80px !important +} + +.color-grey-b { + color: #bbb !important +} + +a.decoration { + text-decoration: underline +} + +.panel-form-label { + display: inline-block; + width: 10%; + min-width: 90px; + text-align: right; + line-height: 40px; + font-weight: 400 +} + +.mt1 { + margin-top: 1px +} + +.mt2 { + margin-top: 2px +} + +.mt3 { + margin-top: 3px +} + +.mt4 { + margin-top: 4px +} + +.mt5 { + margin-top: 5px !important +} + +.mt6 { + margin-top: 6px +} + +.mt7 { + margin-top: 7px !important +} + +.mt8 { + margin-top: 8px !important +} + +.mt9 { + margin-top: 9px +} + +.mt10 { + margin-top: 10px !important +} + +.mt12 { + margin-top: 12px +} + +.mt13 { + margin-top: 13px +} + +.mt14 { + margin-top: 14px +} + +.mt15 { + margin-top: 15px !important +} + +.mt16 { + margin-top: 16px +} + +.mt17 { + margin-top: 17px +} + +.mt18 { + margin-top: 18px +} + +.mt20 { + margin-top: 20px !important +} + +.mt22 { + margin-top: 22px !important +} + +.mt23 { + margin-top: 23px !important +} + +.mt24 { + margin-top: 24px !important +} + +.mt25 { + margin-top: 25px +} + +.mt28 { + margin-top: 28px +} + +.mt30 { + margin-top: 30px !important +} + +.mt34 { + margin-top: 34px !important +} + +.mt35 { + margin-top: 35px !important +} + +.mt36 { + margin-top: 36px !important +} + +.mt40 { + margin-top: 40px +} + +.mt45 { + margin-top: 45px +} + +.mt50 { + margin-top: 50px +} + +.mt56 { + margin-top: 56px +} + +.mt60 { + margin-top: 60px +} + +.mt70 { + margin-top: 70px +} + +.mt80 { + margin-top: 80px +} + +.mt100 { + margin-top: 100px +} + +.mb0 { + margin-bottom: 0 !important +} + +.mb3 { + margin-bottom: 3px +} + +.mb5 { + margin-bottom: 5px +} + +.mb7 { + margin-bottom: 7px +} + +.mb10 { + margin-bottom: 10px +} + +.mb12 { + margin-bottom: 12px +} + +.mb13 { + margin-bottom: 13px +} + +.mb14 { + margin-bottom: 14px +} + +.mb15 { + margin-bottom: 15px !important +} + +.mb16 { + margin-bottom: 16px +} + +.mb20 { + margin-bottom: 20px !important +} + +.mb25 { + margin-bottom: 25px +} + +.mb26 { + margin-bottom: 26px +} + +.mb30 { + margin-bottom: 30px !important +} + +.mb40 { + margin-bottom: 40px !important +} + +.mb50 { + margin-bottom: 50px !important +} + +.mb60 { + margin-bottom: 60px !important +} + +.mb70 { + margin-bottom: 70px !important +} + +.mb80 { + margin-bottom: 80px !important +} + +.mb100 { + margin-bottom: 100px !important +} + +.ml-3 { + margin-left: -3px +} + +.ml1 { + margin-left: 1px +} + +.ml2 { + margin-left: 2px +} + +.ml3 { + margin-left: 3px +} + +.ml4 { + margin-left: 4px +} + +.ml5 { + margin-left: 5px +} + +.ml6 { + margin-left: 6px +} + +.ml8 { + margin-left: 8px +} + +.ml10 { + margin-left: 10px +} + +.ml12 { + margin-left: 12px !important +} + +.ml13 { + margin-left: 13px !important +} + +.ml15 { + margin-left: 15px +} + +.ml18 { + margin-left: 18px +} + +.ml20 { + margin-left: 20px +} + +.ml22 { + margin-left: 22px +} + +.ml25 { + margin-left: 25px +} + +.ml30 { + margin-left: 30px +} + +.ml33 { + margin-left: 33px +} + +.ml35 { + margin-left: 35px +} + +.ml40 { + margin-left: 40px +} + +.ml50 { + margin-left: 50px +} + +.ml60 { + margin-left: 60px +} + +.ml80 { + margin-left: 80px +} + +.ml85 { + margin-left: 85px +} + +.ml180 { + margin-left: 180px +} + +.mr3 { + margin-right: 3px +} + +.mr4 { + margin-right: 4px +} + +.mr5 { + margin-right: 5px +} + +.mr8 { + margin-right: 8px +} + +.mr10 { + margin-right: 10px +} + +.mr12 { + margin-right: 12px !important +} + +.mr15 { + margin-right: 15px +} + +.mr18 { + margin-right: 18px +} + +.mr20 { + margin-right: 20px +} + +.mr25 { + margin-right: 25px +} + +.mr30 { + margin-right: 30px +} + +.mr35 { + margin-right: 35px +} + +.mr40 { + margin-right: 40px +} + +.mr50 { + margin-right: 50px +} + +.mr60 { + margin-right: 60px +} + +.mr70 { + margin-right: 70px +} + +.mr80 { + margin-right: 80px +} + +.mr90 { + margin-right: 90px +} + +.ml61 { + margin-left: 61px +} + +.pt5 { + padding-top: 5px !important +} + +.pt10 { + padding-top: 10px +} + +.pt15 { + padding-top: 15px +} + +.pt20 { + padding-top: 20px !important +} + +.pt25 { + padding-top: 25px +} + +.pt30 { + padding-top: 30px +} + +.pt35 { + padding-top: 35px +} + +.pt37 { + padding-top: 37px +} + +.pt40 { + padding-top: 40px +} + +.pt50 { + padding-top: 50px +} + +.pt60 { + padding-top: 60px +} + +.pt80 { + padding-top: 80px +} + +.pb5 { + padding-bottom: 5px !important +} + +.pb10 { + padding-bottom: 10px +} + +.pb15 { + padding-bottom: 15px +} + +.pb20 { + padding-bottom: 20px +} + +.pb25 { + padding-bottom: 20px +} + +.pb25 { + padding-bottom: 20px +} + +.pb28 { + padding-bottom: 28px +} + +.pb30 { + padding-bottom: 30px +} + +.pb40 { + padding-bottom: 40px +} + +.pb47 { + padding-bottom: 47px +} + +.pb50 { + padding-bottom: 50px +} + +.pb60 { + padding-bottom: 60px +} + +.pb100 { + padding-bottom: 100px +} + +.pr5 { + padding-right: 5px +} + +.pr10 { + padding-right: 10px +} + +.pr15 { + padding-right: 15px +} + +.pr20 { + padding-right: 20px !important +} + +.pr30 { + padding-right: 30px !important +} + +.pr35 { + padding-right: 35px !important +} + +.pl0 { + padding-left: 0 !important +} + +.pl5 { + padding-left: 5px +} + +.pl8 { + padding-left: 8px +} + +.pl10 { + padding-left: 10px +} + +.pl15 { + padding-left: 15px +} + +.pl20 { + padding-left: 20px +} + +.pl25 { + padding-left: 25px +} + +.pl28 { + padding-left: 28px +} + +.pl30 { + padding-left: 30px !important +} + +.pl33 { + padding-left: 33px +} + +.pl35 { + padding-left: 35px +} + +.pl40 { + padding-left: 40px +} + +.pl50 { + padding-left: 50px +} + +.pl60 { + padding-left: 60px +} + +.pr5 { + padding-right: 5px +} + +.pr10 { + padding-right: 10px +} + +.pr15 { + padding-right: 15px +} + +.pr20 { + padding-right: 20px !important +} + +.pr25 { + padding-right: 25px !important +} + +.pr30 { + padding-right: 30px !important +} + +.pr40 { + padding-right: 40px +} + +.padding5-10 { + padding: 5px 10px; + box-sizing: border-box +} + +.padding5-20 { + padding: 5px 20px; + box-sizing: border-box +} + +.padding10 { + padding: 10px; + box-sizing: border-box +} + +.padding15 { + padding: 15px; + box-sizing: border-box +} + +.padding20 { + padding: 20px; + box-sizing: border-box +} + +.padding10-20 { + padding: 10px 20px; + box-sizing: border-box +} + +.padding10-15 { + padding: 10px 15px; + box-sizing: border-box +} + +.padding10-30 { + padding: 10px 30px; + box-sizing: border-box +} + +.padding20-30 { + padding: 20px 30px; + box-sizing: border-box +} + +.padding30 { + padding: 30px; + box-sizing: border-box +} + +.padding30-20 { + padding: 30px 20px; + box-sizing: border-box +} + +.padding40 { + padding: 40px; + box-sizing: border-box +} + +.padding40-30 { + padding: 40px 30px; + box-sizing: border-box +} + +.padding40-20 { + padding: 40px 20px; + box-sizing: border-box +} + +.lineh-12 { + line-height: 12px !important +} + +.lineh-15 { + line-height: 15px !important +} + +.lineh-17 { + line-height: 17px !important +} + +.lineh-20 { + line-height: 20px !important +} + +.lineh-24 { + line-height: 24px !important +} + +.lineh-25 { + line-height: 25px !important +} + +.lineh-30 { + line-height: 30px !important +} + +.lineh-35 { + line-height: 35px !important +} + +.lineh-40 { + line-height: 40px !important +} + +.break_word { + word-break: break-all; + word-wrap: break-word +} + +.break_word_firefox { + white-space: pre-wrap !important; + word-break: break-all +} + +.pr { + position: relative +} + +.df { + display: flex; + display: -webkit-flex; + display: -ms-flex +} + +.flex1 { + flex: 1; + width: 0; +} + +input::-ms-clear { + display: none +} + +::-webkit-scrollbar { + width: 7px; + height: 10px; + background-color: #f5f5f5 +} + +.ant-modal-close { + top: 8px !important +} + +.newContainer { + min-height: 100%; + height: auto !important; + height: 100%; + position: relative +} + +.educontent { + width: 1200px; + margin: 0 auto; + box-sizing: border-box +} + +.newMain { + margin: 0 auto; + min-width: 1200px +} + +.edu-txt-center { + text-align: center !important +} + +.edu-txt-left { + text-align: left !important +} + +.edu-txt-right { + text-align: right !important +} + +.edu-back-white { + background-color: #fff +} + +.edu-back-greyf5 { + background-color: #f5f5f5 !important +} + +.edu-back-skyblue { + background: #f4faff +} + +.edu-back-blue { + background-color: #459be6 !important +} + +.edu-bg-light-blue { + background: #f7f9fd; + padding: 5px +} + +.color-red { + color: red !important +} + +.color-white { + color: #fff !important +} + +.color-dark { + color: #05101a !important +} + +.color-ooo { + color: #000 !important +} + +.color-grey-name { + color: #1a0b00 !important +} + +.color-grey-3 { + color: #333 !important +} + +.color-grey-eb { + color: #ebebeb !important +} + +.color-grey-c { + color: #ccc !important +} + +a.hoverLine:hover { + text-decoration: underline +} + +.color-grey-cd { + color: #cdcdcd !important +} + +.color-grey-d { + color: #ddd +} + +.color-grey-9 { + color: #999 !important +} + +a:hover { + color: #6684fe +} + +.color-grey-98 { + color: #989898 !important +} + +.color-grey-8 { + color: #888 !important +} + +.color-grey-6 { + color: #666 !important +} + +.color-grey-B2 { + color: #b2b2b2 !important +} + +.color-grey-B3 { + color: #b3b3b3 !important +} + +.color-grey-B4 { + color: #b4b4b4 !important +} + +.color-grey-74 { + color: #747a7f !important +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a.color-grey-name:hover, @@ -2326,6 +4588,7 @@ a.color-dark:hover, a.color-grey-6:hover, a.color-grey-3:hover, a.color-ooo:hover { +<<<<<<< HEAD color: #2a61ff !important } @@ -2351,10 +4614,38 @@ a.color-ooo:hover { .color-orange-tips { color: #ff8204 !important +======= + color: #2a61ff !important +} + +.color-blue { + color: #2a61ff !important +} + +.color-blue-file { + color: #4598fa !important +} + +.color-blue_4C { + color: #4cacff !important +} + +.color-orange { + color: #ff6800 !important +} + +.color-orange-tip { + color: #ff954c !important +} + +.color-orange-tips { + color: #ff8204 !important +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a.color-orange:hover, a.color-orange-tip:hover { +<<<<<<< HEAD color: #f06200 !important } @@ -2515,17 +4806,186 @@ a.color-green:hover { .width15 { width: 15% +======= + color: #f06200 !important +} + +.color-yellow { + color: #efc003 !important +} + +.color-yellow-ff { + color: #ffa800 !important +} + +.color-green { + color: #29bd8b !important +} + +a.color-green:hover { + color: #28ac7f !important +} + +.radius { + border-radius: 50% +} + +.radius4 { + border-radius: 4px +} + +.ring-green { + width: 18px; + height: 18px; + display: block; + border-radius: 50%; + background-color: #29bd8b; + text-align: center +} + +.ring-op-green { + width: 18px; + height: 18px; + display: block; + border-radius: 50%; + background-color: rgba(41, 189, 139, .6); + text-align: center +} + +.ring-grey { + width: 18px; + height: 18px; + line-height: 18px; + display: block; + border-radius: 50%; + background-color: rgba(204, 204, 204, .5); + text-align: center +} + +.ring-blue { + width: 18px; + height: 18px; + display: block; + border-radius: 50%; + background-color: #4cacff; + text-align: center +} + +.input-flex-35 { + flex: 1; + height: 35px; + padding: 5px; + box-sizing: border-box +} + +.input-flex-40 { + flex: 1; + height: 40px; + padding: 5px; + box-sizing: border-box +} + +.input-100-45 { + width: 100%; + height: 45px; + padding: 5px; + box-sizing: border-box +} + +.input-60-40 { + width: 60%; + height: 40px; + padding: 5px; + box-sizing: border-box +} + +.greyInput { + background-color: #f5f5f5; + outline: none +} + +.greyInput:focus { + background-color: #fff; + border: 1px solid #ddd +} + +.winput-240-40 { + width: 240px; + height: 40px; + padding: 5px; + box-sizing: border-box +} + +.winput-120-35 { + width: 120px; + height: 35px; + padding: 5px; + box-sizing: border-box +} + +.winput-100-130 { + width: 100%; + height: 130px; + padding: 5px; + box-sizing: border-box +} + +.winput-100-150 { + width: 100%; + height: 150px; + padding: 5px; + box-sizing: border-box +} + +.width100 { + width: 100% !important +} + +.width89 { + width: 89% +} + +.width50 { + width: 50% +} + +.width40 { + width: 40% +} + +.width45 { + width: 45% +} + +.width10 { + width: 10% +} + +.width20 { + width: 20% +} + +.width15 { + width: 15% +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a.edu-txt-w100, .edu-txt-w100 { +<<<<<<< HEAD width: 100px; display: inline-block; text-align: center +======= + width: 100px; + display: inline-block; + text-align: center +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } a.edu-txt-w80, .edu-txt-w80 { +<<<<<<< HEAD width: 80px; display: inline-block; text-align: center @@ -2618,10 +5078,105 @@ a.decoration { height: 100%; display: block; color: #323232 +======= + width: 80px; + display: inline-block; + text-align: center +} + +.minH-440 { + min-height: 440px +} + +.minH-500 { + min-height: 500px +} + +.minH-560 { + min-height: 560px +} + +.minH-650 { + min-height: 650px +} + +.minH-670 { + min-height: 670px +} + +.over210 { + height: 210px; + overflow-y: auto +} + +.over280 { + height: 280px; + overflow-y: auto +} + +.bor-bottom-greyE { + border-bottom: 1px solid #eee !important +} + +.bor-left-greyE { + border-left: 1px solid #eee !important +} + +.bor-top-greyE { + border-top: 1px solid #eee !important +} + +.bor-grey-e { + border: 1px solid #eee +} + +.bor-red { + border: 1px solid #db0505 !important +} + +a.decoration { + text-decoration: underline !important +} + +.edu-menu-panel { + position: relative; + cursor: pointer +} + +.edu-menu-list { + position: absolute; + padding: 5px 0; + box-shadow: 0 2px 8px rgba(0, 0, 0, .2); + display: none; + width: 120px; + background: #fff; + right: -5px; + border-radius: 0 0 4px 4px; + color: #05101a; + font-size: 14px; + z-index: 9 +} + +.edu-menu-list li { + width: 100%; + padding: 0 15px; + box-sizing: border-box; + height: 35px; + line-height: 35px; + cursor: pointer +} + +.edu-menu-list li a { + width: 100%; + height: 100%; + display: block; + color: #323232 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .edu-menu-panel:hover i, .edu-menu-panel:hover { +<<<<<<< HEAD color: #4cacff } @@ -2671,12 +5226,64 @@ a.decoration { top: 0; display: none; z-index: 100000 +======= + color: #4cacff +} + +.edu-menu-panel:hover .edu-menu-list { + display: block +} + +.edu-menu-list li:hover { + background: #4cacff +} + +.edu-menu-list li:hover a { + color: #fff !important +} + +.ul-leftline:after { + position: absolute; + top: 0; + content: ""; + width: 1px; + background-color: #eee; + height: 100%; + right: 0 +} + +.overPart { + width: 240px; + height: 30px; + position: absolute; + right: 0; + top: -27px; + background: 0 0 +} + +.handler_bg { + background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==)no-repeat 50% +} + +.handler_ok_bg { + background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==)no-repeat 50% +} + +.-task-title { + opacity: 0; + position: absolute; + left: 0; + top: 0; + display: none; + z-index: 100000 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .data-tip-down, .data-tip-left, .data-tip-right, .data-tip-top { +<<<<<<< HEAD position: relative; box-shadow: 0 0 8px #000; background: #000; @@ -2688,6 +5295,19 @@ a.decoration { padding: 0 10px; border: 1px solid #000; display: none +======= + position: relative; + box-shadow: 0 0 8px #000; + background: #000; + color: #fff; + max-width: 300px; + word-wrap: break-word; + text-align: center; + border-radius: 4px; + padding: 0 10px; + border: 1px solid #000; + display: none +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .data-tip-down:after, @@ -2698,14 +5318,22 @@ a.decoration { .data-tip-right:after, .data-tip-top:after, .data-tip-top:before { +<<<<<<< HEAD position: absolute; content: ''; width: 0; height: 0 +======= + position: absolute; + content: ''; + width: 0; + height: 0 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .data-tip-down:after, .data-tip-down:before { +<<<<<<< HEAD left: 45%; top: -10px; border-left: 5px solid transparent; @@ -2716,10 +5344,23 @@ a.decoration { .data-tip-down:before { top: -11px; border-bottom: 10px solid #000 +======= + left: 45%; + top: -10px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 10px solid #000 +} + +.data-tip-down:before { + top: -11px; + border-bottom: 10px solid #000 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .data-tip-left:after, .data-tip-left:before { +<<<<<<< HEAD left: -10px; top: 50%; margin-top: -5px; @@ -2731,10 +5372,24 @@ a.decoration { .data-tip-left:before { left: -12px; border-right: 10px solid #000 +======= + left: -10px; + top: 50%; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 10px solid #000 +} + +.data-tip-left:before { + left: -12px; + border-right: 10px solid #000 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .data-tip-right:after, .data-tip-right:before { +<<<<<<< HEAD right: -10px; top: 50%; margin-top: -5px; @@ -2746,10 +5401,24 @@ a.decoration { .data-tip-right:before { right: -10px; border-left: 10px solid #000 +======= + right: -10px; + top: 50%; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 10px solid #000 +} + +.data-tip-right:before { + right: -10px; + border-left: 10px solid #000 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .data-tip-top:after, .data-tip-top:before { +<<<<<<< HEAD left: 45%; bottom: -10px; border-left: 5px solid transparent; @@ -3167,16 +5836,441 @@ a.user_bluebg_btn { .cdefault { cursor: default !important +======= + left: 45%; + bottom: -10px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 10px solid #000 +} + +.data-tip-top:before { + bottom: -11px +} + +.edu-pop-table { + width: 100%; + border: 1px solid #eee; + border-bottom: none; + background: #fff; + color: #888; + cursor: default +} + +.edu-pop-table tr { + height: 40px +} + +.edu-txt-center { + text-align: center +} + +.edu-txt-left { + text-align: left +} + +.edu-txt-right { + text-align: right +} + +.edu-pop-table tr th { + color: #333; + border-bottom: 1px solid #eee +} + +.edu-pop-table tr td { + border-bottom: 1px solid #eee +} + +.edu-pop-table.head-color thead tr { + background: #fafbfb +} + +.edu-pop-table.head-color { + border: none +} + +.edu-pop-table.head-color tr:last-child td { + border: none +} + +.edu-pop-table.interval-td { + border-bottom: 1px solid #eee +} + +.edu-pop-table.interval-td thead tr { + background: #fafbfb +} + +.edu-pop-table.interval-td tbody tr:nth-child(even) { + background: #fafbfb +} + +.edu-pop-table.interval-td tbody tr td { + border: none +} + +.edu-pop-table-all { + width: 100%; + border: 1px solid #eee; + background: #fff; + color: #888; + border-collapse: collapse +} + +.edu-pop-table-all tr { + height: 30px +} + +.edu-pop-table-all tr th { + color: #333; + border: 1px solid #eee +} + +.edu-pop-table-all tr td { + border: 1px solid #eee; + padding: 5px +} + +img.edu-nodata-img { + width: 300px; + margin: 50px auto 20px; + display: block; + width: 128px +} + +.edu-nodata-p { + font-size: 20px; + text-align: center; + color: #999; + border-bottom: none !important; + box-sizing: border-box +} + +.notice { + height: 25px; + margin-left: 150px +} + +.edu-position-hide { + position: absolute; + top: 15px; + left: -20px; + box-shadow: 0 2px 8px rgba(146, 153, 169, .5); + background: #fff; + z-index: 1001; + padding: 5px 0; + z-index: 999999 +} + +.edu-position-hide li a { + display: inline-block; + height: 30px; + width: 100px; + line-height: 30px; + text-align: center; + font-size: 12px !important +} + +.edu-position-hide li a:hover { + background: #f1f1f1; + color: #05101a +} + +.edu-position-hidebox i { + color: #bcbcbc +} + +.edu-position-hidebox i:hover { + color: #4cacff +} + +.edu-position-hidebox a { + color: #05101a +} + +.edu-position-hidebox:hover .edu-position-hide { + display: block +} + +.white-btn { + text-align: center; + cursor: pointer; + display: inline-block; + padding: 0 8px; + border: 1px solid #ccc; + color: #666; + letter-spacing: 1px; + font-size: 14px; + height: 26px; + line-height: 26px; + border-radius: 3px +} + +a.white-btn.orange-btn { + border: 1px solid #ff7500; + color: #ff7500 !important +} + +a.white-btn.orange-btn:hover { + border: 1px solid #f06200; + color: #f06200 !important +} + +.defalutGreyBorder { + display: block; + padding: 0 10px; + border: 1px solid #ccc; + height: 30px; + line-height: 30px; + border-radius: 4px +} + +a.task-btn { + cursor: pointer; + display: inline-block; + border: none; + padding: 0 12px; + color: #fff; + background: #cdcdcd !important; + letter-spacing: 1px; + text-align: center; + font-size: 14px; + height: 30px; + line-height: 30px; + border-radius: 2px; + font-weight: 400 +} + +.user_default_btn { + cursor: pointer; + font-size: 14px; + display: block; + width: 120px; + text-align: center; + height: 40px; + line-height: 40px !important; + border-radius: 4px; + box-sizing: border-box +} + +.user_orange_btn { + color: #fff !important; + background-color: #ff6800 +} + +.user_orange_btn:hover { + background-color: #f06200 +} + +.user_grey_btn { + color: #fff !important; + background-color: #ccc; + cursor: default +} + +.user_private_btn { + color: #646464 !important; + background-color: #fff; + border: 1px solid #989898 +} + +.user_private_btn:hover { + color: #b2b2b2 !important; + border: 1px solid #b2b2b2 +} + +.btn_auto { + border-radius: 5px; + background: #fff; + padding: 0 18px +} + +.edu-default-btn { + display: block; + border-radius: 4px +} + +a.edu-greenback-btn { + padding: 0 10px; + background: #29bd8b; + color: #fff !important; + border: 1px solid #29bd8b +} + +a.edu-greenback-btn:hover { + background-color: #28ac7f +} + +a.edu-blueback-btn { + padding: 0 10px; + background: #4cacff; + color: #fff !important; + border: 1px solid #4cacff +} + +a.edu-blueline-btn { + padding: 0 10px; + color: #4cacff !important; + border: 1px solid #4cacff +} + +a.edu-blueback-btn:hover { + background-color: #459be6 +} + +a.edu-blueline-btn:hover { + border: 1px solid #459be6; + color: #459be6 !important +} + +a.edu-orangeback-btn { + background-color: #ff7500; + color: #fff !important; + border: 1px solid #ff7500 +} + +a.edu-orangeback-btn:hover { + background-color: #f06200 +} + +a.edu-orangeline-btn { + color: #ff7500 !important; + border: 1px solid #ff7500 +} + +a.edu-orangeline-btn:hover { + color: #f06200 !important; + border: 1px solid #f06200 +} + +a.edu-greyline-btn { + padding: 0 10px; + background: #fff; + color: #666 !important; + border: 1px solid #eaeaea; + line-height: 33px; + height: 33px +} + +a.edu-greyline-btn:hover { + border: 1px solid #b2b2b2; + color: #b2b2b2 !important +} + +.defalutCancelbtn { + display: block; + border: 1px solid #cdcdcd; + background-color: #fafafa; + color: #999 !important; + width: 120px; + text-align: center; + height: 30px; + line-height: 30px; + border-radius: 2px; + width: 130px; + height: 40px; + background: rgba(77, 124, 254, 0); + border: 1px solid #4cacff; + border-radius: 4px; + line-height: 40px; + font-size: 16px; + font-family: MicrosoftYaHei; + font-weight: 400; + color: #4cacff !important +} + +.defalutCancelbtn:hover { + border: 1px solid #b2b2b2; + color: #b2b2b2 !important +} + +.defalutSubmitbtn { + display: block; + border: 1px solid #4cacff; + background-color: #4cacff; + color: #fff !important; + width: 120px; + text-align: center; + line-height: 40px; + border-radius: 2px; + width: 130px; + height: 40px; + background: #4cacff; + border-radius: 4px; + font-size: 16px; + font-family: MicrosoftYaHei; + font-weight: 400; + color: #fff +} + +.delectshixuncdbtn { + display: block; + border: 1px solid #cdcdcd; + background-color: #fafafa; + color: #999 !important; + width: 120px; + text-align: center; + height: 30px; + line-height: 30px; + border-radius: 2px; + width: 130px; + height: 40px; + background: rgba(77, 124, 254, 0); + border-radius: 4px; + line-height: 40px; + font-size: 16px; + font-family: MicrosoftYaHei; + font-weight: 400 +} + +.defalutSubmitbtn:hover { + background-color: #459be6; + border: 1px solid #459be6 +} + +a.task-btn-orange { + background: #4cacff !important; + color: #fff !important +} + +a:hover.task-btn-orange { + background: #459be6 +} + +.user_blue_btn { + border: 1px solid #4cacff; + color: #4cacff !important +} + +a.user_bluebg_btn { + background-color: #4cacff; + color: #fff +} + +.pointer { + cursor: pointer +} + +.cdefault { + cursor: default !important +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .new_li .markdown-body ul>li, .markdown-body ul>li { +<<<<<<< HEAD list-style-type: disc !important; margin-bottom: 0 !important +======= + list-style-type: disc !important; + margin-bottom: 0 !important +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .new_li .markdown-body ol>li, .markdown-body ol>li { +<<<<<<< HEAD list-style-type: decimal !important } @@ -3250,10 +6344,86 @@ a.user_bluebg_btn { background-color: #fff9e9; border-color: #f6d0b1; color: #ee4a20 +======= + list-style-type: decimal !important +} + +.new_li li { + margin-bottom: 0 !important +} + +.markdown-body p { + font-size: 16px !important +} + +.task-popup { + width: 30%; + background: #fff; + border: 1px solid #e8e8e8; + border-radius: 10px +} + +.task-popup-text-center { + text-align: center; + color: #333 +} + +.task-popup-title { + border-bottom: 1px solid #eee; + padding: 0 15px; + text-align: center; + box-sizing: border-box; + line-height: 70px; + height: 70px; + border-radius: 10px 10px 0 0; + font-size: 16px; + font-weight: 700 +} + +.task-popup-content { + padding: 15px +} + +.task-popup-submit { + margin: 0 auto 15px; + width: 160px +} + +.task-popup-sure { + margin: 0 auto 15px; + width: 54px +} + +.task-popup-OK { + margin: 15px auto; + text-align: center +} + +#closeIcon { + position: absolute; + color: #fefefe +} + +.task_popup_con { + padding: 20px +} + +.alert { + padding: 10px; + border: 1px solid transparent; + text-align: center +} + +.alert-orange { + background-color: #fff9e9; + border-color: #f6d0b1; + color: #ee4a20 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .pages_user_show a:hover, .pages_user_show li.active a { +<<<<<<< HEAD background-color: #4cacff; color: #fff; border: 1px solid #4cacff @@ -3651,10 +6821,410 @@ html>body #ajax-indicator { .head-nav a { color: #fff; margin: 0 20px +======= + background-color: #4cacff; + color: #fff; + border: 1px solid #4cacff +} + +.pages_user_show a { + border-radius: 2px; + display: inline-block; + border: 1px solid #d1d1d1; + background-color: #fff; + color: #888; + float: left; + text-align: center; + padding: 2px 10px; + line-height: 1.9; + margin: 0 5px +} + +.pages_user_show li { + float: left; + list-style-type: none +} + +.pages_user_show ul li { + list-style-type: none !important +} + +.pages_user_show ul li a { + color: #888 +} + +.leftPanel { + width: 22%; + float: left +} + +.leftPanel li.nav { + padding: 10px 0; + box-sizing: border-box +} + +.leftPanel li.nav a { + padding-left: 40px; + display: block; + width: 100%; + box-sizing: border-box; + border-left: 2px solid #fff; + height: 24px; + line-height: 24px +} + +.leftPanel li.nav.active a { + border-left: 2px solid #4cacff +} + +.rightPanel { + width: 78%; + float: right +} + +.ringauto { + width: 20px; + height: 20px; + line-height: 20px; + text-align: center; + border-radius: 50%; + background-color: #f4faff; + margin-right: 5px +} + +#ajax-indicator { + position: absolute; + background-color: #eee; + border: 1px solid #bbb; + top: 35%; + left: 40%; + width: 20%; + font-weight: 700; + text-align: center; + padding: .6em; + z-index: 100000; + opacity: .5 +} + +html>body #ajax-indicator { + position: fixed +} + +#ajax-indicator span { + color: #fff; + color: #333; + background-position: 0 40%; + background-repeat: no-repeat; + background-image: url(/images/loading.gif); + padding-left: 26px; + vertical-align: bottom; + z-index: 100000 +} + +.bestChoose.active { + color: #4cacff +} + +.edu-filter-cir-grey { + color: #666 !important; + width: auto; + padding: 0 15px; + font-size: 14px !important; + text-align: center; + background: #f3f3f3; + border-radius: 10px; + display: block; + height: 25px; + line-height: 25px +} + +.edu-filter-cir-grey:hover { + background: #4cacff; + color: #fff !important +} + +.edu-filter-cir-grey.active { + background: #4cacff; + color: #fff !important; + font-size: 14px !important +} + +.with10 { + width: 10%; + box-sizing: border-box +} + +.with13 { + width: 13%; + box-sizing: border-box +} + +.with14 { + width: 14%; + box-sizing: border-box +} + +.with15 { + width: 15%; + box-sizing: border-box +} + +.with20 { + width: 20%; + box-sizing: border-box +} + +.with22 { + width: 22%; + box-sizing: border-box +} + +.with23 { + width: 23%; + box-sizing: border-box +} + +.with25 { + width: 25%; + box-sizing: border-box +} + +.with30 { + width: 30%; + box-sizing: border-box +} + +.with35 { + width: 35%; + box-sizing: border-box +} + +.with40 { + width: 40%; + box-sizing: border-box +} + +.with45 { + width: 45%; + box-sizing: border-box +} + +.with49 { + width: 49%; + box-sizing: border-box +} + +.with50 { + width: 50%; + box-sizing: border-box +} + +.with52 { + width: 52%; + box-sizing: border-box +} + +.with48 { + width: 48%; + box-sizing: border-box +} + +.with60 { + width: 60%; + box-sizing: border-box +} + +.with65 { + width: 65%; + box-sizing: border-box +} + +.with70 { + width: 70%; + box-sizing: border-box +} + +.with75 { + width: 75%; + box-sizing: border-box +} + +.with78 { + width: 78%; + box-sizing: border-box +} + +.with80 { + width: 80%; + box-sizing: border-box +} + +.with100 { + width: 100% +} + +.transform-90 { + transform: rotate(-90deg); + -ms-transform: rotate(-90deg); + -moz-transform: rotate(-90deg); + -webkit-transform: rotate(-90deg); + -o-transform: rotate(-90deg) +} + +.btn-cir { + display: inline-block; + padding: 0 5px; + border-radius: 25px; + line-height: 20px; + font-size: 12px +} + +.btn-cir-red { + background: red; + color: #fff; + font-weight: 400; + cursor: default +} + +.btn-cir-red:hover { + background: red; + color: #fff !important +} + +.edu-filter-btn { + cursor: default; + display: inline-block; + padding: 0 9px; + color: #666; + background: #fff; + text-align: center; + border-radius: 10px; + font-size: 12px; + height: 18px; + line-height: 18px +} + +.edu-filter-btn-red { + border: 1px solid #dd1717; + color: #dd1717 +} + +.edu-filter-btn-green { + border: 1px solid #29bd8b; + color: #29bd8b !important +} + +.edu-activity-orange { + background-color: #ff6800; + color: #fff !important; + cursor: pointer; + border: 1px solid #ff6800 +} + +.edu-activity-blue { + background-color: #4cacff; + color: #fff !important; + cursor: pointer; + border: 1px solid #4cacff +} + +.edu-activity-green { + background-color: #29bd8b; + color: #fff !important; + cursor: pointer; + border: 1px solid #29bd8b +} + +.color656565 { + color: #656565 +} + +.colorC8161D { + color: #c8161d +} + +.bor-reds { + border: 1px solid red !important; + border-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px +} + +.footer_con-p { + color: #898989 !important +} + +.markdown-body { + text-align: justify; + word-break: break-all; + width: 100% +} + +.RightPaneDrawer .ant-drawer-content { + background: #070f1a; + overflow: hidden !important +} + +.deletebuttom { + border: transparent +} + +.RightPaneDrawer .jupyter_data_list { + max-height: 340px +} + +.privateTag { + display: block; + padding: 0 6px; + border-radius: 12px; + border: 1px solid #2fc25b; + height: 18px; + line-height: 18px; + font-size: 12px; + margin-left: 10px; + color: #2fc25b +} + +.privateTag.red { + color: #ff6832; + border: 1px solid #ff6832 +} + +.head-nav::-webkit-scrollbar { + display: none +} + +.head-nav { + text-align: center; + height: 58px; + box-sizing: border-box; + text-overflow: ellipsis; + white-space: nowrap; + flex: 1; + white-space: nowrap; + overflow-y: auto; + display: flex; + align-self: flex-start +} + +.head-nav li { + height: 58px; + line-height: 58px; + cursor: pointer; + font-size: 16px +} + +.head-nav a { + color: #fff; + margin: 0 20px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .head-nav li a:hover, .head-nav li.active a { +<<<<<<< HEAD color: #5091ff } @@ -4193,10 +7763,551 @@ em.vertical-line { width: 188px; height: 60px; text-align: center +======= + color: #5091ff +} + +.head-right { + box-sizing: border-box; + height: 60px; + display: flex; + align-items: center +} + +.educontent .icon { + padding-left: 0 !important; + padding-top: 0 !important; + padding-bottom: 0 !important +} + +em.vertical-line { + display: inline-block; + width: 2px; + background: #999; + height: 10px +} + +.newslight { + display: block; + width: 5px; + height: 5px; + border-radius: 50%; + left: 25px; + top: 3px; + position: absolute; + background: #ff6800 +} + +.rateTrangle { + display: block; + border-width: 8px; + position: absolute; + top: -8px; + left: 35px; + border-style: dashed solid dashed dashed; + border-color: transparent transparent #fff transparent; + font-size: 0; + line-height: 0; + z-index: 2 +} + +#commentsStar { + height: 30px; + padding-top: 7px; + box-sizing: border-box +} + +.search-all { + width: 216px; + margin: 0 auto; + position: relative; + background-color: #24292d +} + +.search-all .search-clear { + font-size: 14px; + display: inline-block; + width: 50px; + text-align: center; + color: #656565; + line-height: 60px; + cursor: pointer +} + +.footercon { + border-bottom: 1px solid #47494d +} + +.inner-footernav { + width: 560px; + margin: 0 auto +} + +.inner-footernav li { + float: left; + height: 50px; + width: 80px; + text-align: center +} + +.inner-footernav li a { + width: 100%; + text-align: center; + line-height: 50px; + color: #888 +} + +.inner-footer_con { + width: 1200px; + margin: 0 auto +} + +.intermediatecenter { + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center +} + +.footer_con-p { + color: #888; + margin-top: 10px +} + +.banner { + width: 100%; + height: 345px; + position: relative; + overflow: hidden; + border-radius: 10px +} + +.banner .img { + position: absolute; + left: 0; + top: 0 +} + +.banner .img li { + float: left; + width: 1200px; + height: 345px +} + +.banner .img li a { + display: block; + width: 100%; + height: 100% +} + +.banner .img li img { + width: 100%; + height: 345px +} + +.banner .num { + position: absolute; + width: 100%; + bottom: 30px; + left: 0; + text-align: center; + font-size: 0 +} + +.banner .num li { + width: 7px; + height: 7px; + background: rgba(225, 225, 225, .3); + border-radius: 50%; + display: inline-block; + margin: 0 5px; + cursor: pointer +} + +.banner .num li.on { + width: 12px; + border-radius: 8px +} + +.moreitem { + position: absolute; + right: 5px; + top: 35px; + height: 15px; + color: #656565 +} + +.square-list { + width: 100%; + box-sizing: border-box; + margin-top: 20px; + flex-wrap: wrap; + display: flex +} + +.square-Item { + position: relative; + width: 280px; + margin-right: 26px; + margin-bottom: 26px; + float: left; + border-radius: 6px; + background-color: #fff; + box-shadow: 0 0 12px rgba(0, 0, 0, .1) +} + +.square-Item:hover { + box-shadow: 0 0 12px rgba(0, 0, 0, .3) +} + +.square-Item:hover .closeSquare { + display: block +} + +.square-Item:nth-child(4n+0) { + margin-right: 0 +} + +.square-Item .square-img { + display: block; + width: 100% +} + +.square-Item .square-img img { + width: 100%; + border-radius: 6px 6px 0 0; + vertical-align: bottom; + height: 210px +} + +.square-main { + padding: 15px 20px; + box-sizing: border-box +} + +.course-bottom { + height: 48px; + padding: 10px 0; + box-sizing: border-box +} + +.squareIconSpan { + line-height: 25px +} + +.square-Item.smallSquare { + width: 32%; + margin-right: 1.33%; + margin-bottom: 10px; + min-height: 210px; + border: none +} + +.square-Item.smallSquare:hover { + bottom: 0; + box-shadow: 0 0 12px rgba(0, 0, 0, .1) +} + +.smallSquare:nth-child(3n+0) { + margin-right: 0 +} + +.partimg { + height: 180px; + width: 100%; + border-radius: 6px 6px 0 0 +} + +.tag-green { + position: absolute; + left: 10px; + bottom: 90px +} + +.tag-green .tag-name { + display: block; + width: auto; + background: rgba(0, 0, 0, .56); + border: 1px solid rgba(255, 255, 255, .56); + border-radius: 3px; + font-size: 12px; + background-size: 100% 100%; + padding: 0 8px; + color: #fff; + float: left +} + +.tag-orange { + position: absolute; + right: 0; + top: 12px +} + +.tag-orange .tag-name { + display: block; + width: auto; + background-color: #ff6800; + background-size: 100% 100%; + padding: 0 8px; + color: #fff; + float: left; + height: 28px; + line-height: 28px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px +} + +.user_navlist { + position: absolute; + left: 0; + width: 160px; + top: 0; + height: 100% +} + +.user_navlist_black { + position: relative; + width: 100%; + height: 100%; + border-radius: 8px 0 0 8px; + background: rgba(0, 0, 0, .8) +} + +.user_navlist_white { + position: absolute; + left: 160px; + background: #fff; + width: 622px; + min-height: 345px; + top: 0; + z-index: 1; + display: none; + padding: 0 30px; + box-sizing: border-box; + box-shadow: 0 0 10px rgba(76, 76, 76, .2); + z-index: 99 +} + +.user_navlist_white a { + color: #989898; + margin-right: 15px; + font-size: 14px; + display: block; + float: left; + height: 30px; + line-height: 30px +} + +.user_navlist_white a:hover { + color: #4cacff +} + +.headIcon { + height: 100%; + box-sizing: border-box; + margin: 0 !important +} + +.black_nav_list { + padding: 4px 0; + box-sizing: border-box; + height: 100% +} + +.black_nav_list li { + line-height: 40px; + height: 40px; + color: #fff; + cursor: pointer +} + +.black_nav_span { + display: block; + margin: 0 20px; + border-bottom: 1px solid #4b4b4b; + padding-left: 8px; + color: #fafafa +} + +.welcome_shixun_index:last-child .black_nav_span { + border-bottom: none +} + +.black_nav_list li:hover { + background: #fff +} + +.black_nav_list li:hover .black_nav_span { + color: #05101a !important +} + +.black_nav_list li:hover>a { + color: #4cacff !important +} + +.black_nav_list li:hover .user_navlist_white { + display: block +} + +.navlistpanel-line { + border-bottom: 1px solid #ebebeb +} + +.navlistpanel-line:last-child { + border-bottom: none +} + +.little-title { + width: 100%; + height: 20px; + line-height: 20px; + color: #05101a; + font-size: 15px; + margin-bottom: 8px +} + +.ranking { + text-align: center; + margin-top: 40px +} + +.grade { + width: auto; + display: inline-block +} + +.grade li { + float: left; + margin: 0 10px; + width: 60px +} + +.ranking a img { + width: 60px; + height: 60px; + border-radius: 50%; + box-shadow: 0 0 12px rgba(0, 0, 0, .2) +} + +.mentor-ranking { + background-color: #efefef; + background-size: 100% 100% +} + +.huangguan { + position: absolute; + top: -30px; + left: 13px +} + +#log_reg_content { + border-radius: 5px; + background: #fff; + width: 100%; + text-align: center; + position: absolute; + top: 165px; + left: 0; + padding: 40px 30px; + box-sizing: border-box +} + +.log_nav { + border-bottom: 1px solid #eaeaea +} + +.log_nav li { + float: left; + text-align: center; + font-size: 16px; + padding-bottom: 15px; + cursor: pointer +} + +.log_nav li.active { + border-bottom: 2px solid #459be5 +} + +.log-botton { + width: 100%; + text-align: center; + color: #fff !important; + display: block; + background: #cbcbcb; + height: 45px; + line-height: 45px; + border-radius: 4px; + letter-spacing: 2px; + cursor: pointer +} + +.log-botton:hover { + color: #fff !important +} + +.log-botton.active { + background: #4cacff +} + +.gain-code { + width: 48%; + display: block; + float: right; + height: 45px; + line-height: 45px; + text-align: center; + background: #cbcbcb; + color: #fff !important; + border-radius: 4px; + cursor: pointer +} + +.gain-code:hover { + color: #fff !important +} + +.user-main-half { + width: 100%; + height: 465px; + background: #fff; + margin-bottom: 20px; + position: relative +} + +.user-headImg { + width: 100%; + height: 160px; + background-image: url(/images/educoder/userhead.jpg); + position: absolute; + width: 100%; + left: 0; + top: 0 +} + +.user-headCon { + position: absolute; + width: 100%; + left: 0; + top: 0; + min-height: 465px +} + +.inline { + width: auto; + display: inline-block +} + +.headtab { + width: 188px; + height: 60px; + text-align: center +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .headtab span, .headtab a { +<<<<<<< HEAD display: block; width: 100%; text-align: center @@ -4511,10 +8622,327 @@ em.vertical-line { .subshaicontent-part:last-child { border-bottom: none +======= + display: block; + width: 100%; + text-align: center +} + +.headtab span { + color: #989898; + font-size: 14px +} + +.headtab a { + color: #fff; + font-size: 24px +} + +.headphoto { + text-align: center; + background: #fff; + width: 115px; + height: 115px; + padding: 3px; + border-radius: 50%; + position: relative; + float: left; + margin-top: 19px; + box-sizing: border-box +} + +.headphoto img { + width: 109px; + border-radius: 50%; + height: 109px +} + +.headphoto-black { + display: none; + cursor: pointer; + position: absolute; + top: 3px; + left: 3px; + width: 109px; + height: 109px; + text-align: center; + line-height: 112px; + border-radius: 50%; + background-color: rgba(0, 0, 0, .3); + color: #fff +} + +.myName { + display: block; + width: auto; + color: #05101a; + font-size: 24px; + height: 28px; + line-height: 28px; + margin-top: 5px +} + +.mypost { + color: #686868; + font-size: 14px; + display: block; + width: auto; + height: 20px; + line-height: 20px +} + +.mysign-span { + margin: 0 auto; + color: #05101a; + font-size: 14px; + display: block; + width: 280px; + cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap +} + +.mysign-input { + margin: 0 auto; + color: #05101a; + font-size: 14px; + width: 280px; + height: 28px; + border: none; + outline: none; + text-align: center +} + +.v-h-line { + display: block; + width: 1px; + height: 40px; + background-color: #999; + margin-top: 12px +} + +.user-bar { + position: relative; + width: 100%; + height: 8px; + background-color: #cdcdcd; + border-radius: 4px +} + +.user-bar p { + position: absolute; + left: 0; + top: 0; + height: 100%; + background-color: #4cacff; + border-radius: 4px +} + +.publicpart { + position: absolute; + left: 1px; + top: 1px; + width: 0; + height: 0; + border-left: 80px solid #4cacff; + border-bottom: 80px solid transparent; + z-index: 1 +} + +.publicpart.orangeBlack { + border-left: 80px solid #ff6800 +} + +.smalltrangle { + display: block; + position: absolute; + left: 1px; + top: 1px; + border-left: 25px solid #fff; + border-bottom: 25px solid transparent; + z-index: 2 +} + +.publicword { + transform: rotate(-45deg); + text-align: center; + color: #fff; + font-size: 14px; + display: block; + position: absolute; + width: 50px; + left: 0; + z-index: 3; + top: 15px +} + +.closeSquare { + position: absolute; + width: 100%; + left: 0; + top: 0; + text-align: center; + background-color: rgba(0, 0, 0, .5); + height: 100%; + z-index: 5; + display: none; + cursor: default +} + +.substance { + padding: 40px 40px 0; + box-sizing: border-box; + text-align: center; + border-bottom: 1px solid #eaeaea; + min-height: 241px +} + +.subName { + line-height: 20px; + height: 40px; + text-align: center; + color: #1a0b00; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden +} + +.secondNav li { + color: #676767; + margin: 0 20px; + float: left +} + +.secondNav li a:hover { + color: #4cacff +} + +.secondNav li.active a { + color: #4cacff +} + +.dataBank_Item { + margin-bottom: 3px; + width: 100%; + border-bottom: 1px solid #eee; + padding: 17px 37px 17px 20px; + box-sizing: border-box; + background: #fff; + display: flex; + cursor: pointer +} + +.dataBank_Item:hover { + box-shadow: 0 0 15px rgba(76, 76, 76, .2) +} + +.dataBank_Item:last-child { + border: none +} + +.dataItemLeft { + margin-right: 20px; + width: 20px +} + +.dataItemRight { + flex: 1 +} + +.dataTitle { + color: #05101a; + display: block; + float: left; + max-width: 400px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden +} + +.itembottom span.bottomspan { + display: block; + width: 200px; + text-align: left +} + +.search_course_list { + height: 150px; + overflow-y: auto +} + +.search_course_list li { + height: 30px +} + +.userdata { + width: 622px; + margin: 0 auto; + background: #fff; + margin-bottom: 80px; + padding: 40px; + box-sizing: border-box; + border-radius: 4px +} + +.shaiTitle { + display: block; + padding-right: 20px +} + +.shaiContent li.shaiItem.active { + background-color: #4cacff !important; + color: #fff !important +} + +.shaiContent li.shaiItem { + padding: 3px 15px; + float: left; + border-radius: 4px; + color: #4c4c4c; + cursor: pointer; + margin-right: 15px; + display: block +} + +.shaiContent li.shaiItem:hover { + background-color: #4cacff !important; + color: #fff !important +} + +.shaiAllItem { + max-width: 1138px +} + +.subshaicontent { + display: none; + box-sizing: border-box; + position: absolute; + width: 100%; + top: 33px; + left: 0; + background-color: #fff; + box-shadow: 0 1px 4px rgba(76, 76, 76, .2); + padding: 0 20px; + z-index: 99999; + border-radius: 4px; + max-height: 800px; + overflow-y: auto +} + +.subshaicontent-part { + border-bottom: 1px solid #eee +} + +.subshaicontent-part:last-child { + border-bottom: none +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .subshaicontent a:hover, .subshaicontent a.active { +<<<<<<< HEAD color: #4cacff } @@ -4556,10 +8984,54 @@ em.vertical-line { left: 0; top: 1px; z-index: 2 +======= + color: #4cacff +} + +.subshaicontent a { + float: left; + margin-right: 20px; + color: #999; + cursor: pointer +} + +.search-new { + width: 248px; + height: 32px; + position: relative +} + +.search-span { + display: block; + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; + background-color: #f4f4f4; + border: 1px solid #eaeaea; + border-radius: 4px; + z-index: 1 +} + +.search-new-input { + height: 32px; + padding-left: 5px; + width: 225px; + border: none; + box-sizing: border-box; + background: 0 0; + outline: none; + position: absolute; + left: 0; + top: 1px; + z-index: 2 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .search-new img, .search-new a { +<<<<<<< HEAD cursor: pointer; position: absolute; right: 2px; @@ -5018,10 +9490,471 @@ em.vertical-line { border-radius: 5px; height: 100%; background-color: #29bd8b +======= + cursor: pointer; + position: absolute; + right: 2px; + top: 2px; + z-index: 2 +} + +.search-new a { + top: 0 +} + +.search-new-input:focus+.search-span { + background-color: #fff +} + +.controlblue { + width: 0; + height: 15px; + background-color: #4cacff; + border-radius: 7px; + position: absolute; + left: 0; + top: 0; + z-index: 1 +} + +.controlring { + width: 13px; + height: 13px; + border-radius: 50%; + background-color: #fff; + position: absolute; + left: 1px; + top: 1px; + z-index: 2 +} + +@font-face { + font-family: panmen-webfont; + src: url(../fonts/panmen-webfont.ttf) +} + +.shixunDetail_top { + width: 100%; + background-image: url(/images/educoder/shixun-detail.jpg); + height: 240px; + justify-content: center; + align-items: center; + display: -webkit-flex; + background-size: cover; + background-position: 50%; + background-repeat: no-repeat +} + +.task-item { + margin-top: 30px; + padding-bottom: 30px; + border-bottom: 1px solid #eee +} + +.task-item:last-child { + border-bottom: none +} + +.recomments { + margin-bottom: 20px +} + +.recomments:first-child { + margin-top: 0 +} + +.recomments:last-child { + margin-bottom: 0; + border: none; + padding-bottom: 0 +} + +.url-input { + border: none; + padding: 0; + font-size: 12px; + color: #999; + outline: none +} + +.TPMtaskName { + max-width: 500px +} + +.recomment-name { + max-width: 222px; + display: block +} + +.task-colspan { + min-width: 25%; + text-align: left; + display: block; + float: left; + color: #999 +} + +.challenge_nav { + padding: 20px 20px 0; + border-bottom: 1px solid #eee +} + +.challenge_nav li { + width: auto; + float: left; + margin-right: 20px; + position: relative +} + +.challenge_nav li.active:after { + position: absolute; + content: ''; + width: 76%; + background-color: #4cacff; + height: 3px; + border-radius: 2px; + left: 25%; + bottom: 0 +} + +.challenge_nav li a { + display: block; + width: 100%; + padding-bottom: 20px +} + +.add_choose_type { + width: 60px; + height: 20px; + line-height: 19px; + border-radius: 2px; + background-color: #eaeaea; + color: #999 !important; + display: block; + float: left; + text-align: center; + margin-top: 4px +} + +.task_tag_span { + float: left; + padding: 0 10px; + background-color: #eee; + color: #999; + border-radius: 2px; + margin-right: 10px; + margin-bottom: 8px +} + +.task_tag_span span { + float: left +} + +.task_tag_span a { + font-size: 18px; + margin-left: 5px; + float: left; + line-height: 28px; + height: 28px; + cursor: pointer +} + +.task_tag_span a:hover { + color: #666 !important +} + +.show_content_grey { + padding: 10px 15px; + background-color: #f4f4f4; + color: #05101a; + text-align: justify; + word-break: break-all; + border-radius: 4px; + width: 100%; + box-sizing: border-box +} + +.empty { + background: #494a4c; + display: inline; + margin: 0 2px; + padding: 0 3px +} + +.option-item { + border: 1px solid #e2e2e2 +} + +.option-item { + display: block; + width: 38px; + height: 38px; + text-align: center; + line-height: 38px; + border-radius: 4px; + cursor: pointer +} + +.check-option-bg { + background: #ff7500; + color: #fff !important; + border: 1px solid #ff7500 +} + +.position-delete { + position: absolute; + right: -22px; + top: 12px; + cursor: pointer +} + +.position-delete:hover i { + color: #4cacff !important +} + +.rankings li { + line-height: 40px; + height: 40px +} + +.rankingindex { + width: 24px; + text-align: center +} + +.collaborators-item { + border-bottom: 1px solid #eee; + cursor: default; + padding-top: 30px; + padding-left: 20px +} + +.collaborators-item:last-child { + border-bottom: none +} + +.upload_select_box { + width: 100%; + box-sizing: border-box; + height: 240px; + overflow-y: auto; + padding: 10px; + background: #f4faff; + color: #333 +} + +.pullreques_name { + width: 120px; + text-align: left; + margin-right: 10px +} + +.pullreques_pull_txt { + display: block; + margin-left: 10px; + max-width: 640px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis +} + +.versionFileList li { + border-bottom: 1px solid #eee +} + +.versionFileList li:last-child { + border-bottom: none +} + +.old { + background: #ffecec +} + +.old:hover { + background: #fffaf1 +} + +.new { + background: #eaffea +} + +.new:hover { + background: #fffaf1 +} + +.pathNavLine { + position: absolute; + bottom: -8px; + width: 100% +} + +.path-nav li { + float: left; + padding: 0 30px; + height: 42px +} + +.path-nav li a { + color: #fff; + font-size: 16px; + display: block; + height: 40px +} + +.path-nav li.active a { + border-bottom: 3px solid #4cacff; + color: #4cacff +} + +.subhead { + width: 100%; + margin-bottom: 40px; + background-size: 100% 100%; + background-image: url(/images/educoder/path-detail.jpg); + height: 240px; + justify-content: center; + align-items: center; + display: -webkit-flex; + background-size: cover; + background-position: 50%; + background-repeat: no-repeat +} + +.subhead_content { + width: 1200px; + margin: 0 auto +} + +.pathInfo li { + text-align: center; + float: left; + margin-right: 30px +} + +.pathInfo li span { + display: block +} + +.produce-content { + padding: 40px 20px; + background-color: #fff; + box-sizing: border-box +} + +.lesson-saved-list-item { + border-bottom: 1px solid #ebebeb; + padding: 37px 0 +} + +.title-line { + padding: 0 20px +} + +.paragraph { + height: 50px; + padding: 10px 20px 10px 47px; + box-sizing: border-box +} + +.paragraph:hover { + background-color: #f0f8ff +} + +.lesson-saved-list-item:last-child { + border: none +} + +.click_add { + text-align: center; + height: 90px; + line-height: 90px; + background-color: #fff; + border-top: 1px solid #ebebeb; + cursor: pointer +} + +.mustlearn { + padding: 40px 25px +} + +.teacherTeam { + padding: 40px 25px 0 +} + +.teacherTeamItem { + border-bottom: 1px solid #eaeaea; + padding: 40px 0 +} + +.teacherTeamItem:first-child { + padding-top: 0 !important +} + +.teacherTeamItem:last-child { + border: none +} + +.addTeamMember { + height: 70px; + text-align: center; + line-height: 70px +} + +.adding-stage-item { + padding: 0 20px 20px 50px; + position: relative +} + +.colseThispart { + position: absolute; + right: -6px; + top: -6px; + z-index: 2; + line-height: 15px +} + +.progressRing { + display: block; + width: 16px; + height: 16px; + float: left; + position: relative; + z-index: 1 +} + +.progressRing-over { + color: #459be6; + position: absolute; + top: -10px +} + +.progressRing-part { + color: #b3dcff; + position: absolute; + top: -10px +} + +.myProgressNav { + width: 100%; + position: relative; + height: 10px; + border-radius: 5px; + background-color: #eaeaea +} + +.myProgressGreen { + position: absolute; + top: 0; + left: 0; + border-radius: 5px; + height: 100%; + background-color: #29bd8b +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .lesson-saved-list-item .title-line .edit:hover, .lesson-saved-list-item .title-line .delete:hover { +<<<<<<< HEAD color: #ff7500 !important } @@ -5351,10 +10284,342 @@ li.li-width63 { border-radius: 10px; height: 20px; line-height: 20px +======= + color: #ff7500 !important +} + +li.li-width63 { + width: 63%; + text-align: left +} + +.courseHead { + width: 100%; + margin-bottom: 40px; + background-size: 100% 100%; + background-image: url(/images/educoder/courtailsbdpicture.jpg); + height: 240px; + justify-content: center; + align-items: center; + display: -webkit-flex; + background-size: cover; + background-position: 50%; + background-repeat: no-repeat +} + +.invite-tip { + position: absolute; + top: -5px; + right: 140px; + color: #fff; + box-sizing: border-box; + width: 170px; + text-align: center; + border-radius: 2px; + background-color: rgba(5, 16, 26, .6); + z-index: 5000 +} + +.inviteTipbtn a { + font-size: 14px; + width: 100%; + height: 30px; + line-height: 30px; + display: block; + color: #747a7f; + background-color: rgba(5, 16, 26, .4) +} + +.inviteTipbtn a:hover { + color: #4cacff !important +} + +.top-black-trangle { + display: block; + border-width: 8px; + position: absolute; + top: -16px; + right: 4px; + border-style: dashed solid dashed dashed; + border-color: transparent transparent rgba(5, 16, 26, .6)transparent; + font-size: 0; + line-height: 0 +} + +.loadMore { + width: 100%; + background-color: #fff; + color: #4cacff !important; + text-align: center; + display: block; + letter-spacing: 1px; + box-sizing: border-box; + height: 110px; + line-height: 110px +} + +.activity-left-name { + display: block; + max-width: 126px; + float: left +} + +.panel-inner-fourm { + padding: 15px 20px; + border-bottom: 1px solid #eee +} + +.panel-inner-fourm:hover { + background: #eff9fd +} + +.resources { + width: 100% !important; + padding: 15px; + float: left; + box-sizing: border-box; + border-top: 1px solid #eee +} + +.resources:last-child { + border-bottom: none +} + +#sourceTag li { + font-size: 12px; + color: #4e7a9b; + background-color: #e5f3ff; + padding: 0 4px; + height: 20px; + line-height: 20px; + margin-left: 5px; + display: inline-block; + cursor: pointer +} + +#sourceTag li a { + color: #4e7a9b !important +} + +#sourceTag li.active { + background-color: #4cacff; + color: #fff +} + +#sourceTag li.active a { + background-color: #4cacff; + color: #fff !important +} + +.new-info { + height: 18px; + min-width: 18px; + line-height: 18px; + padding: 0 2px; + box-sizing: border-box; + text-align: center; + background-color: #ff6800; + color: #fff; + border-radius: 30px; + display: block; + position: absolute; + right: 40px; + top: 13px; + font-size: 12px +} + +.ridingNav li { + float: left; + margin: 0 20px; + color: #999; + font-size: 16px; + height: 60px; + line-height: 60px; + position: relative +} + +.ridingNav li a { + display: block; + width: 100%; + height: 100%; + color: #999 +} + +.ridingNav li.active a { + color: #05101a +} + +.ridingNav li.active:after { + content: ''; + position: absolute; + bottom: 0; + width: 100%; + height: 2px; + border-radius: 1px; + background-color: #05101a +} + +.new-point { + display: block; + width: 4px; + height: 4px; + border-radius: 50%; + background-color: #ff6800 +} + +.ridinglist:hover { + background-color: #f5f5f5 +} + +.ridinglist .ridinglist-sub { + border-bottom: 1px solid #f5f5f5; + padding: 25px 0; + cursor: pointer +} + +.ridinglist:last-child .ridinglist-sub { + border-bottom: none +} + +.private-item { + padding: 30px 30px 30px 25px; + border-bottom: 1px solid #f5f5f5; + cursor: pointer +} + +.private-item:hover { + background-color: #f5f5f5 +} + +.private-item:last-child { + border-bottom: none +} + +.writeLetter_Info { + position: relative; + width: 100%; + height: 260px; + background-color: #f6f6f6; + cursor: default; + border-radius: 3px +} + +.writeLetter_text { + width: 100%; + border: none; + background-color: #f6f6f6; + outline: none; + height: 100%; + padding: 5px 5px 30px; + border: 1px solid #eaeaea; + box-sizing: border-box; + resize: none +} + +.longchar { + position: absolute; + background-color: #f6f6f6; + bottom: 1px; + color: #999; + right: 10px +} + +.writeLetter_text:focus+.longchar { + background-color: #fff +} + +.recently_person { + position: absolute; + width: 100%; + top: 35px; + max-height: 300px; + overflow-y: auto; + border-radius: 4px; + box-shadow: 0 1px 6px rgba(76, 76, 76, .2); + left: 0; + z-index: 1; + background-color: #fff; + cursor: pointer; + display: none +} + +.recently_item { + padding: 10px 20px +} + +.recently_name { + float: left; + line-height: 48px; + display: block +} + +.recently_item:hover { + background-color: #f9f9f9 +} + +.private-list { + min-height: 660px; + max-height: 831px; + overflow-y: auto; + overflow-x: hidden +} + +.private-list .private-part { + padding-left: 20px; + cursor: pointer +} + +.private-part:hover { + background-color: #f5f5f5 +} + +.private-part.active { + background-color: #f5f5f5 +} + +.privatePartName { + max-width: 70px; + float: left +} + +.newLetter { + display: block; + width: 4px; + height: 4px; + background-color: #ff6800; + border-radius: 50%; + float: right +} + +.part-line { + padding: 30px 20px 30px 0; + border-bottom: 1px solid #f5f5f5 +} + +.private-part:last-child .part-line { + border: none +} + +.dialogPanel { + padding: 0 20px; + height: 545px; + overflow-y: auto +} + +.letter-time { + width: auto; + padding: 0 10px; + background-color: #999; + color: #fff; + border-radius: 10px; + height: 20px; + line-height: 20px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .OtherSide, .ThisSide { +<<<<<<< HEAD margin-top: 30px } @@ -5600,10 +10865,258 @@ ul.count_ul li:not(:last-child):after { .mt4 { margin-top: 4px +======= + margin-top: 30px +} + +.OtherSide-info .trangle { + position: absolute; + left: -5px; + top: 10px; + width: 0; + height: 0; + border-top: 6px solid transparent; + border-right: 5px solid #f5f5f5; + border-bottom: 6px solid transparent +} + +.OtherSide-info .sms { + max-width: 300px; + padding: 10px 15px; + box-sizing: border-box; + background-color: #f5f5f5; + color: #666; + border-radius: 6px; + text-align: justify +} + +.OtherSide-info .sms img { + max-width: 80px; + cursor: pointer +} + +.ThisSide-info .sms p { + line-height: 20px +} + +.sms { + min-height: 48px +} + +.ThisSide .trangle { + position: absolute; + right: -5px; + top: 10px; + width: 0; + height: 0; + border-top: 6px solid transparent; + border-left: 5px solid #4cacff; + border-bottom: 6px solid transparent +} + +.ThisSide-info .sms { + max-width: 300px; + padding: 10px 15px; + box-sizing: border-box; + background-color: #4cacff; + color: #fff; + border-radius: 6px; + text-align: justify +} + +.ThisSide-info .sms p { + line-height: 20px +} + +.ThisSide-info .sms img { + max-width: 80px; + cursor: pointer +} + +.action { + color: #05101a +} + +.announcement { + padding: 20px 0; + border-bottom: 1px solid #eee +} + +.announcement:last-child { + border-bottom: none +} + +.part { + width: 540px; + margin: 0 auto 10px; + background-color: rgba(25, 27, 32, .6) +} + +.both { + clear: both +} + +.left { + float: left +} + +.right { + float: right +} + +.statistics_position { + position: absolute; + bottom: 22px; + left: 0; + width: 100%; + left: 0 +} + +ul.count_ul li { + width: 300px; + position: relative; + float: left +} + +ul.count_ul li span:first-child { + display: block; + width: 100%; + color: #989898; + margin-bottom: 20px +} + +ul.count_ul li span:last-child { + display: block; + width: 100%; + color: #fff; + font-size: 24px; + line-height: 20px +} + +ul.count_ul li:not(:last-child):after { + position: absolute; + content: ''; + width: 1px; + height: 36px; + background-color: #999; + right: 0; + top: 16px +} + +.static_shadow { + box-shadow: 0 0 9px rgba(174, 175, 177, .2) +} + +.subject_statistics_top { + height: 240px; + width: 100%; + position: relative; + background-image: url(/images/educoder/subject_statistics.jpg); + background-size: 100% 100% +} + +#course_list { + overflow-y: auto; + background: #fff +} + +.popup_tip_box { + right: -160px; + top: 55px +} + +.homepagePostSetting { + display: none +} + +.nodata { + text-align: center; + background-color: initial; + border-color: transparent; + color: #000 +} + +#attachments_fields span { + font-size: 12px; + color: #ccc +} + +.ml20mr20Color { + color: #676767 +} + +.color-dark-grey { + color: #999 !important +} + +.colorFFF { + color: #fff !important +} + +.left { + float: left +} + +.cancellation { + position: absolute; + top: 62px; + left: 177px; + color: #fff !important +} + +.tabeltext-alignleft { + text-align: center +} + +.newshixun_tab_div { + padding: 0 22px 0 -5px; + max-height: 90px; + overflow-y: auto +} + +.newcolor-orange { + color: #ff6800 +} + +.color4CACFF { + color: #4cacff !important; + font-size: 16px +} + +.color979797 { + font-size: 14px; + color: #979797 !important; + padding-left: 2% +} + +.marginTop { + margin-right: 33%; + margin-top: 20px +} + +.shixuns_count { + color: #05101a; + font-size: 14px +} + +#shixun_search_form_div { + margin-top: 20px; + margin-bottom: 20px !important +} + +.editormd-html-preview { + width: 100% !important; + color: #323232 !important +} + +.mt4 { + margin-top: 4px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .newMain, .newFooter { +<<<<<<< HEAD max-width: unset } @@ -5717,16 +11230,137 @@ ul.count_ul li:not(:last-child):after { float: left; padding: 0 30px 30px; font-size: 16px +======= + max-width: unset +} + +.educontentTop { + width: 1178px !important +} + +.inner-footer_con { + width: auto +} + +.careershover { + margin-right: 30px !important +} + +.careershover ul li a { + color: #000 !important +} + +.careershover ul li { + height: 35px !important; + line-height: 35px !important +} + +.edu-menu-listnew { + width: 165px !important; + top: 60px; + left: -42px +} + +.edu-menu-listnew li a { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #000 !important +} + +.edu-menu-listnew li a:hover { + color: #fff !important +} + +.ListTableLine>p { + margin-bottom: 0; + padding: 0 30px; + background-color: #f5f5f5; + line-height: 40px; + height: 56px; + padding-top: 8px; + box-sizing: border-box +} + +.ListTableLine>p span { + float: left; + color: #666; + box-sizing: border-box +} + +.ListTableLine li { + min-height: 48px; + padding: 10px 0; + box-sizing: border-box; + margin: 0 30px; + border-bottom: 1px solid #eaeaea +} + +.ListTableLine li>span { + float: left; + box-sizing: border-box +} + +.ListTableLine .column-1 { + width: 100px; + text-align: left; + padding-left: 5px; + box-sizing: border-box +} + +.ListTableLine .column-1 { + width: 100px; + text-align: left; + padding-left: 5px; + box-sizing: border-box +} + +.ListTableLine .column-2 { + width: 180px; + text-align: center; + padding-left: 5px; + box-sizing: border-box +} + +.ListTableLine .column-3 { + width: 330px; + text-align: left; + padding-left: 5px; + box-sizing: border-box +} + +.ListTableLine .column-4 { + width: 400px; + text-align: left; + padding-left: 5px; + box-sizing: border-box +} + +#traningNav { + padding: 30px 30px 0 0 +} + +#traningNav>li { + float: left; + padding: 0 30px 30px; + font-size: 16px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } #traningNav>li>a, #traningNav li>i { +<<<<<<< HEAD color: #666 !important; position: relative +======= + color: #666 !important; + position: relative +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } #traningNav>li.active>a, #traningNav li.active>i { +<<<<<<< HEAD color: #05101a !important } @@ -6134,10 +11768,420 @@ p { right: 0; top: 4px; color: #999 +======= + color: #05101a !important +} + +#traningNav>li.active>a:after { + content: ''; + position: absolute; + width: 64px; + left: 50%; + margin-left: -32px; + height: 2px; + background-color: #05101a; + bottom: -35px +} + +.gaugeOutfit { + position: relative; + height: 70px; + width: 120px; + background: linear-gradient(30deg, transparent 49.5%, #eee 50%, #eee 50%, transparent 50.5%) +} + +.gaugeOutfit span:first-child { + position: absolute; + left: 8px; + top: 46px +} + +.gaugeOutfit span:last-child { + position: absolute; + right: 8px; + top: 14px +} + +.sustainLine td:not(:first-child):hover { + background-color: rgba(41, 189, 139, .1); + cursor: pointer +} + +.packinput .ant-input { + height: 50px; + width: 749px; + border-color: #e1edf8 !important +} + +.packinput { + width: 749px +} + +.packinput .ant-input-group-addon .ant-btn { + width: 140px !important; + font-size: 18px; + height: 50px; + background: #4cacff +} + +.setissues { + width: 280px; + height: 50px; + background: #4cacff; + border-radius: 4px; + margin-left: 15px +} + +.pagetype li { + color: #8f8f8f !important +} + +.mbf10 { + margin-bottom: -10px +} + +.PackageIndexNEIBanner { + width: 1200px; + height: 110px; + background: #fff; + box-shadow: 0 2px 6px rgba(125, 125, 125, .26); + border-radius: 8px +} + +.padding110 { + padding: 39px 110px 0; + box-sizing: border-box +} + +.borderccc { + border: 1px solid #ccc +} + +.input-100-40s { + width: 100%; + padding: 5px; + box-sizing: border-box +} + +.fafafas { + background-color: #fafafa !important; + height: 40px +} + +.fafafas:focus { + background-color: #fff !important +} + +.fafas .ant-input { + background-color: #fafafa !important; + height: 40px +} + +.fafas .ant-input:focus { + background-color: #fff !important +} + +.fafas .ant-input-group-addon .ant-btn { + width: 140px !important; + font-size: 14px; + height: 40px; + background: #4cacff +} + +.newFormbox .upload_filename { + line-height: 32px +} + +.newFormbox .attachment span { + line-height: 23px +} + +.newFormbox .attachment .remove-upload { + line-height: 28px +} + +.newFormbox .attachment .icon-fujian { + font-size: 14px !important; + line-height: 14px; + margin-top: 9px +} + +.newFormbox { + height: 20px +} + +.defalutCancelbtns { + display: block; + border: 1px solid #4cacff !important; + background-color: #fff; + color: #4cacff !important; + width: 130px; + height: 40px; + text-align: center; + line-height: 40px; + border-radius: 4px +} + +.defalutSubmitbtns { + background-color: #4cacff; + height: 40px +} + +.defalutSubmitbtnmodels { + width: 127px; + height: 30px; + background-color: #4cacff +} + +.padding200 { + padding: 115px 200px 215px +} + +.fontcircle { + font-size: 80px; + display: inherit +} + +.sumbtongs { + font-size: 24px; + display: inherit; + text-align: center +} + +.terraces { + font-size: 16px; + display: inherit; + text-align: center; + color: #999 +} + +.padding251 { + padding: 0 245px +} + +.ml17 { + margin-left: 17px +} + +.project-package-items { + display: -webkit-flex; + display: flex; + flex-direction: row; + margin: 0 !important; + padding: 20px; + background: #fff; + margin-bottom: 0 !important; + box-shadow: none !important +} + +.publicpart.orangeGreen { + border-left: 80px solid #29bd8b +} + +.publicwords { + left: 3px; + top: 18px +} + +.project-packages-list .project-package-items .item-image { + width: 100px !important +} + +.height185 { + height: 185px +} + +.ContacttheTA { + width: 80px; + height: 26px; + font-size: 14px; + line-height: 26px; + display: block; + border: 1px solid #4cacff !important; + background-color: #fff; + color: #4cacff !important; + text-align: center; + border-radius: 4px +} + +.ContacttheTAs { + width: 80px; + height: 26px; + font-size: 14px; + line-height: 24px; + border: 1px solid #fff !important; + background-color: #4cacff; + color: #fff !important; + text-align: center; + border-radius: 4px +} + +.ml28 { + margin-left: 28px +} + +.longboxs { + font-size: 16px; + font-family: MicrosoftYaHei-Bold; + font-weight: 700; + color: #05101a; + border-left: 4px solid #4cacff; + padding-left: 10px; + margin-bottom: 20px +} + +.padding020 { + padding: 0 20px 20px +} + +.mtf3 { + margin-top: -3px +} + +.task-btn-nebules { + background: #fff !important; + color: #4cacff !important; + border: 1px solid #4cacff !important; + margin-left: 20px; + cursor: pointer; + display: inline-block; + padding: 0 12px; + letter-spacing: 1px; + text-align: center; + font-size: 14px; + height: 30px; + line-height: 30px; + border-radius: 2px +} + +.packageabsolute { + position: absolute; + right: -16px; + top: -7px +} + +.relativef { + position: relative +} + +.homehove:hover .ptext { + color: #4cacff !important +} + +.homehove:hover .ContacttheTAs { + display: block +} + +.topsj { + position: absolute; + top: -6px +} + +.bottomsj { + position: absolute; + bottom: -6px +} + +.pagenoedits { + margin-left: 20px; + color: #ccc +} + +.pagemancenter { + text-align: center +} + +.ml0 { + margin-left: 0 +} + +.tabelcli { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 850px; + display: table-cell +} + +.mtf10 { + margin-top: -10px +} + +.padding26 { + padding: 26px; + box-sizing: border-box +} + +.pd26 { + padding: 26px +} + +.pd30a0 { + padding: 30px 30px 16px +} + +.shaiContent li.shaiItem:hover span { + color: #fff !important +} + +.shaiContent li.shaiItem:hover i.iconfont { + color: #4cacff !important +} + +.detail_for_paragraph p { + white-space: pre-wrap +} + +.square-main p { + margin-bottom: 0 !important +} + +.markdown-body { + text-align: justify; + word-break: break-all +} + +.RightPaneDrawer .ant-drawer-content { + background: #070f1a; + overflow: hidden !important +} + +.deletebuttom { + border: transparent +} + +.RightPaneDrawer .jupyter_data_list { + max-height: 340px +} + +.ant-btn-primary { + text-shadow: none !important; + box-shadow: none !important +} + +.ant-notification { + z-index: 10001 !important +} + +input.ant-input-lg::placeholder { + font-size: 14px !important +} + +p { + margin-bottom: 0 !important +} + +.toprightNum { + position: absolute; + right: 0; + top: 4px; + color: #999 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .ant-input, .ant-input .ant-input-suffix { +<<<<<<< HEAD background-color: #fff !important } @@ -6148,10 +12192,23 @@ p { .CodeMirror-merge { position: relative; white-space: pre +======= + background-color: #fff !important +} + +.has-error .ant-input { + background-color: #fef1f0 !important +} + +.CodeMirror-merge { + position: relative; + white-space: pre +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .CodeMirror-merge, .CodeMirror-merge .CodeMirror { +<<<<<<< HEAD min-height: 50px } @@ -6206,10 +12263,67 @@ p { cursor: pointer; color: #d8d8d8; line-height: 1 +======= + min-height: 50px +} + +.CodeMirror-merge-2pane .CodeMirror-merge-pane { + width: 48% +} + +.CodeMirror-merge-2pane .CodeMirror-merge-gap { + width: 4% +} + +.CodeMirror-merge-3pane .CodeMirror-merge-pane { + width: 31% +} + +.CodeMirror-merge-3pane .CodeMirror-merge-gap { + width: 3.5% +} + +.CodeMirror-merge-pane { + display: inline-block; + white-space: normal; + vertical-align: top +} + +.CodeMirror-merge-pane-rightmost { + position: absolute; + right: 0; + z-index: 1 +} + +.CodeMirror-merge-gap { + z-index: 2; + display: inline-block; + height: 100%; + -moz-box-sizing: border-box; + box-sizing: border-box; + overflow: hidden; + position: relative; + background: #515151 +} + +.CodeMirror-merge-scrolllock-wrap { + position: absolute; + bottom: 0; + left: 50% +} + +.CodeMirror-merge-scrolllock { + position: relative; + left: -50%; + cursor: pointer; + color: #d8d8d8; + line-height: 1 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right { +<<<<<<< HEAD position: absolute; left: 0; top: 0; @@ -6237,17 +12351,53 @@ p { .CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px +======= + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + line-height: 1 +} + +.CodeMirror-merge-copy { + position: absolute; + cursor: pointer; + color: #ce374b; + z-index: 3 +} + +.CodeMirror-merge-copy-reverse { + position: absolute; + cursor: pointer; + color: #44c +} + +.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { + left: 2px +} + +.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { + right: 2px +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted { +<<<<<<< HEAD background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==); background-position: 0 100%; background-repeat: repeat-x +======= + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==); + background-position: 0 100%; + background-repeat: repeat-x +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted { +<<<<<<< HEAD background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==); background-position: 0 100%; background-repeat: repeat-x @@ -6255,6 +12405,15 @@ p { .CodeMirror-merge-r-chunk { background: #9a6868 +======= + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==); + background-position: 0 100%; + background-repeat: repeat-x +} + +.CodeMirror-merge-r-chunk { + background: #9a6868 +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } .CodeMirror-merge-r-chunk-start {} @@ -6262,6 +12421,7 @@ p { .CodeMirror-merge-r-chunk-end {} .CodeMirror-merge-r-connect { +<<<<<<< HEAD fill: #9a6868 } @@ -6315,4 +12475,59 @@ p { .cursor { cursor: pointer +======= + fill: #9a6868 +} + +.CodeMirror-merge-l-chunk { + background: #eef +} + +.CodeMirror-merge-l-chunk-start { + border-top: 1px solid #88e +} + +.CodeMirror-merge-l-chunk-end { + border-bottom: 1px solid #88e +} + +.CodeMirror-merge-l-connect { + fill: #eef; + stroke: #88e; + stroke-width: 1px +} + +.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { + background: #dfd +} + +.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { + border-top: 1px solid #4e4 +} + +.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { + border-bottom: 1px solid #4e4 +} + +.CodeMirror-merge-collapsed-widget:before { + content: "(...)" +} + +.CodeMirror-merge-collapsed-widget { + cursor: pointer; + color: #88b; + background: #eef; + border: 1px solid #ddf; + font-size: 90%; + padding: 0 3px; + border-radius: 4px +} + +.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { + display: none +} + +.cursor { + cursor: pointer +>>>>>>> 955e0d6f12d29c143095d2000b1783efd1b8bf95 } \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/component/introduction.jsx b/src/forge/Information/Pages/homepage/component/introduction.jsx new file mode 100644 index 000000000..12a8a3ec8 --- /dev/null +++ b/src/forge/Information/Pages/homepage/component/introduction.jsx @@ -0,0 +1,46 @@ +import React , { useEffect, useState } from 'react'; +import { getZoneStatistics } from '../../../api'; +import '../index.scss'; + +// 专区简介，文字在左，图在右 +// statistics: 是否展示统计区域 +function Introduction({data, statistics=true}) { + const {id, firstTitle, introductionContent, introductionImage} = data || {}; + const label = { + communityUserCount: "社区用户", + cmsDocVisits: "文章访问数", + projectCount: "代码仓库", + resourceCount: "社区资源", + cmsDocCount: "社区新闻", + specialProjectCount: "重大项目", + } + const [data1, setData1] = useState({}); + + useEffect(()=>{ + id && getZoneStatistics(id).then(res=>{ + setData1(res.data && res.data.data) + }) + }, [id]) + + return
+
+
+ {firstTitle} + ABOUT US +
+
+ {introductionImage && } + {introductionContent && } +
+ {statistics &&
+ {Object.keys(label).map(item=>{ + return
+ {data1[item]}
+ {label[item]} +
+ })} +
} +
+
+} +export default Introduction; \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/component/news.jsx b/src/forge/Information/Pages/homepage/component/news.jsx new file mode 100644 index 000000000..2fa28ee6b --- /dev/null +++ b/src/forge/Information/Pages/homepage/component/news.jsx @@ -0,0 +1,173 @@ +import React , { useEffect, useState } from 'react'; +import { Link } from 'react-router-dom'; +import { getDirListById, getSubDocList } from '../../../api'; +import { Badge, Col, Icon, Row } from 'antd'; +import dirpng from '../image/new3.png' +import new4 from '../image/new4.png'; +import new5 from '../image/new5.png'; +import new6 from '../image/new6.png'; +import new7 from '../image/new7.png'; +import new8 from '../image/new8.png'; +import new9 from '../image/new9.png'; +import new10 from '../image/new10.png'; +import new11 from '../image/new11.png'; +import new12 from '../image/new12.png'; +import new13 from '../image/new13.png'; +import '../index.scss'; +import Nodata from '../../../../Nodata'; + +function News({data, subTitle, firstDirIntro, secondDirIntro}) { + const {firstTitle, key, homepageCmsTitle, id} = data || {}; + const logoByName = { + "智慧城市OS": new4, + "智慧交通OS": new5, + "智慧建设OS": new6, + "机器人OS": new7, + "智能家居OS": new8, + "桌面OS": new9, + "服务器OS": new10, + "移动智能终端OS": new11, + "嵌入式及物联网OS": new12, + "云OS": new13 + } + const [dirList, setDirList] = useState([]); + const firstDir = dirList[0]; + const secondDir = dirList[1]; + const dirs = dirList.slice(2) + + // const rows = Math.ceil(dirs.length / 6); + const [docListByFirstDir, setDocListByFirstDir] = useState([]); + const [docListBySecondDir, setDocListBySecondDir] = useState([]); + const [docListByDir, setDocListByDir] = useState([]); + const [activeDirId, setActiveDirId] = useState(undefined); + const [total, setTotal] = useState(0); + + useEffect(()=>{ + id && getDirListById(id).then(res=>{ + if(res){ + const rows = res.data.rows + setDirList(rows); + // 获取第一个栏目的第一条文章 + rows[0] && getDocById(rows[0].id, 1, (data)=>{ + setDocListByFirstDir(data) + }) + // 获取第2个栏目的第一条文章 + rows[1] && getDocById(rows[1].id, 8, (data)=>{ + setDocListBySecondDir(data) + }) + rows[2] && setActiveDirId(rows[2].id) + } + }) + }, [id]) + + useEffect(()=>{ + activeDirId && getDocById(activeDirId, 4, (data)=>{ + setDocListByDir(data) + }, (data)=>{setTotal(data)}) + }, [activeDirId]) + + // 根据招聘专栏的id获取其栏目下的招聘文章 + function getDocById(dirId, pageSize=10, setData, setTotal1){ + getSubDocList(dirId,{pageSize:pageSize,pageNum:1,auditStatus:1}).then(result=>{ + if(result && result.data.rows){ + let rows = result.data.rows; + setData(rows); + setTotal1 && setTotal1(result.data.total) + } + }) + } + + const renderItems = () => { + const itemsPerRow = 6; + let rendered = []; + let currentRow = []; + + dirs.forEach((item, index) => { + + // 添加项目到当前行 + currentRow.push( +
{setActiveDirId(item.id)}}> + +

{item.name}

+
+ ); + + // 如果达到每行项目数或是最后一个项目 + if ((index + 1) % itemsPerRow === 0 || index === dirs.length - 1) { + // 将当前行添加到渲染列表 + rendered = rendered.concat(currentRow); + + if (currentRow.some(item => item.key === activeDirId?.toString())) { + rendered.push( +
+
+ {docListByDir.map(item=>{ + return
+ + + {item.name} + +

{item.summary}

+
+ })} + {!docListByDir.length &&
暂无数据~
} +
+ {total > 4 &&
{window.scrollTo(0,450)}} className="color-blue font-15">查看更多
} +
+ ); + } + // 重置当前行 + currentRow = []; + } + }); + return rendered; + }; + + return
+
+

{homepageCmsTitle}

+

{subTitle}

+
+ {/* 第一个顺序栏目 */} + {firstDir &&
+

+ {firstDir.name} + 更多 +

+
{firstDirIntro}
+ {docListByFirstDir[0] &&
+ + {docListByFirstDir[0].name} +
} +
} + {/* 第二个顺序栏目 */} + {secondDir &&
+
+
+ +
+
+

{secondDir.name}

+

{secondDirIntro}

+
+
+ + {docListBySecondDir.map(item=>{ + return + + + {item.name} + + + })} + {docListBySecondDir && !docListBySecondDir.length &&
} + +
} +
+
+ {renderItems()} +
+
+
+} +export default News; \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/component/partner.jsx b/src/forge/Information/Pages/homepage/component/partner.jsx new file mode 100644 index 000000000..cb567561d --- /dev/null +++ b/src/forge/Information/Pages/homepage/component/partner.jsx @@ -0,0 +1,52 @@ +import React , { useEffect, useState } from 'react'; +import { getPartnerList } from '../../../api'; +import '../index.scss'; + +function Partner({data}) { + const {id, key, homepagePartnersTitle} = data || {}; + const [ list , setList ] = useState([]); + + useEffect(()=>{ + id && getPartnerList(id).then(response=>{ + if(response && response.data){ + const rows = response.data.rows; + setList(rows[0] && rows[0].zonePartnersList); + } + }).catch(error=>{}) + },[id]) + + const rows = Math.ceil(list.length / 11); // 每两行为一个周期，共11个格子 + + const gridItems = []; + + const item = (item, index) => ( +
{item.link && window.open(item.link)}}> + +
+ ) + + // 将items数组分成每两行为一个周期的数组 + for (let i = 0; i < rows; i++) { + const rowItems = list.slice(i * 11, i * 11 + 11); + + gridItems.push( +
+ {rowItems.slice(0, 6).map(item)} +
+ ); + + gridItems.push( +
+ {rowItems.slice(6, 11).map(item)} +
+ ); + } + + return
+
+

{homepagePartnersTitle}

+
{gridItems}
+
+
+} +export default Partner; \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/component/project.jsx b/src/forge/Information/Pages/homepage/component/project.jsx new file mode 100644 index 000000000..5ce2c275e --- /dev/null +++ b/src/forge/Information/Pages/homepage/component/project.jsx @@ -0,0 +1,117 @@ +import React, { useEffect, useState } from 'react'; +import '../index.scss'; +import { getProjectListByScore, getProjectsTypeLists } from '../../../api'; +import { Carousel, Divider, Spin } from 'antd'; +import Nodata from '../../../../Nodata'; + +function Project({ data, subTitle }) { + const { id, homepageProjectTitle } = data || {}; + const [typeList, setTypeList] = useState([]); + const [typeId, setTypeId] = useState(undefined); + const [lists, setLists] = useState([]); + const [loading, setLoading] = useState(false); + const [page, setPage] = useState(1); + const [total, setTotal] = useState(0); + const pages = []; + + useEffect(() => { + id && getProjectsTypeLists(id).then(result => { + if (result) { + const rows = result.data.rows; + rows[0] && setTypeId(rows[0].id) + setTypeList(rows); + } + }).catch(() => { }) + }, [id]) + + useEffect(() => { + if (typeId) { + setLoading(true); + getProjectListByScore(id, { + pageNum: page, + pageSize: 6, + projectTypeId: typeId + }).then(result => { + if (result) { + setLists(result.data.rows); + setTotal(result.data.total); + setLoading(false); + } + }).catch(() => { }) + } + }, [id, typeId, page]) + + const listPerPage = 6; + for (let i = 0; i < Math.ceil(total / listPerPage); i++) { + const start = i * listPerPage; + const end = start + listPerPage; + pages.push(lists.slice(start, end)); + } + + return
+
+

{homepageProjectTitle}

+

{subTitle}

+
+ {typeList.slice(0, 3).map((item, index) => { + return
{ setTypeId(item.id); setPage(1) }}> + + {item.name} +
+ })} +
+ + {setLoading(true);setPage(current+1)}}> + {pages.map((page1, index) => ( +
+
+ {lists.map((i, index) => { + const { extra: { commitCount, contributorsCount, lastWeekScore, scoreChange } } = i || {} + const order = page >= 2 ? (page-1)*6+index+1 : index+1; + return
+ window.open(i.projectURL)}> + {order} + {i.projectProperties && i.projectProperties.name} + +
+ {i.projectProperties.description || "暂无描述"} +
+
+ { + i.projectProperties && i.projectProperties.topics && +
    + { + i.projectProperties.topics.split(",").map(t => { + return ( +
  • {t}
    • + ) + }) + } +
+ } +
+

+

+ 开发者{contributorsCount || 0} + + 历史提交总量{commitCount || 0} + + 活跃度{lastWeekScore || 0} +
+ {!!scoreChange && + 较上周 + 0 ? 'color-red' : "color-green"}>{scoreChange > 0 ? `+${scoreChange}` : scoreChange} + } +

+
+ })} +
+
+ ))} + + {!loading && lists.length === 0 && } + +
+
+} +export default Project; \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/component/source.jsx b/src/forge/Information/Pages/homepage/component/source.jsx new file mode 100644 index 000000000..c9b267949 --- /dev/null +++ b/src/forge/Information/Pages/homepage/component/source.jsx @@ -0,0 +1,89 @@ +import React , { useEffect, useState } from 'react'; +import { getSourceList, getSourceZoneList } from '../../../api'; +import png from '../image/source2.png' +import { Spin } from 'antd'; +import { Link } from 'react-router-dom'; +import Nodata from '../../../../Nodata'; +import '../index.scss'; + +function Source({data, subTitle}) { + const {id, key, homepageResourceTitle="资源发布"} = data || {}; + const [ chooseZoneId , setChooseZoneId ] = useState(undefined); + const [ zoneList , setZoneList ] = useState([]); + const [ sourceList , setSourceList ] = useState([]); + const [ total , setTotal ] = useState(0); + const [ isSpin , setIsSpin ] = useState(true); + + useEffect(()=>{ + id && getSourceZoneList(id).then(response=>{ + if(response && response.data){ + const rows = response.data.rows; + rows[0] && setChooseZoneId(rows[0].id) + setZoneList(rows); + } + }).catch(error=>{}) + },[id]) + + useEffect(()=>{ + if(chooseZoneId){ + setIsSpin(true); + getSourceList({ + id,pageSize:4,pageNum:1,domainId:chooseZoneId + }).then(response=>{ + if(response){ + setSourceList(response.data.rows); + setTotal(response.data.total); + setIsSpin(false); + } + }).catch(error=>{}) + } + },[chooseZoneId]) + + return
+
+
+

{homepageResourceTitle}

+

{subTitle}

+

前往资源中心 {'>'}

+ {zoneList.slice(0,2).map(item=>{ + return
{setChooseZoneId(item.id);}}> + {item.name} + + +
+ })} +
+
+ +
+ {sourceList.map(i=>{ + const time = i.updateTime || i.createTime + return
+
+
+

{i.name}

+

{i.summary}

+
+ +
+
+ {time && time.split(" ")[0].replace(/-/g, '.')} + + + + 下载 + +
+ +
+ })} +
+
+ {!isSpin && !sourceList.length && } +
+ +
+
+
+} +export default Source; \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/component/specialProjects.jsx b/src/forge/Information/Pages/homepage/component/specialProjects.jsx new file mode 100644 index 000000000..3947f4132 --- /dev/null +++ b/src/forge/Information/Pages/homepage/component/specialProjects.jsx @@ -0,0 +1,193 @@ +import React , { useEffect, useState } from 'react'; +import { getSpecialProjectDetail, getSpecialProjectList, getSpecialProjectTypeList } from '../../../api'; +import { Col, Divider, Row, Tag } from 'antd'; +import Nodata from '../../../../Nodata'; +import '../index.scss'; + +function SpecialProjects({data, subTitle}) { + const {key, homepageSpecialProjectTitle, id} = data || {}; + const [typeList, setTypeList] = useState([]); + const [typeId , setTypeId] = useState(undefined); + const [projectList, setProjectList] = useState([]); + const [selectedItem, setSelectedItem] = useState(null); + const [projectDetail, setProjectDetail] = useState({}); + + useEffect(()=>{ + id && getSpecialProjectTypeList(id, { + pageNum: 1, + pageSize: 4, + }).then(res=>{ + if(res){ + const rows = res.data.rows; + rows[0] && setTypeId(rows[0].id) + setTypeList(rows); + } + }) + }, [id]) + + useEffect(()=>{ + typeId && getSpecialProjectList(id, typeId).then(res=>{ + if(res){ + const rows = res.data.rows; + // rows[0] && setTypeId(rows[0].id) + setProjectList(rows); + } + }) + }, [typeId]) + + useEffect(()=>{ + selectedItem && getSpecialProjectDetail(selectedItem).then(res=>{ + if(res){ + const rows = res.data.rows; + // 根据类型分类 + const rowsByType = rows.reduce((acc, item) => { + // 如果acc中没有当前item.type的数组，则创建一个 + if (!acc[item.type]) { + acc[item.type] = []; + } + // 将当前item添加到对应type的数组中 + acc[item.type].push(item); + return acc; + }, {}); + setProjectDetail({ + detail: projectList.find(item => item.id === selectedItem), + ...rowsByType + }); + } + }) + }, [selectedItem]) + + const itemsPerRow = 3; + + const handleItemClick = (id) => { + setSelectedItem(selectedItem === id ? null : id); + }; + + const list = (title, table1, table2, list)=>{ + return !!list.length && +

{title}

+ + + {table1} + {table2} + {list.map(item=>{ + const {author} = item; + const detail = item.relevancyObject; + const {name, createUser, id} = detail + return + + + {title === "论文" ? : title === "专利" ? : } + {name} + + + {author} + + })} + + {!list.length && } + + } + + const list2 = (title, table1, table2, list)=>{ + return !!list.length && +

{title}

+ + + {table1} + {list.map(item=>{ + const {relevancyObject:{projectURL, projectProperties:{name, authorImageUrl}}} = item; + return + + + + {name} + + + + })} + + {!list.length && } + + } + + const renderItems = () => { + let rendered = []; + let currentRow = []; + + projectList.forEach((item, index) => { + // 添加项目到当前行 + currentRow.push( +
handleItemClick(item.id)} + > + {index+1} +
{item.name}
+
摘要：{item.description}
+

{item.projectLeader}

+
+ ); + + // 如果达到每行项目数或是最后一个项目 + if ((index + 1) % itemsPerRow === 0 || index === projectList.length - 1) { + // 将当前行添加到渲染列表 + rendered = rendered.concat(currentRow); + + // 如果当前行包含选中项，添加详情面板 + if (currentRow.some(item => item.key === selectedItem?.toString())) { + + const {detail, PAPER=[], PATENT=[], PROJECT=[]} = projectDetail; + const {name, projectLeader, awards, description} = detail || {}; + rendered.push( +
+
+
+ 项目{name} +

项目负责人：{projectLeader}

+

奖项：{awards}

+

摘要：{description}

+
+
+ {list("论文", "论文标题", "作者", PAPER)} + {list("专利", "专利标题", "作者", PATENT)} + {list2("开源项目", "项目名称", "参与者", PROJECT)} + {!PAPER.length && !PATENT.length && !PROJECT.length && } +
+
+
+ ); + } + + // 重置当前行 + currentRow = []; + } + }); + return rendered; + }; + + return
+
+

{homepageSpecialProjectTitle}

+

{subTitle}

+
+ {typeList.map((item, index)=>{ + return
{setTypeId(item.id)}}> + + {index < 9 ? `0${index+1}` : index+1} + + + + {item.name} +
+ })} +
+
+ {renderItems()} +
{!projectList.length && }
+
+
+
+} +export default SpecialProjects; \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/component/vip.jsx b/src/forge/Information/Pages/homepage/component/vip.jsx new file mode 100644 index 000000000..f7817d0a3 --- /dev/null +++ b/src/forge/Information/Pages/homepage/component/vip.jsx @@ -0,0 +1,68 @@ +import React , { useEffect, useState } from 'react'; +import { getVIPLists } from '../../../api'; +import { Carousel } from 'antd'; +import '../index.scss'; +import Nodata from '../../../../Nodata'; + +function Member({data, subTitle}) { + const {id, key, homepageMemberTitle} = data || {}; + const [typeList, setTypeList] = useState([]); + const [typeId, setTypeId] = useState(undefined); + const [ vipsMap , setVipsMap ] = useState({}); + const list = vipsMap[typeId] || [] + const pages = []; + + useEffect(()=>{ + id && getVIPLists(id).then(response=>{ + if(response && response.data){ + const rows = response.data.rows; + const vips = {} + const types = rows.map(item=>{ + const {id, typeName, zoneMemberList} = item + vips[id] = zoneMemberList; + return {id, typeName} + }) + types[0] && setTypeId(types[0].id) + setTypeList(types); + setVipsMap(vips); + } + }).catch(error=>{}) + },[id]) + + const listPerPage = 4; + for (let i = 0; i < Math.ceil(list.length / listPerPage); i++) { + const start = i * listPerPage; + const end = start + listPerPage; + pages.push(list.slice(start, end)); + } + + return
+
+

{homepageMemberTitle}

+
+ {typeList.map(item=>{ + return {setTypeId(item.id)}}>{item.typeName} + })} +
+ + {pages.map((page, index) => ( +
+
+ {page.map((item) => ( +
+ +
+

{item.name}

+
{item.introduction || "暂无描述"}
+
+
+ ))} +
+
+ ))} + + {list && !list.length && } +
+
+} +export default Member; \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/image/intro1.png b/src/forge/Information/Pages/homepage/image/intro1.png new file mode 100644 index 000000000..f1897e0be Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/intro1.png differ diff --git a/src/forge/Information/Pages/homepage/image/new1.png b/src/forge/Information/Pages/homepage/image/new1.png new file mode 100644 index 000000000..88ccb3d6d Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new1.png differ diff --git a/src/forge/Information/Pages/homepage/image/new10.png b/src/forge/Information/Pages/homepage/image/new10.png new file mode 100644 index 000000000..cec9a64ee Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new10.png differ diff --git a/src/forge/Information/Pages/homepage/image/new11.png b/src/forge/Information/Pages/homepage/image/new11.png new file mode 100644 index 000000000..330f72fec Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new11.png differ diff --git a/src/forge/Information/Pages/homepage/image/new12.png b/src/forge/Information/Pages/homepage/image/new12.png new file mode 100644 index 000000000..533c2dcc3 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new12.png differ diff --git a/src/forge/Information/Pages/homepage/image/new13.png b/src/forge/Information/Pages/homepage/image/new13.png new file mode 100644 index 000000000..83bfd4720 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new13.png differ diff --git a/src/forge/Information/Pages/homepage/image/new2.png b/src/forge/Information/Pages/homepage/image/new2.png new file mode 100644 index 000000000..0ea512bfd Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new2.png differ diff --git a/src/forge/Information/Pages/homepage/image/new3.png b/src/forge/Information/Pages/homepage/image/new3.png new file mode 100644 index 000000000..4ed308f97 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new3.png differ diff --git a/src/forge/Information/Pages/homepage/image/new4.png b/src/forge/Information/Pages/homepage/image/new4.png new file mode 100644 index 000000000..af8e15d5a Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new4.png differ diff --git a/src/forge/Information/Pages/homepage/image/new5.png b/src/forge/Information/Pages/homepage/image/new5.png new file mode 100644 index 000000000..ae2dfd477 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new5.png differ diff --git a/src/forge/Information/Pages/homepage/image/new6.png b/src/forge/Information/Pages/homepage/image/new6.png new file mode 100644 index 000000000..bf4b15f31 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new6.png differ diff --git a/src/forge/Information/Pages/homepage/image/new7.png b/src/forge/Information/Pages/homepage/image/new7.png new file mode 100644 index 000000000..4cd63ca4e Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new7.png differ diff --git a/src/forge/Information/Pages/homepage/image/new8.png b/src/forge/Information/Pages/homepage/image/new8.png new file mode 100644 index 000000000..cbd602aff Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new8.png differ diff --git a/src/forge/Information/Pages/homepage/image/new9.png b/src/forge/Information/Pages/homepage/image/new9.png new file mode 100644 index 000000000..296f3fda9 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/new9.png differ diff --git a/src/forge/Information/Pages/homepage/image/proType1.png b/src/forge/Information/Pages/homepage/image/proType1.png new file mode 100644 index 000000000..63598890c Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/proType1.png differ diff --git a/src/forge/Information/Pages/homepage/image/proType1_active.png b/src/forge/Information/Pages/homepage/image/proType1_active.png new file mode 100644 index 000000000..1380771df Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/proType1_active.png differ diff --git a/src/forge/Information/Pages/homepage/image/proType2.png b/src/forge/Information/Pages/homepage/image/proType2.png new file mode 100644 index 000000000..0c7ffe390 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/proType2.png differ diff --git a/src/forge/Information/Pages/homepage/image/proType2_active.png b/src/forge/Information/Pages/homepage/image/proType2_active.png new file mode 100644 index 000000000..e3d7c9116 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/proType2_active.png differ diff --git a/src/forge/Information/Pages/homepage/image/proType3.png b/src/forge/Information/Pages/homepage/image/proType3.png new file mode 100644 index 000000000..2dfafbc3e Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/proType3.png differ diff --git a/src/forge/Information/Pages/homepage/image/proType3_active.png b/src/forge/Information/Pages/homepage/image/proType3_active.png new file mode 100644 index 000000000..aae5ab636 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/proType3_active.png differ diff --git a/src/forge/Information/Pages/homepage/image/proTypeBack.png b/src/forge/Information/Pages/homepage/image/proTypeBack.png new file mode 100644 index 000000000..d34aeeeea Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/proTypeBack.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project.png b/src/forge/Information/Pages/homepage/image/s_project.png new file mode 100644 index 000000000..47f6e7336 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project1.png b/src/forge/Information/Pages/homepage/image/s_project1.png new file mode 100644 index 000000000..363d9f765 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project1.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project2.png b/src/forge/Information/Pages/homepage/image/s_project2.png new file mode 100644 index 000000000..40770bc71 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project2.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project3.png b/src/forge/Information/Pages/homepage/image/s_project3.png new file mode 100644 index 000000000..02d6669af Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project3.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project4.png b/src/forge/Information/Pages/homepage/image/s_project4.png new file mode 100644 index 000000000..a0dfe08ac Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project4.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project5.png b/src/forge/Information/Pages/homepage/image/s_project5.png new file mode 100644 index 000000000..8697d4709 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project5.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project6.png b/src/forge/Information/Pages/homepage/image/s_project6.png new file mode 100644 index 000000000..f409c0516 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project6.png differ diff --git a/src/forge/Information/Pages/homepage/image/s_project7.png b/src/forge/Information/Pages/homepage/image/s_project7.png new file mode 100644 index 000000000..f3d6b209f Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/s_project7.png differ diff --git a/src/forge/Information/Pages/homepage/image/source1.png b/src/forge/Information/Pages/homepage/image/source1.png new file mode 100644 index 000000000..59f079c8a Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/source1.png differ diff --git a/src/forge/Information/Pages/homepage/image/source2.png b/src/forge/Information/Pages/homepage/image/source2.png new file mode 100644 index 000000000..5b0c5299e Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/source2.png differ diff --git a/src/forge/Information/Pages/homepage/image/source3.png b/src/forge/Information/Pages/homepage/image/source3.png new file mode 100644 index 000000000..c2c84a45a Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/source3.png differ diff --git a/src/forge/Information/Pages/homepage/image/source4.png b/src/forge/Information/Pages/homepage/image/source4.png new file mode 100644 index 000000000..59d5397d3 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/source4.png differ diff --git a/src/forge/Information/Pages/homepage/image/source5.png b/src/forge/Information/Pages/homepage/image/source5.png new file mode 100644 index 000000000..83a7be7f0 Binary files /dev/null and b/src/forge/Information/Pages/homepage/image/source5.png differ diff --git a/src/forge/Information/Pages/homepage/index.scss b/src/forge/Information/Pages/homepage/index.scss new file mode 100644 index 000000000..db0855268 --- /dev/null +++ b/src/forge/Information/Pages/homepage/index.scss @@ -0,0 +1,462 @@ +.width1200{ + width: 1200px; + margin:0px auto; +} +.align{ + text-align: center; + justify-content: center; +} +.wrap{ + flex-wrap: wrap; +} +.between{ + justify-content: space-between +} +.color-theme{ + color: $primary-color; +} +.color212{ + color: #212F54; +} +.color627{ + color: #62729D; +} +.color6B7{ + color: #6B707C; +} +.color777{ + color: #777E99 +} +.color848{ + color: #848992; +} +.backWhite{ + background-color: white; +} +.pointer{ + cursor: pointer; +} +.zone_1_carousel{ + .slick-dots li button:before{ + font-size: 12px; + } + .slick-dots li.slick-active button:before, .slick-dots li button:before{ + color: $primary-color; + opacity: 1; + } + .slick-dots li button{ + background: none !important; + } +} +.introduction_1_bg{ + background-image: url('./image/intro1.png'); + background-size: 100% 100%; +} +.introduction_1{ + .firstTitle{ + position: relative; + z-index: 1; + .firstTitle_back{ + position: absolute; + top: 90%; + left: 50%; + transform: translate(-50%, -50%); + z-index: -1; + color: #D9D9D9; + } + } +} +.news_1_bg{ + background-image: url('./image/new1.png'); + background-size: 100% 100%; + .firstDir{ + background-image: url('./image/new2.png'); + background-size: 100% 100%; + color: white; + width: 476px; + position: relative; + &>p{ + padding: 10px 20px; + background: linear-gradient( 101deg, rgba(255,255,255,0.21) 0%, rgba(255,255,255,0) 100%); + } + .docByFirstDir{ + background: linear-gradient( 180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0.36) 49%, rgba(0,0,0,0.6) 100%); + position: absolute; + bottom: 0; + width: 100%; + } + } + .secondDir{ + border-top: 8px solid $primary-color; + .img-box{ + width: 40px; + height: 40px; + border-radius: 50%; + background: #FFFFFF; + img{ + width: 80%; + margin: 4px; + } + } + } + .docBySecondDir{ + background: #FFFFFF; + min-height: 230px; + .none_panels{ + min-height: 205px; + } + } + .docDetailByNews_1{ + width: 48%; + background-color: #F8F8F8; + padding: 20px 30px; + &:hover{ + background-color: #F1F4FF; + } + } + .n_1_dir{ + width: 195px; + } +} + +.news_1_bg .activeDir, .vip_1_bg .v_type.active{ + position: relative; + &::after { + content: ''; + position: absolute; + background-color: $primary-color; + width: 30%; + height: 4px; + bottom: -8px; + left: 50%; + transform: translate(-50%, -50%); + border-radius: 3px; + } +} +.project_1_bg{ + .proDetailByProject_1{ + flex: 0 0 48%; + border-radius: 6px; + &:hover{ + box-shadow: 0px 0px 10px 1px rgba(28,48,175,0.41); + } + &>a{ + color: #181818; + &:hover{ + color: $primary-color; + } + } + .pd_desc{ + min-height: 55px; + color: #6B707C; + } + .pd_tag{ + display: flex; + align-items: center; + li{ + height:24px; + line-height:24px; + background-color:var(--tag-back); + border-radius:2px; + margin-right: 12px; + color: var(--primary-color); + font-size:13px; + padding:0px 7px; + } + } + } + .p_1_order{ + display: inline-block; + width: 36px; + height: 25px; + line-height: 25px; + border-radius: 5px; + background-color: #485BA7; + font-family: "YouSheBiaoTiHei"; + color: white; + } + .p_1_order1{ + background: linear-gradient( 94deg, #FF0000 0%, #FF6B00 100%); + } + .p_1_order2{ + background: linear-gradient( 94deg, #FF8000 0%, #FF9244 100%); + } + .p_1_order3{ + background: linear-gradient( 94deg, #FFB300 0%, #FFC400 100%); + } +} +.project_1_bg .proTypeBox, .specialProjects_1_bg .proTypeBox{ + width: 280px; + height: 63px; + background: #F5F6F7; + border-radius: 8px; + border: 1px solid #8DA8D7; + color: #212F54; + justify-content: center; + &.active{ + background-image: url('./image/proTypeBack.png'); + background-size: 100% 100%; + border: none; + color: white; + .icon0{ + background-image: url('./image/proType1_active.png'); + } + .icon1{ + background-image: url('./image/proType2_active.png'); + } + .icon2{ + background-image: url('./image/proType3_active.png'); + } + .s_p_order_1, .s_p_order>img{ + display: none; + } + .s_p_order_icon{ + margin-top: 18px; + display: inline-block; + background-image: url('./image/s_project4.png'); + } + .s_p_order_icon1{ + background-image: url('./image/s_project5.png'); + } + .s_p_order_icon2{ + background-image: url('./image/s_project6.png'); + } + .s_p_order_icon3{ + background-image: url('./image/s_project7.png'); + } + } + .icon1, .s_p_order_icon, .icon0, .icon2{ + width: 22px; + height: 22px; + background-size: 100% 100%; + } + .icon0{ + width: 19px; + height: 18px; + background-image: url('./image/proType1.png'); + } + .icon1{ + background-image: url('./image/proType2.png'); + } + .icon2{ + width: 25px; + height: 19px; + background-image: url('./image/proType3.png'); + } + +} +.source_1_bg{ + background-color: white; + background-image: url('./image/source1.png'); + background-size: 100% 100%; + .s_1_zone{ + width: 80%; + padding: 5px 40px 5px 30px; + background: #F4F5F8; + box-shadow: 0px 0px 6px 1px #F0F0F0; + border-radius: 6px; + border: 2px solid #FFFFFF; + position: relative; + .active_1{ + display: none; + } + &.active{ + &::before{ + content: ""; + position: absolute; + left: 0; + width: 6px; + height: 32px; + background-color: #0052D9; + border-radius: 3px; + } + .active_1{ + display: block; + position: absolute; + top: 0; + right: 0; + } + } + } + .s_1_souce{ + padding: 10px 25px 20px 25px; + width: 325px; + background: #FCFCFC; + border-radius: 6px 6px 6px 6px; + border: 1px solid #E9E9E9; + &:hover{ + background: linear-gradient( 94deg, #2A4AD0 0%, #2B76D8 100%); + box-shadow: 0px 0px 10px 1px rgba(28,48,175,0.08); + a, p, div, span{ + color: white !important; + } + .hoverImg{ + display: inline-block; + } + } + .hoverImg, &:hover .normalImg{ + display: none; + } + } +} +.partner_1_bg{ + background: #F2F4F8; + .partner_1_logo{ + width: 170px; + height: 70px; + background: #FFFFFF; + box-shadow: 0px 0px 15px 1px rgba(28,48,175,0.08); + border-radius: 8px 8px 8px 8px; + &>img{ + max-width: 90%; + max-height: 100%; + } + } + .logoList{ + display: flex; + gap: 30px; + justify-items: center; + justify-content: center; + } +} +.vip_1_bg{ + .v_type{ + color: #212F54; + &.active{ + color: $primary-color; + } + &.active::after{ + width: 75%; + height: 2px; + bottom: -4px; + } + } + .intro_v_1{ + background-color: #F5F7FA; + padding: 15px; + min-height: 90px; + } + .image_v_1{ + width: 180px; + height: 150px; + object-fit: scale-down; + } +} +.specialProjects_1_bg{ + background-image: url('./image/s_project.png'); + background-size: 100% 100%; + .s_p_detail+div:not(.item-details){ + flex: 0 0 calc(33.333% - 20px); + margin: 0 0 35px 0 !important; + } + .s_p_detail{ + flex: 0 0 calc(33.333% - 20px); + background: #FFFFFF; + box-shadow: 0px 0px 10px 1px rgba(28,48,175,0.08); + border-radius: 7px 7px 7px 7px; + position: relative; + padding: 35px; + margin-bottom: 35px; + cursor: pointer; + transition: all 0.3s ease; + .s_p_d_order{ + width: 36px; + height: 30px; + line-height: 30px; + position: absolute; + top: 0; + left: 0; + border-radius: 6px 0px 6px 0px; + background: linear-gradient( 159deg, #F0F3FF 0%, #E0E6FF 100%); + font-family: YouSheBiaoTiHei; + color: #354790; + } + .s_p_d_order1{ + color: #D97F07; + background: linear-gradient( 159deg, #FFEDCA 0%, #FFD791 100%); + } + .s_p_d_order2{ + color: #566F90; + background: linear-gradient( 159deg, #D9E1EB 0%, #B5C9DE 100%); + } + .s_p_d_order3{ + color: #C95E23; + background: linear-gradient( 159deg, #F9D4B1 0%, #EAA562 100%); + } + &:focus-visible{ + outline: none; + } + &:hover{ + border: 1px solid $primary-color; + } + &.active{ + border: 1px solid $primary-color; + position: relative; + &::after,&::before { + content: ''; + position: absolute; + left: 50%; + transform: translateX(-50%); + border-style: solid; + border-width: 20px; + } + + &::after { + border-color: #fff transparent transparent transparent; + z-index: 2; + bottom: -39px; + } + + &::before { + border-color: $primary-color transparent transparent transparent; + z-index: 1; + bottom: -40px; + } + } + } + .item-details { + flex: 0 0 100%; + margin: 0 0 30px; + overflow: hidden; + background: #FFFFFF; + box-shadow: 0px 0px 10px 1px rgba(88,116,255,0.18); + border-radius: 4px; + } + .leftBox{ + position: relative; + padding-left: 16px; + &::after{ + content: ''; + position: absolute; + left: 0; + top: 8px; + width: 5px; + height: 16px; + background: #4154F1; + border-radius: 1px; + } + } + .s_p_head{ + padding: 22px 33px; + background-color: #F8FAFF; + } + .s_p_rowList{ + .s_p_rowList_t{ + padding: 15px 35px; + background: rgba(65,84,241,0.04); + } + &>.ant-col{ + padding: 15px 35px; + border-bottom: 1px solid #E2E4F3; + } + } + .s_p_order{ + position: relative; + font-family: YouSheBiaoTiHei; + &>img{ + position: absolute; + bottom: 10px; + right: -8px; + } + } +} \ No newline at end of file diff --git a/src/forge/Information/Pages/homepage/uos.jsx b/src/forge/Information/Pages/homepage/uos.jsx new file mode 100644 index 000000000..a83dc33cc --- /dev/null +++ b/src/forge/Information/Pages/homepage/uos.jsx @@ -0,0 +1,27 @@ +import React,{ } from 'react'; +import Introduction from './component/introduction'; +import News from './component/news'; +import Project from './component/project'; +import Source from './component/source'; +import Member from './component/vip'; +import Partner from './component/partner'; +import SpecialProjects from './component/specialProjects'; +import '../../indexZone1.scss' +import './index.scss' + +function HeaderPageUos(props){ + const { data } = props; + + return( +
+ + + + + + + +
+ ) +} +export default HeaderPageUos; \ No newline at end of file diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js index 097017d93..63d577eb9 100644 --- a/src/forge/Information/api.js +++ b/src/forge/Information/api.js @@ -61,7 +61,7 @@ export function getDocList(id){ }) } - +// 获取文章列表 export function getSubDocList(id,params){ return fetch({ url:`/cms/doc/open/dir/${id}/docList`, @@ -69,6 +69,14 @@ export function getSubDocList(id,params){ params }) } +// 获取文章列表（带内容） +export function getDocAndContentList(id,params){ + return fetch({ + url:`/cms/doc/open/dir/${id}/docContentList`, + method: 'get', + params + }) +} // 专区会员 export function getVIPAllList(id){ return fetch({ @@ -338,14 +346,46 @@ export function getDataSetdetail(datasetId,params) { }) } +export function getSpecialProjectTypeList(id,params) { + return fetch({ + url: `/zone/open/${id}/specialProjectType/list`, + method: 'GET', + params + }) +} +export function getSpecialProjectList(id, specialProjectTypeId,params) { + return fetch({ + url: `/zone/open/${id}/specialProjectType/${specialProjectTypeId}/specialProjectList`, + method: 'GET', + params + }) +} +export function getSpecialProjectDetail(specialProjectId,params) { + return fetch({ + url: `/zone/open/specialProject/${specialProjectId}/specialProjectRelevancyList`, + method: 'GET', + params + }) +} +// 专区统计数据 +export function getZoneStatistics(id) { + return fetch({ + url: `/zone/open/${id}/statistics`, + method: 'GET', + }) +} - - - - +// 专区项目列表（带活跃度） +export function getProjectListByScore(id,params) { + return fetch({ + url: `/zone/open/${id}/projectByScore/list`, + method: 'GET', + params + }) +} // 获取已开通企业的组织列表 export function getOrzCompanyList(){ @@ -386,4 +426,4 @@ export function getRoleList(){ method: 'get', }) } - \ No newline at end of file + diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index 0e9122d09..9dadf8f5e 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -90,6 +90,11 @@ const HomePageByJCC = Loadable({ loader : () => import("./Pages/JCC/homePage"), loading : Loading, }); + +const HomePageByUos = Loadable({ + loader : () => import("./Pages/homepage/uos"), + loading : Loading, +}); const DatasetFileList = Loadable({ loader : () => import("./Pages/dataset/fileList"), loading : Loading, @@ -110,6 +115,9 @@ function Index(props){ const sourcedetail = pathname.indexOf(`/zone/${deptId}/newdetail/`)>-1 && isPhone(); const {current_user} = props; + console.log('deptId', deptId); + + useEffect(()=>{ if(deptId && deptId === "KYDS7th"){ window.location.href = 'https://gitlink.org.cn/competitions/2024'; @@ -283,6 +291,7 @@ function Index(props){ render={(p) => ( deptId==="CCF-ODC" ? : deptId === "JCC" ? : + deptId === "uos" ? : temp === tempEnum.zone ? : )} diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index a06100f7a..d0705e466 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -85,7 +85,7 @@ } .sub_t{ margin-top: 35px; - max-width:536px; + max-width:600px; line-height:40px; color:rgba(225,225,225,0.9); font-size:16px;