pu428f3pz
/
NewEduCoderBuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
develop_coze
linlu 1 year ago
parent 81dd03156a
commit a035e58ee8
2 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File

43
color.less
Unescape View File

@ -84,11 +84,7 @@ html {--antd-wave-shadow-color: @primary-color;}
.zoom-right-enter, .zoom-right-appear {animation-fill-mode: both;}
.zoom-right-leave {animation-fill-mode: both;}
.ant-alert {color: @text-color;border-radius: 2px;}
<<<<<<< HEAD
.ant-alert-success {background-color: color(~`colorPalette("@{warning-color}", 1)`);border: 1px solid color(~`colorPalette("@{warning-color}", 3)`);}
=======
.ant-alert-success {background-color: color(~`colorPalette("@{success-color}", 1)`);border: 1px solid color(~`colorPalette("@{success-color}", 3)`);}
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
.ant-alert-success .ant-alert-icon {color: @success-color;}
.ant-alert-info {background-color: color(~`colorPalette("@{primary-color}", 1)`);border: 1px solid color(~`colorPalette("@{primary-color}", 3)`);}
.ant-alert-info .ant-alert-icon {color: @primary-color;}
@ -731,38 +727,16 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-form-item-has-success.ant-form-item-has-feedback .ant-form-item-children-icon {color: @success-color;}
.ant-form-item-has-warning .ant-form-item-explain, .ant-form-item-has-warning .ant-form-item-split {color: @warning-color;}
.ant-form-item-has-warning .ant-input, .ant-form-item-has-warning .ant-input-affix-wrapper, .ant-form-item-has-warning .ant-input:hover, .ant-form-item-has-warning .ant-input-affix-wrapper:hover {border-color: @warning-color;}
<<<<<<< HEAD
.ant-form-item-has-warning .ant-input:focus, .ant-form-item-has-warning .ant-input-affix-wrapper:focus, .ant-form-item-has-warning .ant-input-focused, .ant-form-item-has-warning .ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(218, 29, 35, 0.2);}
.ant-form-item-has-warning .ant-input:not(.ant-form-item-has-warning .ant-input-disabled) {background-color: #fff;}
.ant-form-item-has-warning .ant-input-affix-wrapper:not(.ant-form-item-has-warning .ant-input-affix-wrapper-disabled) {background-color: #fff;}
.ant-form-item-has-warning .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
.ant-form-item-has-warning .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(218, 29, 35, 0.2);}
=======
.ant-form-item-has-warning .ant-input:focus, .ant-form-item-has-warning .ant-input-affix-wrapper:focus, .ant-form-item-has-warning .ant-input-focused, .ant-form-item-has-warning .ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(41, 167, 163, 0.2);}
.ant-form-item-has-warning .ant-input:not(.ant-form-item-has-warning .ant-input-disabled) {background-color: #fff;}
.ant-form-item-has-warning .ant-input-affix-wrapper:not(.ant-form-item-has-warning .ant-input-affix-wrapper-disabled) {background-color: #fff;}
.ant-form-item-has-warning .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
.ant-form-item-has-warning .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(41, 167, 163, 0.2);}
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
.ant-form-item-has-warning .ant-input-prefix {color: @warning-color;}
.ant-form-item-has-warning .ant-input-group-addon {color: @warning-color;border-color: @warning-color;}
.ant-form-item-has-warning .has-feedback {color: @warning-color;}
.ant-form-item-has-warning.ant-form-item-has-feedback .ant-form-item-children-icon {color: @warning-color;}
.ant-form-item-has-warning .ant-select:not(.ant-select-borderless) .ant-select-selector {border-color: @warning-color !important;}
<<<<<<< HEAD
.ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(218, 29, 35, 0.2);}
.ant-form-item-has-warning .ant-input-number, .ant-form-item-has-warning .ant-picker {border-color: @warning-color;}
.ant-form-item-has-warning .ant-input-number-focused, .ant-form-item-has-warning .ant-picker-focused, .ant-form-item-has-warning .ant-input-number:focus, .ant-form-item-has-warning .ant-picker:focus {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(218, 29, 35, 0.2);}
.ant-form-item-has-warning .ant-input-number:not([disabled]):hover, .ant-form-item-has-warning .ant-picker:not([disabled]):hover {border-color: @warning-color;}
.ant-form-item-has-warning .ant-cascader-picker:focus .ant-cascader-input {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(218, 29, 35, 0.2);}
.ant-form-item-has-error .ant-form-item-explain, .ant-form-item-has-error .ant-form-item-split {color: @error-color;}
.ant-form-item-has-error .ant-input, .ant-form-item-has-error .ant-input-affix-wrapper, .ant-form-item-has-error .ant-input:hover, .ant-form-item-has-error .ant-input-affix-wrapper:hover {border-color: @error-color;}
.ant-form-item-has-error .ant-input:focus, .ant-form-item-has-error .ant-input-affix-wrapper:focus, .ant-form-item-has-error .ant-input-focused, .ant-form-item-has-error .ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(107, 176, 68, 0.2);}
.ant-form-item-has-error .ant-input:not(.ant-form-item-has-error .ant-input-disabled) {background-color: #fff;}
.ant-form-item-has-error .ant-input-affix-wrapper:not(.ant-form-item-has-error .ant-input-affix-wrapper-disabled) {background-color: #fff;}
.ant-form-item-has-error .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
.ant-form-item-has-error .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(107, 176, 68, 0.2);}
=======
.ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(41, 167, 163, 0.2);}
.ant-form-item-has-warning .ant-input-number, .ant-form-item-has-warning .ant-picker {border-color: @warning-color;}
.ant-form-item-has-warning .ant-input-number-focused, .ant-form-item-has-warning .ant-picker-focused, .ant-form-item-has-warning .ant-input-number:focus, .ant-form-item-has-warning .ant-picker:focus {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(41, 167, 163, 0.2);}
@ -775,23 +749,11 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-form-item-has-error .ant-input-affix-wrapper:not(.ant-form-item-has-error .ant-input-affix-wrapper-disabled) {background-color: #fff;}
.ant-form-item-has-error .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
.ant-form-item-has-error .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(84, 51, 231, 0.2);}
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
.ant-form-item-has-error .ant-input-prefix {color: @error-color;}
.ant-form-item-has-error .ant-input-group-addon {color: @error-color;border-color: @error-color;}
.ant-form-item-has-error .has-feedback {color: @error-color;}
.ant-form-item-has-error.ant-form-item-has-feedback .ant-form-item-children-icon {color: @error-color;}
.ant-form-item-has-error .ant-select:not(.ant-select-borderless) .ant-select-selector {border-color: @error-color !important;}
<<<<<<< HEAD
.ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(107, 176, 68, 0.2);}
.ant-form-item-has-error .ant-input-group-addon .ant-select.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {border: 0;}
.ant-form-item-has-error .ant-select.ant-select-auto-complete .ant-input:focus {border-color: @error-color;}
.ant-form-item-has-error .ant-input-number, .ant-form-item-has-error .ant-picker {border-color: @error-color;}
.ant-form-item-has-error .ant-input-number-focused, .ant-form-item-has-error .ant-picker-focused, .ant-form-item-has-error .ant-input-number:focus, .ant-form-item-has-error .ant-picker:focus {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(107, 176, 68, 0.2);}
.ant-form-item-has-error .ant-input-number:not([disabled]):hover, .ant-form-item-has-error .ant-picker:not([disabled]):hover {border-color: @error-color;}
.ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):hover {border-color: @error-color;}
.ant-form-item-has-error .ant-mention-wrapper.ant-mention-active:not([disabled]) .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):focus {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(107, 176, 68, 0.2);}
.ant-form-item-has-error .ant-cascader-picker:focus .ant-cascader-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(107, 176, 68, 0.2);}
=======
.ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(84, 51, 231, 0.2);}
.ant-form-item-has-error .ant-input-group-addon .ant-select.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {border: 0;}
.ant-form-item-has-error .ant-select.ant-select-auto-complete .ant-input:focus {border-color: @error-color;}
@ -801,7 +763,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):hover {border-color: @error-color;}
.ant-form-item-has-error .ant-mention-wrapper.ant-mention-active:not([disabled]) .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):focus {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(84, 51, 231, 0.2);}
.ant-form-item-has-error .ant-cascader-picker:focus .ant-cascader-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(84, 51, 231, 0.2);}
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
.ant-form-item-has-error .ant-transfer-list {border-color: @error-color;}
.ant-form-item-has-error .ant-transfer-list-search:not([disabled]) {border-color: @border-color-base;}
.ant-form-item-has-error .ant-transfer-list-search:not([disabled]):hover {border-color: color(~`colorPalette("@{primary-color}", 5)`);border-right-width: 1px !important;}
@ -1520,11 +1481,7 @@ tr.ant-table-expanded-row:hover > td {background: #fbfbfb;}
.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
.ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;border-color: #adc6ff;}
.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
<<<<<<< HEAD
.ant-tag-purple {color: #722ed1;background: color(~`colorPalette("@{border-color-base}", 1)`);border-color: #d3adf7;}
=======
.ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;}
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
.ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}
.ant-tag-success {color: #52c41a;background: #f6ffed;border-color: #b7eb8f;}
.ant-tag-processing {color: #1890ff;background: #e6f7ff;border-color: #91d5ff;}

22
index.html
Unescape View File

@ -10,27 +10,16 @@
<meta http-equiv="Cache-Control" content="no-transform" />
<meta name="format-detection" content="telephone=no" />
<meta name="viewport" content="width=1226" />
<<<<<<< HEAD
<title> </title>
<meta
name="keywords"
content=",EduCoder,信息技术实践教学,精品课程网,慕课MOOC"
=======
<title>101计划实践平台</title>
<meta
name="keywords"
content="101计划实践平台,101计划实践平台官网,101计划平台,101计划平台官网,101计划"
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
/>
<meta name="google" content="notranslate" />
<meta http-equiv="Content-language" content="en" />
<meta
name="description"
<<<<<<< HEAD
content="(EduCoder)是信息技术类实践教学平台。(EduCoder)涵盖了计算机、大数据、云计算、人工智能、软件工程、物联网等专业课程。超60000个实训案例，建立学、练、评、测一体化实验环境。"
=======
content="“101计划”实践平台是教育部“101计划”的核心课程实践资源共建共享平台，联合高校和产业力量，为计算概论、数据结构、算法设计与分析、离散数学、计算机系统导论、操作系统、计算机组成与系统结构、编译原理、计算机网络、数据库、软件工程、人工智能引论等 12 门核心课程开发配套实践内容与案例，将课程体系、教学内容、实践载体、增效手段融会贯通，构建“教师、学生、教材、课程、平台”五位一体的教育思想、课程建设、课堂提升、课程实践的教育教学新模式，持续推动核心课程、核心实践项目的建设和应用。"
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
/>
<!--[if IE]>
<script>
@ -96,13 +85,8 @@
window.location.replace("/upgrade-browser.html");
}
</script>
<<<<<<< HEAD
<link rel="stylesheet" href="/react/build/antdesign.b2cd8158.chunk.css" />
<link rel="stylesheet" href="/react/build/umi.6b27a7b3.css" />
=======
<link rel="stylesheet" href="/react/build/antdesign.0efd97c7.chunk.css" />
<link rel="stylesheet" href="/react/build/umi.6517dbef.css" />
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
<script>
window.routerBase = "/";
</script>
@ -163,14 +147,8 @@
gtag('config', 'UA-198293321-1');
</script> -->
<<<<<<< HEAD
<script src="/react/build/antdesign.0cbf8290.async.js"></script>
<script src="/react/build/vendors.db77828e.async.js"></script>
<script src="/react/build/umi.f481fe38.js"></script>
=======
<script src="/react/build/antdesign.e676bb12.async.js"></script>
<script src="/react/build/vendors.40c02c2d.async.js"></script>
<script src="/react/build/umi.4a8dc16a.js"></script>
>>>>>>> 71f752ed667d841cdc637d28a130f6c3c23894d8
</body>
</html>

Write Preview
Loading…
Cancel
Save