修改antd风格，增加全局scss变量

config/webpack.config.prod.js

@@ -208,6 +208,12 @@ module.exports = {
               {
                 loader: require.resolve("sass-loader"),
               },
+              {
+                loader: 'sass-resources-loader',
+                options: {
+                  resources: ['src/global.scss']
+                }
+              }
             ],
           },
           {

src/AppConfig.js

@@ -25,7 +25,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
   window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student'
 }                 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {

src/forge/Component/layout.jsx

@@ -73,8 +73,8 @@ export const Blueline = styled.a`{
   height:30px;
   line-height:28px;
   border-radius:2px;
-  border:1px solid rgba(80,145,255,1);
-  color:rgba(80,145,255,1);
+  border:1px solid #466AFF;
+  color:#466AFF;
   padding:0px 12px;
   display:inline-block;
 }`
@@ -117,7 +117,8 @@ export const Blueback = styled.a`{
   height:30px;
   line-height:30px;
   border-radius:2px;
-  background-color:rgba(80,145,255,1);
+  // background-color:rgba(80,145,255,1);
+  background-color:#466AFF;
   color:#fff!important;
   padding:0px 12px;
   display:inline-block;

src/forge/Head/Header.js

@@ -386,7 +386,7 @@ class NewHeader extends Component {
               }
             </span>
             :
-            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)} visible={true}>
+            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
               <a href={`/${this.props.current_user  && this.props.current_user.login}`}>
                 <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
               </a>

src/forge/Main/Index.scss

@@ -334,6 +334,14 @@
     .listtablebody{
       border-radius:0px 0px 4px 4px ;
       border: 1px solid #D0D0D0;
+      li{
+        a{
+          color: #05101a;
+          &:hover{
+            color:$primary-color;
+          }
+        }
+      }
       li.listtablepath{
         a{color: #40a9ff;}
         p{

src/forge/Merge/CreateMerge.js

@@ -6,7 +6,7 @@ import MergeFooter from './merge_footer';
 import { returnbar , turnbar } from 'educoder';
 import { Base64 } from 'js-base64';
 
-import '../Order/order.css';
+import '../Order/order.scss';
 import './merge.css';
 
 /**

src/forge/Merge/MergeLinkFooter.jsx

@@ -7,7 +7,7 @@ import Commits from './Commits';
 import Comments from '../comments/comments';
 import Files from './Files';
 
-import '../Order/order.css';
+import '../Order/order.scss';
 import './merge.css';
 
 const { TabPane } = Tabs;

src/forge/Merge/MessageCount.js

@@ -16,7 +16,7 @@ import {
 } from "antd";
 import "./merge.css";
 import RenderHtml from "../../components/render-html";
-import "../Order/order.css";
+import "../Order/order.scss";
 import MergeLinkFooter from "./MergeLinkFooter";
 
 const TextArea = Input.TextArea;

src/forge/Merge/NewMerge.js

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { Input, Select , Spin, Alert } from "antd";
 import axios from "axios";
-import "../Order/order.css";
+import "../Order/order.scss";
 import "./merge.css";
 import MergeForm from "./merge_form";
 import MergeFooter from "./merge_footer";

src/forge/Merge/UpdateMerge.js

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { Input, Select, Button, Spin, Empty } from "antd";
 import axios from "axios";
-import "../Order/order.css";
+import "../Order/order.scss";
 import "./merge.css";
 import MergeForm from "./merge_form";
 import MergeFooter from "./merge_footer";

src/forge/Merge/merge.js

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { Input, Dropdown, Menu, Icon, Pagination, Spin } from "antd";
 import "./merge.css";
-import "../Order/order.css";
+import "../Order/order.scss";
 import "../Order/index.scss";
 import NoneData from "./no_data";
 import MergeItem from "./MergeItem";

src/forge/Merge/merge_footer.js

@@ -3,7 +3,7 @@ import { Tabs } from 'antd';
 import Commits from './Commits';
 import Files from './Files';
 
-import '../Order/order.css';
+import '../Order/order.scss';
 import './merge.css';
 
 const { TabPane } = Tabs;

src/forge/Merge/merge_form.js

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { Button, Form, Menu, Input, Select, Tag, Checkbox, Spin } from "antd";
 import axios from "axios";
 
-import "../Order/order.css";
+import "../Order/order.scss";
 import "./merge.css";
 import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
 

src/forge/Order/AmplifyImg.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Modal } from 'antd';
 
-import './order.css';
+import './order.scss';
 function AmplifyImg(props) {
 
   return (

src/forge/Order/Detail.js

@@ -8,7 +8,7 @@ import Attachments from "../Upload/attachment";
 import RenderHtml from "../../components/render-html";
 import Comments from "../comments/comments";
 import Claims from "../claims/claims"
-import "./order.css";
+import "./order.scss";
 
 class Detail extends Component {
   constructor(props) {

src/forge/Order/Milepost.js

@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm, Spin } from 'antd';
 import NoneData from '../Nodata';
 import axios from 'axios';
-import './order.css';
+import './order.scss';
 import CheckProfile from '../Component/ProfileModal/Profile';
 
 const { Text } = Typography;

src/forge/Order/MilepostDetail.js

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { Link } from 'react-router-dom';
 import { Dropdown, Menu, Icon, Pagination, Spin } from 'antd';
-import './order.css';
+import './order.scss';
 import { FlexAJ } from '../Component/layout';
 import CheckProfile from '../Component/ProfileModal/Profile';
 

src/forge/Order/Nav.js

@@ -1,6 +1,6 @@
 import React , { Component } from "react";
 import { NavLink } from 'react-router-dom';
-import './order.css'
+import './order.scss'
 class Nav extends Component{
   
   render(){

src/forge/Order/UpdateMilepost.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Calendar, Select, Radio, Col, Row, Divider, Input, Form, Spin } from 'antd';
 import axios from 'axios';
 import moment from 'moment';
-import '../Order/order.css';
+import '../Order/order.scss';
 
 
 const TextArea = Input.TextArea;

src/forge/Order/index.scss

@@ -39,7 +39,7 @@
     content: '';
     left: 0px;
     bottom:0px;
-    background-color:#5091FF;
+    background-color:$primary-color;
   }
 }
 .milepostleft{

src/forge/Order/newMilepost.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Calendar, Select, Radio, Col, Row, Divider, Input, Form, Spin } from 'antd';
 import axios from 'axios';
 import moment from 'moment';
-import '../Order/order.css';
+import '../Order/order.scss';
 
 const TextArea = Input.TextArea;
 const { Group, Button } = Radio;

src/forge/Order/order.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { Input, Dropdown, Menu, Icon, Pagination, Spin, DatePicker, Checkbox } from "antd";
-import "./order.css";
+import "./order.scss";
 import './index.scss';
 import moment from 'moment';
 

src/forge/Order/order.scss

@@ -127,8 +127,8 @@
 }
 .topWrapper_btn {
   background: #fff;
-  border: 1px solid #5091ff;
-  color: #5091ff !important;
+  border: 1px solid $primary-color;
+  color: $primary-color ;
   padding: 0px 12px;
   text-align: center;
   height: 32px;
@@ -146,7 +146,7 @@
   padding:0px 10px;
 }
 .topWrapper_type_infos li.active{
-  color: #4cacff
+  color: $primary-color
 }
 .topWrapper_type_infos li:last-child{
   border-left: 1px solid #eee;
@@ -173,7 +173,7 @@
   cursor: pointer;
 }
 .topWrapper_type li > span.active {
-  color: #4cacff;
+  color: $primary-color;
   border: 1px solid rgba(80, 145, 255, 1);
 }
 .topWrapper_select {
@@ -348,11 +348,11 @@
   padding-left: 80px;
   margin-left: 80px;
   margin-right: 20px;
-  border: 1px solid #4cacff;
+  border: 1px solid $primary-color;
 }
 .div_line {
   width: 100%;
-  border: 10px solid #4cacff;
+  border: 10px solid $primary-color;
 }
 .list_img {
   height: 145px;
@@ -482,7 +482,7 @@
 }
 .loginDiv {
   border: 1px solid #f7c977;
-  background: rgb(255, 204, 113, 0.3);
+  background: rgba(255, 204, 113, 0.3);
   text-align: center;
   padding: 8px 0px;
   border-radius: 4px;
@@ -492,7 +492,7 @@
 }
 .loginDiv a {
   text-decoration: underline;
-  color: #4cacff;
+  color: $primary-color;
   margin-right: 3px;
 }
 
@@ -536,12 +536,12 @@
   height: 32px !important;
 }
 a.issue-type-button.active {
-  background: #4cacff;
+  background: $primary-color;
   color: #fff;
 }
 a.issue-type-button.active:hover {
   background: #f4f4f4;
-  color: #4cacff;
+  color: $primary-color;
 }
 @media screen and (max-width: 700px) {
   .topWrapper_select li {

src/forge/Order/order_form.js

@@ -4,7 +4,7 @@ import Upload from "../Upload/Index";
 import UploadImg from "../Images/upload.png";
 import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
 import moment from "moment";
-import "./order.css";
+import "./order.scss";
 import Attachments from "../Upload/attachment";
 
 import axios from "axios";

src/forge/Settings/new_tags.js

@@ -12,7 +12,7 @@ import {
   Button,
   Table,
 } from "antd";
-import "../Order/order.css";
+import "../Order/order.scss";
 import "./setting.scss";
 import NoneData from "../Nodata";
 import { SketchPicker } from "react-color";

src/forge/Settings/setting.scss

@@ -52,7 +52,7 @@
   height: 35px;
   line-height: 35px;
   color: #fff!important;
-  background: #4CACFF;
+  background: $primary-color;
 }
 .small_submitBtn{
   display: block;
@@ -61,7 +61,7 @@
   height: 32px;
   line-height: 32px;
   color: #fff!important;
-  background: #4CACFF;
+  background: $primary-color;
 }
 .addPanel{
   display: flex;

src/forge/comments/children_comments.js

@@ -6,7 +6,7 @@ import { getImageUrl } from "educoder";
 import { List, Popconfirm, Pagination, Button } from "antd";
 import Attachments from "../Upload/attachment";
 import RenderHtml from "../../components/render-html";
-import "../Order/order.css";
+import "../Order/order.scss";
 
 class children_comments extends Component {
   constructor(props) {

src/forge/comments/children_journals.js

@@ -5,7 +5,7 @@ import { getImageUrl } from "educoder";
 import { List, Popconfirm, Pagination, Button } from "antd";
 import Attachments from "../Upload/attachment";
 import RenderHtml from "../../components/render-html";
-import "../Order/order.css";
+import "../Order/order.scss";
 
 class children_journals extends Component {
   constructor(props) {

src/forge/comments/comments.js

@@ -10,7 +10,7 @@ import Attachments from "../Upload/attachment";
 import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
 import RenderHtml from "../../components/render-html";
 import ChildrenComments from "./children_comments";
-import "../Order/order.css";
+import "../Order/order.scss";
 const { TabPane } = Tabs;
 class comments extends Component { 
   constructor(props) {

src/forge/css/index.scss

@@ -296,8 +296,8 @@ form{
   border-color: #D0D0D0;
 }
 .ant-btn.ant-btn-background-ghost.ant-btn-primary:hover{
-  background-color:$primary-color-hover!important;
-  border-color: $primary-color-hover;
+  background-color:$primary-color!important;
+  border-color: $primary-color;
   color: #fff;
 }
 .ant-btn.ant-btn-background-ghost.ant-btn-danger:hover{

src/forge/users/Index.scss

@@ -14,7 +14,7 @@ $primary-color:#466aff;
     align-items: center;
   }
   & > p a{
-    color: #5091FF;
+    color: $primary-color;
     margin-left: 30px;
     font-size: 16px;
     display: $flex;
@@ -89,7 +89,7 @@ $primary-color:#466aff;
       cursor: pointer;
     }
     & > span.active{
-      background-color:#5091FF ;
+      background-color:$primary-color ;
       color: #fff;
       padding:0px 15px;
     }