Skip to content

X
xiaomai-cloud-class-web
Commit fad5253e by chenshu
Options

fix:修改样式

parent c34dccef
Showing with 85 additions and 40 deletions
src/core/antd.less
......@@ -2,7 +2,7 @@
* @Author: Michael
* @Date: 2017-09-08 17:38:18
* @Last Modified by: chenshu
* @Last Modified time: 2020-08-31 14:55:30
* @Last Modified time: 2021-06-04 15:38:14
*/
@import './variables.less';
......@@ -620,8 +620,13 @@ mr0 {
td.ant-table-column-sort{
background: none;
}
<<<<<<< Updated upstream
.ant-modal-content .ant-table-thead > tr > th{
padding:9px 24px;
=======
.ant-modal-content .ant-table-thead > tr > th {
padding: 9px 24px !important;
>>>>>>> Stashed changes
}
.ant-modal-content tr > td{
......@@ -790,10 +795,22 @@ td.ant-table-column-sort{
}
}
.ant-table-column-sorters {
justify-content: start !important;
}
.ant-table-column-title {
flex: initial !important;
}
// 排序小三角
.ant-table-column-sorter {
<<<<<<< Updated upstream
margin-left: 2px!important;
}
.ant-table-column-sorter-full{
margin-top:-0.32rem !important;
=======
margin-left: 8px !important;
>>>>>>> Stashed changes
}
src/modules/knowledge-base/components/KnowledgeBaseOpt.less
......@@ -3,7 +3,7 @@
.select-container{
margin-right: 24px;
.con{
background: #FFF4DD;
background: #E9EFFF;
border-radius: 4px;
padding: 3px 16px;
display: inline-flex;
......
src/modules/teach-tool/examination-manager/AddExam.less
......@@ -9,18 +9,31 @@
margin-bottom: 0px !important;
}
}
.form{
margin-top: 24px;
margin-bottom: 32px;
width: 1000px;
.title{
position: relative;
padding-left: 28px;
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: bold;
color: #333333;
line-height: 22px;
margin-bottom: 24px;
&.first {
&::before{
width:4px;
height:12px;
content:'';
background-image: linear-gradient(#2966FF 83.5%, #0ACCA4 16.5%);
display:inline-block;
position: absolute;
left:16px;
top:6px;
}
}
}
}
......
src/modules/teach-tool/examination-manager/AddExam.tsx
......@@ -269,9 +269,16 @@ function AddExam(props: any) {
<Breadcrumbs navList={title} goBack={handleGoBack} />
<div className="box">
<<<<<<< Updated upstream
<Alert message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" type="info" showIcon />
<div className="form">
<div className="title">基本信息</div>
=======
<div className="show-tips">
<ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" />
</div> <div className="form">
<div className="title first">基本信息</div>
>>>>>>> Stashed changes
<Form
labelCol={{ span: 3 }}
wrapperCol={{ span: 14 }}
......
src/modules/teach-tool/examination-manager/DataAnalysic.tsx
......@@ -39,11 +39,10 @@ function DataAnalysic(props: any) {
<Breadcrumbs navList={"考试数据"} goBack={props.history.goBack} />
<div className="box">
<div className="titleBox ">
<span className='tips'></span>
考试名称：{examDetail.examName}
</div>
</div>
<div className="box">
<div className="box" style={{ paddingTop: 0 }}>
<Tabs activeKey={selectKey} onChange={(key: any) => {
setSelectKey(key)
}}>
......
src/modules/teach-tool/examination-manager/PreviewModal.less
......@@ -123,6 +123,7 @@
border-radius: 4px;
padding: 14px;
padding-bottom: 8px;
padding-right: 0;
.item{
margin-bottom: 8px;
.name{
......
src/modules/teach-tool/examination-manager/PreviewModal.tsx
......@@ -40,11 +40,11 @@ function PreviewModal(props: any) {
<div className="rule">
<div className="item">
<div className="num">{props.info.totalScore || props.info.examPaper.totalScore || 0}</div>
<div className="num">{props.info.totalScore || (props.info.examPaper || {}).totalScore || 0}</div>
<div className="text">总分 <span className="dw" style={{color:'#999'}}>(分)</span></div>
</div>
<div className="item">
<div className="num">{props.info.examTotal || props.info.examPaper.questionCnt || 0}</div>
<div className="num">{props.info.examTotal || (props.info.examPaper || {}).questionCnt || 0}</div>
<div className="text">总题数<span className="dw" style={{color:'#999'}} >(道)</span></div>
</div>
<div className="item">
......
src/modules/teach-tool/examination-manager/UserData.tsx
......@@ -216,7 +216,7 @@ function DataAnalysic(props: any) {
</div>
</div>
<div className="xm-search-filter" style={{ marginTop: 12 }}>
<div className="xm-search-filter" style={{ marginTop: 16 }}>
<div style={{ display: 'flex' }}>
<div className="search-condition">
<div className="search-condition__item">
......
src/modules/teach-tool/examination-manager/dataAnalysic.less
.dataAnalysic{
.titleBox{
position: relative;
padding-left: 28px;
font-size: 19px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
line-height: 26px;
background: #FFFFFF;
// padding: 20px 24px;
// margin-bottom: 8px;
.tips{
width: 4px;
height: 16px;
background: #336DFF;
display: inline-block;
margin-right: 4px;
&::before{
width:4px;
height:12px;
content:'';
background-image: linear-gradient(#2966FF 83.5%, #0ACCA4 16.5%);
display:inline-block;
position: absolute;
left:16px;
top:7px;
}
}
.ant-tabs-content-holder {
margin-top: 8px;
}
}
\ No newline at end of file
src/modules/teach-tool/modal/MoveModal.jsx
......@@ -42,11 +42,12 @@ class MoveModal extends React.Component {
<span className="icon iconfont">&#xe6f2;</span>
<span className="text">已选择<span style={{ color: '#2966FF' }}>{length}</span>个{title}，移动后，原有分类将移除此{title}。</span>
</div>
<div className="move-item">
<div className="move-item" id="move-item">
<span className="label">选择分类：</span>
<TreeSelect
showSearch
treeNodeFilterProp="title"
getPopupContainer={() => document.querySelector('#move-item')}
style={{ width: 240 }}
treeData={moveData}
placeholder="请选择分类"
......
src/modules/teach-tool/modal/MoveModal.less
......@@ -18,4 +18,7 @@
color: #333;
}
}
.ant-select-tree .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected {
background: rgba(41, 102, 255, 0.06);
}
}
\ No newline at end of file
src/modules/teach-tool/paper-manage/OperatePaper.less
......@@ -67,10 +67,8 @@
&:nth-child(odd) {
background: #fafafa;
}
&:last-child {
td {
border-bottom: none!important;
}
td {
border-bottom: none!important;
}
}
......
src/modules/teach-tool/paper-manage/components/PaperList.less
......@@ -5,7 +5,7 @@
.select-container{
margin-right: 24px;
.con{
background: #FFF4DD;
background: #E9EFFF;
border-radius: 4px;
padding: 3px 16px;
display: inline-flex;
......
src/modules/teach-tool/paper-manage/components/SelectQuestionList.jsx
......@@ -387,6 +387,17 @@ class SelectQuestionList extends Component {
})}
</Select>
</div>
<div className="search-condition__item">
<span className="search-label">更新时间：</span>
<RangePicker
value={[
query.updateDateStart ? moment(Number(query.updateDateStart)) : null,
query.updateDateEnd ? moment(Number(query.updateDateEnd)) : null
]}
onChange={(value) => {
this.handleChangeQuery("updatedTime", value)
}} />
</div>
</div>
<div className="reset-fold-area">
......@@ -398,24 +409,8 @@ class SelectQuestionList extends Component {
&#xe61b;{" "}
</span>
</Tooltip>
<span style={{ cursor: 'pointer' }} className="fold-btn" onClick={() => {
this.setState({expandFilter:!expandFilter})
}}>{expandFilter ? <span><span>收起</span><span className="iconfont icon fold-icon" >&#xe82d; </span> </span> : <span>展开<span className="iconfont icon fold-icon" >&#xe835; </span></span>}</span>
</div>
</Row>
{expandFilter && <Row>
<div className="search-condition__item">
<span className="search-label">更新时间：</span>
<RangePicker
value={[
query.updateDateStart ? moment(Number(query.updateDateStart)) : null,
query.updateDateEnd ? moment(Number(query.updateDateEnd)) : null
]}
onChange={(value) => {
this.handleChangeQuery("updatedTime", value)
}} />
</div>
</Row>}
</div>
<div className="select-tip-box">
<div>
......
src/modules/teach-tool/paper-manage/components/SelectQuestionList.less
......@@ -2,19 +2,22 @@
.select-question-filter {
position: relative;
.search-condition {
width: calc(100% - 80px);
width: calc(100% - 20px);
display: flex;
align-items: center;
flex-wrap: wrap;
&__item {
margin-right: 3%;
width: 30%;
margin-bottom: 16px;
display: flex;
.search-label {
vertical-align: middle;
display: inline-block;
height: 32px;
line-height: 32px;
flex-shrink: 0;
}
}
}
......
src/modules/teach-tool/question-manage/components/QuestionList.less
......@@ -43,7 +43,7 @@
.select-container{
.con {
background: #FFF4DD;
background: #E9EFFF;
border-radius: 4px;
padding: 3px 16px;
display: inline-flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment