Commit 22066607 by zhangleyuan

style:调整UI验收后的样式问题

parent 35c97633
...@@ -4,7 +4,8 @@ import {InfoCircleOutlined} from '@ant-design/icons'; ...@@ -4,7 +4,8 @@ import {InfoCircleOutlined} from '@ant-design/icons';
function ShowTips(props) { function ShowTips(props) {
return ( return (
<div className={`xm-show-tip xm-type-${props.type || 'defulat'}`} > <div className={`xm-show-tip xm-type-${props.type || 'defulat'}`} >
<InfoCircleOutlined className="icon"/> {/* <InfoCircleOutlined className="icon"/> */}
<span className="icon iconfont">&#xe6f2;</span>
<p>{props.message}</p> <p>{props.message}</p>
</div> </div>
) )
......
...@@ -9,15 +9,13 @@ ...@@ -9,15 +9,13 @@
padding: 0 12px; padding: 0 12px;
.icon { .icon {
color:#FF9D14; color:#FF9D14;
line-height: 24px; font-size:14px;
height: 20px;
margin-top:4px;
} }
p { p {
color:#666666; color:#666666;
font-size: 14px; font-size: 14px;
line-height:20px; line-height:20px;
margin-left: 12px; margin-left:8px;
} }
} }
.xm-type-default { .xm-type-default {
......
...@@ -207,7 +207,6 @@ ...@@ -207,7 +207,6 @@
.ant-table-header>table,.ant-table-body>table { .ant-table-header>table,.ant-table-body>table {
border: none !important; border: none !important;
border-radius: 3px; border-radius: 3px;
.icon { .icon {
color: #bfbfbf; color: #bfbfbf;
} }
......
...@@ -27,9 +27,13 @@ ...@@ -27,9 +27,13 @@
margin-left: 50px; margin-left: 50px;
} }
.class-info__wrap, .class-info__wrap{
margin-top: 32px;
}
.intro-info__wrap { .intro-info__wrap {
margin-top: 32px; margin-top: 32px;
margin-bottom:74px;
} }
.add-live__intro-info { .add-live__intro-info {
margin-left: 0; margin-left: 0;
......
...@@ -52,6 +52,10 @@ ...@@ -52,6 +52,10 @@
color: #bfbfbf; color: #bfbfbf;
cursor: pointer; cursor: pointer;
} }
.ant-table-header{
border: 1px solid #e8e8e8;
border-bottom: none;
}
} }
.bulge { .bulge {
color: #ff7519; color: #ff7519;
...@@ -130,4 +134,8 @@ ...@@ -130,4 +134,8 @@
} }
} }
} }
}
.ant-table-tbody > tr.ant-table-placeholder{
background:#FFF !important;
} }
.live-course-filter { .live-course-filter {
position: relative; position: relative;
.ant-input-search-button{
border-left:none;
}
.search-condition { .search-condition {
width: calc(100% - 80px); width: calc(100% - 80px);
display: flex; display: flex;
......
...@@ -174,7 +174,7 @@ class LiveCourseList extends React.Component { ...@@ -174,7 +174,7 @@ class LiveCourseList extends React.Component {
<span className="course-time">{formatDate("YYYY-MM-DD H:i",parseInt(record.startTime))}~{formatDate("H:i", parseInt(record.endTime))}</span> <span className="course-time">{formatDate("YYYY-MM-DD H:i",parseInt(record.startTime))}~{formatDate("H:i", parseInt(record.endTime))}</span>
<span className="course-status" style={{color:courseStateShow[record.courseState].color,border:`1px solid ${courseStateShow[record.courseState].color}`}}>{courseStateShow[record.courseState].title}</span> <span className="course-status" style={{color:courseStateShow[record.courseState].color,border:`1px solid ${courseStateShow[record.courseState].color}`}}>{courseStateShow[record.courseState].title}</span>
</div> </div>
<div> <div class="teacher-assistant">
<span className="teacher">讲师:{record.teacherName}</span> <span className="teacher">讲师:{record.teacherName}</span>
{ record.admins.length >0 && { record.admins.length >0 &&
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
padding:0 8px; padding:0 8px;
margin-left:4px; margin-left:4px;
} }
.teacher-assistant{
display:flex;
.teacher{ .teacher{
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
...@@ -43,6 +45,8 @@ ...@@ -43,6 +45,8 @@
overflow: hidden; overflow: hidden;
text-overflow:ellipsis; text-overflow:ellipsis;
white-space: nowrap; white-space: nowrap;
display:inline-block;
padding-top:2px;
} }
.assistant{ .assistant{
font-size: 12px; font-size: 12px;
...@@ -51,6 +55,8 @@ ...@@ -51,6 +55,8 @@
overflow: hidden; overflow: hidden;
text-overflow:ellipsis; text-overflow:ellipsis;
white-space: nowrap; white-space: nowrap;
display:inline-block;
padding-top:2px;
} }
.split { .split {
margin: 0 4px; margin: 0 4px;
...@@ -58,6 +64,9 @@ ...@@ -58,6 +64,9 @@
display: inline-blcok; display: inline-blcok;
} }
} }
}
.categoryName{ .categoryName{
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
......
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