Skip to content

X
xiaomai-cloud-class-web
Commit 80a3ba91 by wufan
Options

fix:解决冲突

parent f081c887
Showing with 42 additions and 16 deletions
src/bu-components/ChooseMembersModal.less
...@@ -90,13 +90,24 @@ ...@@ -90,13 +90,24 @@
.ant-table { .ant-table {
min-height: 378px !important; min-height: 378px !important;
height: 378px !important;
overflow-y: auto;
table {
height: 378px;
}
}
.ant-table .ant-table-body {
overflow: auto;
max-height: 378px !important;
height: 378px;
} }
.ant-table tbody tr:nth-child(even) { .ant-table tbody tr:nth-child(even) {
background: transparent!important; background: transparent!important;
} }
.ant-empty-normal { .ant-empty-normal {
margin: 130px 0 !important; margin: 144px 0 !important;
} }
.avatar{ .avatar{
......
src/bu-components/PreviewCourseModal.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-07-23 14:54:16 * @Date: 2020-07-23 14:54:16
* @LastEditors: zhangleyuan * @LastEditors: wufan
* @LastEditTime: 2021-02-01 13:58:31 * @LastEditTime: 2021-02-02 19:32:21
* @Description: 大班直播课预览弹窗 * @Description: 大班直播课预览弹窗
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -136,7 +136,7 @@ class PreviewCourseModal extends React.Component { ...@@ -136,7 +136,7 @@ class PreviewCourseModal extends React.Component {
</Otherwise> </Otherwise>
</Choose> </Choose>
<div className="container__introduction"> <div className="container__introduction">
<div className="container__introduction__title">直播简介</div> <div className="container__introduction__title">直播课简介</div>
<div className="container__introduction__list editor-box"> <div className="container__introduction__list editor-box">
{ {
liveCourseMediaRequests.map((item, index) => { liveCourseMediaRequests.map((item, index) => {
......
src/bu-components/PreviewCourseModal.less
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
.title__state { .title__state {
min-width: 40px; min-width: 40px;
height: 17px; height: 17px;
padding: 0 2px; padding: 0px 8px;
border-radius: 10px;
margin-left: 6px; margin-left: 6px;
font-size: 12px; font-size: 12px;
color: #FFF; color: #FFF;
......
src/bu-components/ShowTip.less
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
padding: 0 12px; padding: 0 12px;
line-height: 32px;
span.icon { span.icon {
color:#FF9D14; color:#FF9D14;
line-height: 20px; line-height: 20px;
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
p { p {
color:#666666; color:#666666;
font-size: 14px; font-size: 14px;
line-height:20px; line-height:25px;
margin-left: 12px; margin-left: 12px;
} }
} }
......
src/components/MultipleDatePicker.less
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
cursor: pointer; cursor: pointer;
vertical-align: top; vertical-align: top;
&:hover { &:hover {
background:rgba(255, 183, 20, 0.2); background: rgba(255, 183, 20,.2);
border-radius:4px; border-radius:4px;
} }
&.before-disabled { &.before-disabled {
......
src/components/ShowTips.less
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
padding: 0 12px; padding: 0 12px;
line-height: 32px;
.icon { .icon {
color:#FF9D14; color:#FF9D14;
font-size:14px; font-size:14px;
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
p { p {
color:#666666; color:#666666;
font-size: 14px; font-size: 14px;
line-height:20px; line-height:25px;
margin-left:8px; margin-left:8px;
} }
} }
......
src/core/antd.less
...@@ -203,6 +203,9 @@ ...@@ -203,6 +203,9 @@
} }
} }
} }
.ant-table-body {
overflow-y: auto !important;
}
.ant-table-fixed-right .ant-table-fixed { .ant-table-fixed-right .ant-table-fixed {
border-left: none !important; border-left: none !important;
...@@ -753,4 +756,10 @@ mr0 { ...@@ -753,4 +756,10 @@ mr0 {
.ant-modal-footer{ .ant-modal-footer{
padding:10px 24px; padding:10px 24px;
} }
} }
\ No newline at end of file
// 排序小三角
.ant-table-column-sorter {
margin-left: 2px!important;
}
src/modules/course-manage/components/AddLiveIntro.jsx
...@@ -264,7 +264,7 @@ class AddLiveIntro extends React.Component { ...@@ -264,7 +264,7 @@ class AddLiveIntro extends React.Component {
<div className="introduce"> <div className="introduce">
<span className="label">直播简介：</span> <span className="label">直播课简介：</span>
<div className="content"> <div className="content">
<div className="intro-list"> <div className="intro-list">
{ {
......
src/modules/course-manage/modal/PreviewCourseModal.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-07-23 14:54:16 * @Date: 2020-07-23 14:54:16
* @LastEditors: zhangleyuan * @LastEditors: wufan
* @LastEditTime: 2021-01-09 16:26:03 * @LastEditTime: 2021-02-01 16:33:18
* @Description: 大班直播课预览弹窗 * @Description: 大班直播课预览弹窗
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -172,9 +172,9 @@ class PreviewCourseModal extends React.Component { ...@@ -172,9 +172,9 @@ class PreviewCourseModal extends React.Component {
<div className="container__introduction"> <div className="container__introduction">
{ type === 'videoCourse' ? { type === 'videoCourse' ?
<div className="container__introduction__title">视频简介</div> <div className="container__introduction__title">视频课简介</div>
: :
<div className="container__introduction__title">直播简介</div> <div className="container__introduction__title">直播课简介</div>
} }
<div className="container__introduction__list editor-box"> <div className="container__introduction__list editor-box">
{ {
......
src/modules/course-manage/modal/PreviewCourseModal.less
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
.title__state { .title__state {
min-width: 40px; min-width: 40px;
height: 17px; height: 17px;
padding: 0 2px; padding: 0px 8px;
border-radius: 10px;
margin-left: 6px; margin-left: 6px;
font-size: 12px; font-size: 12px;
color: #FFF; color: #FFF;
......
src/modules/store-manage/StoreDecorationPage.less
.store-decoration-page { .store-decoration-page {
.box {
padding-top:11px!important;
}
thead { thead {
display: none; display: none;
} }
......
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