diff --git a/color.less b/color.less
index 0943d19b7f..d2525172ef 100644
--- a/color.less
+++ b/color.less
@@ -86,13 +86,17 @@ html {--antd-wave-shadow-color: @primary-color;}
.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 .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;}
+.ant-alert-warning {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)`);}
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
.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;}
-.ant-alert-warning {background-color: color(~`colorPalette("@{warning-color}", 1)`);border: 1px solid color(~`colorPalette("@{warning-color}", 3)`);}
+.ant-alert-warning {background-color: color(~`colorPalette("@{modal-header-bg}", 1)`);border: 1px solid color(~`colorPalette("@{warning-color}", 3)`);}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.ant-alert-warning .ant-alert-icon {color: @warning-color;}
.ant-alert-error {background-color: color(~`colorPalette("@{error-color}", 1)`);border: 1px solid color(~`colorPalette("@{error-color}", 3)`);}
.ant-alert-error .ant-alert-icon {color: @error-color;}
@@ -738,12 +742,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.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(78, 70, 148, 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(206, 99, 242, 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(78, 70, 148, 0.2);}
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+.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(206, 99, 242, 0.2);}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.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;}
@@ -763,19 +767,19 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.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(78, 70, 148, 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(206, 99, 242, 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(78, 70, 148, 0.2);}
+.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(206, 99, 242, 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(78, 70, 148, 0.2);}
+.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(206, 99, 242, 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(190, 101, 159, 0.2);}
+.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(108, 188, 143, 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(190, 101, 159, 0.2);}
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+.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(108, 188, 143, 0.2);}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.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;}
@@ -792,16 +796,16 @@ 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-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(190, 101, 159, 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(108, 188, 143, 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(190, 101, 159, 0.2);}
+.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(108, 188, 143, 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(190, 101, 159, 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(190, 101, 159, 0.2);}
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+.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(108, 188, 143, 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(108, 188, 143, 0.2);}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.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;}
@@ -1000,11 +1004,11 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: @error-color;}
.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: #fff1f0;}
=======
-.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{modal-close-color}", 1)`);}
+.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{link-color}", 1)`);}
.ant-menu-item-danger.ant-menu-item-selected {color: @error-color;}
.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: @error-color;}
-.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{modal-close-color}", 1)`);}
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{link-color}", 1)`);}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.ant-menu-inline .ant-menu-item-danger.ant-menu-item::after {border-right-color: @error-color;}
.ant-menu-dark .ant-menu-item-danger.ant-menu-item, .ant-menu-dark .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-dark .ant-menu-item-danger.ant-menu-item > a {color: @error-color;}
.ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {color: #fff;background-color: @error-color;}
@@ -1503,19 +1507,15 @@ tr.ant-table-expanded-row:hover > td {background: #fbfbfb;}
.ant-tag-checkable:active, .ant-tag-checkable-checked {color: #fff;}
.ant-tag-checkable-checked {background-color: @primary-color;}
.ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);}
-<<<<<<< HEAD
.ant-tag-pink {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
+<<<<<<< HEAD
.ant-tag-red {color: #f5222d;background: #fff1f0;border-color: #ffa39e;}
=======
-.ant-tag-pink {color: #eb2f96;background: color(~`colorPalette("@{layout-body-background}", 1)`);border-color: #ffadd2;}
-.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
-.ant-tag-magenta {color: #eb2f96;background: color(~`colorPalette("@{layout-body-background}", 1)`);border-color: #ffadd2;}
-.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
-.ant-tag-red {color: #f5222d;background: color(~`colorPalette("@{modal-close-color}", 1)`);border-color: #ffa39e;}
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+.ant-tag-red {color: #f5222d;background: color(~`colorPalette("@{link-color}", 1)`);border-color: #ffa39e;}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
.ant-tag-volcano {color: #fa541c;background: #fff2e8;border-color: #ffbb96;}
.ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
@@ -1531,23 +1531,27 @@ tr.ant-table-expanded-row:hover > td {background: #fbfbfb;}
.ant-tag-lime-inverse {color: #fff;background: #a0d911;border-color: #a0d911;}
.ant-tag-green {color: #52c41a;background: #f6ffed;border-color: #b7eb8f;}
.ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;}
+<<<<<<< HEAD
.ant-tag-blue {color: #1890ff;background: #e6f7ff;border-color: #91d5ff;}
.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-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;}
.ant-tag-error {color: #f5222d;background: #fff1f0;border-color: #ffa39e;}
=======
+.ant-tag-blue {color: #1890ff;background: color(~`colorPalette("@{modal-heading-color}", 1)`);border-color: #91d5ff;}
+.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;}
.ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;}
.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;}
-.ant-tag-error {color: #f5222d;background: color(~`colorPalette("@{modal-close-color}", 1)`);border-color: #ffa39e;}
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+.ant-tag-processing {color: #1890ff;background: color(~`colorPalette("@{modal-heading-color}", 1)`);border-color: #91d5ff;}
+.ant-tag-error {color: #f5222d;background: color(~`colorPalette("@{link-color}", 1)`);border-color: #ffa39e;}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.ant-tag-warning {color: #fa8c16;background: #fff7e6;border-color: #ffd591;}
.ant-timeline {color: @text-color;}
.ant-timeline-item-tail {border-left: 2px solid #f0f0f0;}
@@ -1747,7 +1751,11 @@ a.ant-typography[disabled], .ant-typography a[disabled] {color: @disabled-color;
.ant-upload-list-picture .ant-upload-list-item-error, .ant-upload-list-picture-card .ant-upload-list-item-error {border-color: @error-color;}
.ant-upload-list-picture .ant-upload-list-item:hover .ant-upload-list-item-info, .ant-upload-list-picture-card .ant-upload-list-item:hover .ant-upload-list-item-info {background: transparent;}
.ant-upload-list-picture .ant-upload-list-item-uploading, .ant-upload-list-picture-card .ant-upload-list-item-uploading {border-style: dashed;}
+<<<<<<< HEAD
.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: color(~`colorPalette("@{error-color}", 1)`);}
+=======
+.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='color(~`colorPalette("@{modal-heading-color}", 1)`)'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='color(~`colorPalette("@{modal-heading-color}", 1)`)'] {fill: color(~`colorPalette("@{error-color}", 1)`);}
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'] {fill: @error-color;}
.ant-upload-list-picture-card .ant-upload-list-item-info::before {background-color: rgba(0, 0, 0, 0.5);}
.ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-eye, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-download, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-delete {color: rgba(255, 255, 255, 0.85);}
diff --git a/index.html b/index.html
index e32a86bdbf..43020496de 100644
--- a/index.html
+++ b/index.html
@@ -20,7 +20,7 @@
>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
/>
@@ -30,7 +30,7 @@
content="(EduCoder)是信息技术类实践教学平台。(EduCoder)涵盖了计算机、大数据、云计算、人工智能、软件工程、物联网等专业课程。超60000个实训案例,建立学、练、评、测一体化实验环境。"
=======
content="“101计划”实践平台是教育部“101计划”的核心课程实践资源共建共享平台,联合高校和产业力量,为计算概论、数据结构、算法设计与分析、离散数学、计算机系统导论、操作系统、计算机组成与系统结构、编译原理、计算机网络、数据库、软件工程、人工智能引论等 12 门核心课程开发配套实践内容与案例,将课程体系、教学内容、实践载体、增效手段融会贯通,构建“教师、学生、教材、课程、平台”五位一体的教育思想、课程建设、课堂提升、课程实践的教育教学新模式,持续推动核心课程、核心实践项目的建设和应用。"
->>>>>>> 5e534d6fb49645613cf22cc451c645d107cc6d52
+>>>>>>> a08b70631197ae152726dfdf2ffc0b47ac01fcab
/>
/,ke.html=Xe(ke.html,"i").replace("comment",ke._comment).replace("tag",ke._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),ke.paragraph=Xe(ke._paragraph).replace("hr",ke.hr).replace("heading"," {0,3}#{1,6} ").replace("|lheading","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)").replace("tag",ke._tag).getRegex(),ke.blockquote=Xe(ke.blockquote).replace("paragraph",ke.paragraph).getRegex(),ke.normal=Ye({},ke),ke.gfm=Ye({},ke.normal,{nptable:"^ *([^|\\n ].*\\|.*)\\n *([-:]+ *\\|[-| :]*)(?:\\n((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)",table:"^ *\\|(.+)\\n *\\|?( *[-:]+[-| :]*)(?:\\n *((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)"}),ke.gfm.nptable=Xe(ke.gfm.nptable).replace("hr",ke.hr).replace("heading"," {0,3}#{1,6} ").replace("blockquote"," {0,3}>").replace("code"," {4}[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)").replace("tag",ke._tag).getRegex(),ke.gfm.table=Xe(ke.gfm.table).replace("hr",ke.hr).replace("heading"," {0,3}#{1,6} ").replace("blockquote"," {0,3}>").replace("code"," {4}[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)").replace("tag",ke._tag).getRegex(),ke.pedantic=Ye({},ke.normal,{html:Xe(`^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?\\1> *(?:\\n{2,}|\\s*$)|"+le+""},ce.br=function(){return this.options.xhtml?"
":"
"},ce.del=function(le){return""+le+""},ce.link=function(le,ue,ye){if(le=at(this.options.sanitize,this.options.baseUrl,le),le===null)return ye;var we='"+ye+"",we},ce.image=function(le,ue,ye){if(le=at(this.options.sanitize,this.options.baseUrl,le),le===null)return ye;var we='":">",we},ce.text=function(le){return le},ne}(),tt=function(){function ne(){}var ce=ne.prototype;return ce.strong=function(le){return le},ce.em=function(le){return le},ce.codespan=function(le){return le},ce.del=function(le){return le},ce.html=function(le){return le},ce.text=function(le){return le},ce.link=function(le,ue,ye){return""+ye},ce.image=function(le,ue,ye){return""+ye},ce.br=function(){return""},ne}(),bt=function(){function ne(){this.seen={}}var ce=ne.prototype;return ce.slug=function(le){var ue=le.toLowerCase().trim().replace(/<[!\/a-z].*?>/ig,"").replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g,"").replace(/\s/g,"-");if(this.seen.hasOwnProperty(ue)){var ye=ue;do this.seen[ye]++,ue=ye+"-"+this.seen[ye];while(this.seen.hasOwnProperty(ue))}return this.seen[ue]=0,ue},ne}(),_t=se.defaults,Lt=pe.unescape,Ot=function(){function ne(me){this.options=me||_t,this.options.renderer=this.options.renderer||new nt,this.renderer=this.options.renderer,this.renderer.options=this.options,this.textRenderer=new tt,this.slugger=new bt}ne.parse=function(le,ue){var ye=new ne(ue);return ye.parse(le)};var ce=ne.prototype;return ce.parse=function(le,ue){ue===void 0&&(ue=!0);var ye="",we,Ne,Ie,lt,Pt,Zt,$t,Kr,Jt,Yt,jn,Qr,Kn,Dn,Br,eo,qu,to,$n=le.length;for(we=0;we<$n;we++){Yt=le[we];switch(Yt.type){case"space":continue;case"hr":{ye+=this.renderer.hr();continue}case"heading":{ye+=this.renderer.heading(this.parseInline(Yt.tokens),Yt.depth,Lt(this.parseInline(Yt.tokens,this.textRenderer)),this.slugger);continue}case"code":{ye+=this.renderer.code(Yt.text,Yt.lang,Yt.escaped);continue}case"table":{for(Kr="",$t="",lt=Yt.header.length,Ne=0;Ne
"+Nt(Ie.message+"",!0)+"";throw Ie}}ge.options=ge.setOptions=function(ne){return xt(ge.defaults,ne),Ht(ge.defaults),ge},ge.getDefaults=mt,ge.defaults=Vt,ge.use=function(ne){var ce=xt({},ne);if(ne.renderer&&function(){var le=ge.defaults.renderer||new nt,ue=function(Ne){var Ie=le[Ne];le[Ne]=function(){for(var lt=arguments.length,Pt=new Array(lt),Zt=0;Zt
An error occurred:
"+Nt(Ie.message+"",!0)+"";throw Ie}}ge.options=ge.setOptions=function(ne){return xt(ge.defaults,ne),Ht(ge.defaults),ge},ge.getDefaults=mt,ge.defaults=Vt,ge.use=function(ne){var ce=xt({},ne);if(ne.renderer&&function(){var le=ge.defaults.renderer||new nt,ue=function(Ne){var Ie=le[Ne];le[Ne]=function(){for(var lt=arguments.length,Pt=new Array(lt),Zt=0;Zt
A
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */var He,ze,re,H=!1,oe,K;window.PR_SHOULD_USE_CONTINUATION=!0;var B,se;(function(){var q=window,X=["break,continue,do,else,for,if,return,while"],V=[X,"auto,case,char,const,default,double,enum,extern,float,goto,inline,int,long,register,restrict,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],L=[V,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],U=[L,"alignas,alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,delegate,dynamic_cast,explicit,export,friend,generic,late_check,mutable,namespace,noexcept,noreturn,nullptr,property,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],W=[L,"abstract,assert,boolean,byte,extends,finally,final,implements,import,instanceof,interface,null,native,package,strictfp,super,synchronized,throws,transient"],M=[L,"abstract,add,alias,as,ascending,async,await,base,bool,by,byte,checked,decimal,delegate,descending,dynamic,event,finally,fixed,foreach,from,get,global,group,implicit,in,interface,internal,into,is,join,let,lock,null,object,out,override,orderby,params,partial,readonly,ref,remove,sbyte,sealed,select,set,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,value,var,virtual,where,yield"],P="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes",I=[L,"abstract,async,await,constructor,debugger,enum,eval,export,function,get,implements,instanceof,interface,let,null,set,undefined,var,with,yield,Infinity,NaN"],C="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",d=[X,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],f=[X,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],p=[X,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],T=[U,M,W,I,C,d,f,p],x=/^(DIR|FILE|array|vector|(de|priority_)?queue|(forward_)?list|stack|(const_)?(reverse_)?iterator|(unordered_)?(multi)?(set|map)|bitset|u?(int|float)\d*)\b/,E="str",k="kwd",w="com",b="typ",m="lit",v="pun",g="pln",R="tag",O="dec",G="src",Z="atn",ee="atv",fe="nocode",pe="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function xe(Se){for(var Fe=0,$e=!1,at=!1,Ke=0,nt=Se.length;Ke