From 0f2dcd44360adf7846932ca6fc4ef6da524e8e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Thu, 16 Jun 2022 09:48:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9antd=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B1=80scss=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/webpack.config.prod.js | 6 ++++++ src/AppConfig.js | 2 +- src/forge/Component/layout.jsx | 7 ++++--- src/forge/Head/Header.js | 2 +- src/forge/Main/Index.scss | 8 ++++++++ src/forge/Merge/CreateMerge.js | 2 +- src/forge/Merge/MergeLinkFooter.jsx | 2 +- src/forge/Merge/MessageCount.js | 2 +- src/forge/Merge/NewMerge.js | 2 +- src/forge/Merge/UpdateMerge.js | 2 +- src/forge/Merge/merge.js | 2 +- src/forge/Merge/merge_footer.js | 2 +- src/forge/Merge/merge_form.js | 2 +- src/forge/Order/AmplifyImg.js | 2 +- src/forge/Order/Detail.js | 2 +- src/forge/Order/Milepost.js | 2 +- src/forge/Order/MilepostDetail.js | 2 +- src/forge/Order/Nav.js | 2 +- src/forge/Order/UpdateMilepost.js | 2 +- src/forge/Order/index.scss | 2 +- src/forge/Order/newMilepost.js | 2 +- src/forge/Order/order.js | 2 +- src/forge/Order/{order.css => order.scss} | 20 ++++++++++---------- src/forge/Order/order_form.js | 2 +- src/forge/Settings/new_tags.js | 2 +- src/forge/Settings/setting.scss | 4 ++-- src/forge/comments/children_comments.js | 2 +- src/forge/comments/children_journals.js | 2 +- src/forge/comments/comments.js | 2 +- src/forge/css/index.scss | 4 ++-- src/forge/users/Index.scss | 4 ++-- 31 files changed, 58 insertions(+), 43 deletions(-) rename src/forge/Order/{order.css => order.scss} (97%) diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index 9cf0f0534..88c9a8dfc 100644 --- a/config/webpack.config.prod.js +++ b/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'] + } + } ], }, { diff --git a/src/AppConfig.js b/src/AppConfig.js index b4107e460..cd3aca3d4 100644 --- a/src/AppConfig.js +++ b/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) { diff --git a/src/forge/Component/layout.jsx b/src/forge/Component/layout.jsx index dcc133e85..ca188866c 100644 --- a/src/forge/Component/layout.jsx +++ b/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; diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 15435612d..58d3fcaef 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -386,7 +386,7 @@ class NewHeader extends Component { } : - + 头像 diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index dbdf4b1c1..bc55705f2 100644 --- a/src/forge/Main/Index.scss +++ b/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{ diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index 28ed7690f..e974f5360 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/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'; /** diff --git a/src/forge/Merge/MergeLinkFooter.jsx b/src/forge/Merge/MergeLinkFooter.jsx index 2c9aa4814..ed25ca2e4 100644 --- a/src/forge/Merge/MergeLinkFooter.jsx +++ b/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; diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index d7dfe3ca5..3386332cd 100644 --- a/src/forge/Merge/MessageCount.js +++ b/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; diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 900dea824..c846fddd2 100644 --- a/src/forge/Merge/NewMerge.js +++ b/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"; diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js index 86a05dc3e..2c97e3b45 100644 --- a/src/forge/Merge/UpdateMerge.js +++ b/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"; diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 769d2d472..f10f3bc3c 100644 --- a/src/forge/Merge/merge.js +++ b/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"; diff --git a/src/forge/Merge/merge_footer.js b/src/forge/Merge/merge_footer.js index 0ba3a1439..340d47b26 100644 --- a/src/forge/Merge/merge_footer.js +++ b/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; diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index 2ad08d4bc..b02b9a049 100644 --- a/src/forge/Merge/merge_form.js +++ b/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"; diff --git a/src/forge/Order/AmplifyImg.js b/src/forge/Order/AmplifyImg.js index 568ac7f92..114fa7e6a 100644 --- a/src/forge/Order/AmplifyImg.js +++ b/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 ( diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 4453a7b5c..e590d74ca 100644 --- a/src/forge/Order/Detail.js +++ b/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) { diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 48fc286ba..3e636332c 100644 --- a/src/forge/Order/Milepost.js +++ b/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; diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index 809051f7b..02ca7505f 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/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'; diff --git a/src/forge/Order/Nav.js b/src/forge/Order/Nav.js index 3f5a20c59..c3f967184 100644 --- a/src/forge/Order/Nav.js +++ b/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(){ diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index c4f386575..2cc5d789a 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/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; diff --git a/src/forge/Order/index.scss b/src/forge/Order/index.scss index 124c1fdb4..e721713ca 100644 --- a/src/forge/Order/index.scss +++ b/src/forge/Order/index.scss @@ -39,7 +39,7 @@ content: ''; left: 0px; bottom:0px; - background-color:#5091FF; + background-color:$primary-color; } } .milepostleft{ diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index 789f8a11c..f11b9abd7 100644 --- a/src/forge/Order/newMilepost.js +++ b/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; diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 6ce659ba7..2ed7b7683 100644 --- a/src/forge/Order/order.js +++ b/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'; diff --git a/src/forge/Order/order.css b/src/forge/Order/order.scss similarity index 97% rename from src/forge/Order/order.css rename to src/forge/Order/order.scss index ab9a591f5..0d4f63b37 100644 --- a/src/forge/Order/order.css +++ b/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 { diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 1a942f595..a3452c348 100644 --- a/src/forge/Order/order_form.js +++ b/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"; diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js index 5c882f9cc..ca3eb265e 100644 --- a/src/forge/Settings/new_tags.js +++ b/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"; diff --git a/src/forge/Settings/setting.scss b/src/forge/Settings/setting.scss index 274cbf465..27a9f0630 100644 --- a/src/forge/Settings/setting.scss +++ b/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; diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js index 75330161a..809ffdb54 100644 --- a/src/forge/comments/children_comments.js +++ b/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) { diff --git a/src/forge/comments/children_journals.js b/src/forge/comments/children_journals.js index 2337ce87c..600f76d13 100644 --- a/src/forge/comments/children_journals.js +++ b/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) { diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js index 079ffeff7..52707b8be 100644 --- a/src/forge/comments/comments.js +++ b/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) { diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index deedfc393..cfff6562b 100644 --- a/src/forge/css/index.scss +++ b/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{ diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss index 388c34efa..242ef640f 100644 --- a/src/forge/users/Index.scss +++ b/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; }