Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
22066607
Commit
22066607
authored
Jan 04, 2021
by
zhangleyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style:调整UI验收后的样式问题
parent
35c97633
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
50 additions
and
29 deletions
+50
-29
src/components/ShowTips.jsx
+2
-1
src/components/ShowTips.less
+2
-4
src/core/antd.less
+0
-1
src/modules/course-manage/AddLive.less
+5
-1
src/modules/course-manage/DataList/DataList.less
+8
-0
src/modules/course-manage/components/LiveCourseFilter.less
+3
-1
src/modules/course-manage/components/LiveCourseList.jsx
+1
-1
src/modules/course-manage/components/LiveCourseList.less
+29
-20
No files found.
src/components/ShowTips.jsx
View file @
22066607
...
...
@@ -4,7 +4,8 @@ import {InfoCircleOutlined} from '@ant-design/icons';
function
ShowTips
(
props
)
{
return
(
<
div
className=
{
`xm-show-tip xm-type-${props.type || 'defulat'}`
}
>
<
InfoCircleOutlined
className=
"icon"
/>
{
/* <InfoCircleOutlined className="icon"/> */
}
<
span
className=
"icon iconfont"
>

</
span
>
<
p
>
{
props
.
message
}
</
p
>
</
div
>
)
...
...
src/components/ShowTips.less
View file @
22066607
...
...
@@ -9,15 +9,13 @@
padding: 0 12px;
.icon {
color:#FF9D14;
line-height: 24px;
height: 20px;
margin-top:4px;
font-size:14px;
}
p {
color:#666666;
font-size: 14px;
line-height:20px;
margin-left:
12
px;
margin-left:
8
px;
}
}
.xm-type-default {
...
...
src/core/antd.less
View file @
22066607
...
...
@@ -207,7 +207,6 @@
.ant-table-header>table,.ant-table-body>table {
border: none !important;
border-radius: 3px;
.icon {
color: #bfbfbf;
}
...
...
src/modules/course-manage/AddLive.less
View file @
22066607
...
...
@@ -27,9 +27,13 @@
margin-left: 50px;
}
.class-info__wrap,
.class-info__wrap{
margin-top: 32px;
}
.intro-info__wrap {
margin-top: 32px;
margin-bottom:74px;
}
.add-live__intro-info {
margin-left: 0;
...
...
src/modules/course-manage/DataList/DataList.less
View file @
22066607
...
...
@@ -52,6 +52,10 @@
color: #bfbfbf;
cursor: pointer;
}
.ant-table-header{
border: 1px solid #e8e8e8;
border-bottom: none;
}
}
.bulge {
color: #ff7519;
...
...
@@ -130,4 +134,8 @@
}
}
}
}
.ant-table-tbody > tr.ant-table-placeholder{
background:#FFF !important;
}
src/modules/course-manage/components/LiveCourseFilter.less
View file @
22066607
.live-course-filter {
position: relative;
.ant-input-search-button{
border-left:none;
}
.search-condition {
width: calc(100% - 80px);
display: flex;
...
...
src/modules/course-manage/components/LiveCourseList.jsx
View file @
22066607
...
...
@@ -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-status"
style=
{
{
color
:
courseStateShow
[
record
.
courseState
].
color
,
border
:
`1px solid ${courseStateShow[record.courseState].color}`
}
}
>
{
courseStateShow
[
record
.
courseState
].
title
}
</
span
>
</
div
>
<
div
>
<
div
class=
"teacher-assistant"
>
<
span
className=
"teacher"
>
讲师:
{
record
.
teacherName
}
</
span
>
{
record
.
admins
.
length
>
0
&&
...
...
src/modules/course-manage/components/LiveCourseList.less
View file @
22066607
...
...
@@ -36,27 +36,36 @@
padding:0 8px;
margin-left:4px;
}
.teacher{
font-size: 12px;
color: #666666;
max-width: 96px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.assistant{
font-size: 12px;
color: #666666;
max-width: 96px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.split {
margin: 0 4px;
color: #BFBFBF;
display: inline-blcok;
.teacher-assistant{
display:flex;
.teacher{
font-size: 12px;
color: #666666;
max-width: 96px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
display:inline-block;
padding-top:2px;
}
.assistant{
font-size: 12px;
color: #666666;
max-width: 96px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
display:inline-block;
padding-top:2px;
}
.split {
margin: 0 4px;
color: #BFBFBF;
display: inline-blcok;
}
}
}
.categoryName{
font-size: 14px;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment