Skip to content

X
xiaomai-cloud-class-web
Commit e22f9e10 by guomingpang
Options

Merge branch 'gray' of… 

Merge branch 'gray' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into gray
parents a9a8da8f 2ae5f02d
Showing with 51 additions and 23 deletions
src/core/antd.less
...@@ -233,6 +233,10 @@ ...@@ -233,6 +233,10 @@
} }
} }
.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
font-weight: 500!important;
}
.ant-tabs-nav .ant-tabs-tab-active { .ant-tabs-nav .ant-tabs-tab-active {
color: @active-color !important; color: @active-color !important;
} }
...@@ -656,9 +660,8 @@ td.ant-table-column-sort { ...@@ -656,9 +660,8 @@ td.ant-table-column-sort {
background-color: #2966ff !important; background-color: #2966ff !important;
opacity: 0.8 !important; opacity: 0.8 !important;
} }
&:focus, &:active{
&:active { background-color:#5C8AFF !important;
background-color: #5c8aff !important;
} }
} }
......
src/core/variables.less
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
@xm-table-tbody-color:#666; @xm-table-tbody-color:#666;
//侧边栏宽度 //侧边栏宽度
@xm-left-width:180px; @xm-left-width:180px;
@xm-left-min-width:64px; @xm-left-min-width:56px;
@xm-color-text-menu:#9a9dA7; @xm-color-text-menu:#9a9dA7;
// 下拉框 // 下拉框
......
src/modules/college-manage/EmployeeManage.less
.employee-manage-page{
.box-header{
margin-bottom:4px;
}
.add-show-btn{
margin-top:12px;
}
}
\ No newline at end of file
src/modules/college-manage/EmployeeManage.tsx
...@@ -263,7 +263,7 @@ function EmployeeManage() { ...@@ -263,7 +263,7 @@ function EmployeeManage() {
} }
return ( return (
<div className=" page employee-manage-page"> <div className="page employee-manage-page">
<div className="content-header">员工管理</div> <div className="content-header">员工管理</div>
<div className="box"> <div className="box">
<div className="box-header"> <div className="box-header">
......
src/modules/course-manage/offline-course/AddOfflineCourse.jsx
...@@ -1046,8 +1046,8 @@ class AddOfflineCourse extends React.Component { ...@@ -1046,8 +1046,8 @@ class AddOfflineCourse extends React.Component {
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#2966FF',
border: '1px solid #FFB714', border: '1px solid #2966FF',
padding: '2px 8px', padding: '2px 8px',
borderRadius: '2px', borderRadius: '2px',
marginRight: 8, marginRight: 8,
...@@ -1056,8 +1056,8 @@ class AddOfflineCourse extends React.Component { ...@@ -1056,8 +1056,8 @@ class AddOfflineCourse extends React.Component {
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#2966FF',
border: '1px solid #FFB714', border: '1px solid #2966FF',
padding: '2px 8px', padding: '2px 8px',
borderRadius: '2px', borderRadius: '2px',
marginRight: 8, marginRight: 8,
...@@ -1066,8 +1066,8 @@ class AddOfflineCourse extends React.Component { ...@@ -1066,8 +1066,8 @@ class AddOfflineCourse extends React.Component {
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#2966FF',
border: '1px solid #FFB714', border: '1px solid #2966FF',
padding: '2px 8px', padding: '2px 8px',
borderRadius: '2px', borderRadius: '2px',
marginRight: 8, marginRight: 8,
......
src/modules/course-manage/offline-course/OfflineCourseData.less
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
width: 4px; width: 4px;
height: 16px; height: 16px;
content: ''; content: '';
background: #FFB714; background: #2966FF;
left: 0; left: 0;
top: 5px; top: 5px;
} }
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
} }
} }
.calendar-text { .calendar-text {
color: #FF9D14; color: #2966FF;
line-height: 20px; line-height: 20px;
margin: 0 44px; margin: 0 44px;
} }
...@@ -85,7 +85,8 @@ ...@@ -85,7 +85,8 @@
cursor: pointer; cursor: pointer;
} }
&.selected { &.selected {
background: rgba(255, 183, 20, 0.06); background: #E9EFFF;
color: #2966FF;
} }
} }
} }
......
src/modules/course-manage/offline-course/modal/PreviewOfflineModal.less
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
content: ''; content: '';
width: 2px; width: 2px;
height: 14px; height: 14px;
background: #FFB714; background: #2966FF;
left: 0; left: 0;
top: 2px; top: 2px;
} }
......
src/modules/plan-manage/AddPlan.less
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
position:relative !important; position:relative !important;
.box { .box {
margin-bottom: 52px !important; margin-bottom: 52px !important;
padding-bottom: 40px!important;
.add-plan-page__form { .add-plan-page__form {
margin-top: 16px; margin-top: 16px;
.title { .title {
......
src/modules/root/Header.less
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
flex: 1; flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
justify-content: space-between; justify-content: space-between;
margin-left: 54px; margin-left: 62px;
.college-container { .college-container {
position: relative; position: relative;
width: 360px; width: 360px;
......
src/modules/root/Menu.less
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
background: @menu-bakg; background: @menu-bakg;
color: #333; color: #333;
.menu-type-icon{ .menu-type-icon{
margin:4px 0 4px 156px; margin:4px 0 0px 150px;
cursor: pointer; cursor: pointer;
.icon{ .icon{
font-size:14px; font-size:14px;
color:#5E606A;
} }
} }
.ant-menu { .ant-menu {
...@@ -74,6 +75,7 @@ ...@@ -74,6 +75,7 @@
.ant-menu-item-selected{ .ant-menu-item-selected{
background-color:@active-color; background-color:@active-color;
color:#FFF; color:#FFF;
border-radius:2px;
&:hover{ &:hover{
color:#FFF; color:#FFF;
} }
...@@ -99,14 +101,18 @@ ...@@ -99,14 +101,18 @@
} }
} }
.ant-menu-submenu-arrow{
right:22px;
color:#5E606A;
} }
} }
}
&.left-container-vertical { &.left-container-vertical {
width: 62px; width: 56px;
.menu-type-icon{ .menu-type-icon{
margin:4px 0 4px 22px; margin:4px 0 0px 22px;
} }
.left { .left {
.ant-menu-submenu-arrow{ .ant-menu-submenu-arrow{
...@@ -126,15 +132,15 @@ ...@@ -126,15 +132,15 @@
.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected { .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
background:@active-color !important; background:@active-color !important;
} }
.ant-menu.ant-menu-dark, .ant-menu-dark .ant-menu-sub, .ant-menu.ant-menu-dark .ant-menu-sub{ .ant-menu.ant-menu-dark, .ant-menu-dark .ant-menu-sub, .ant-menu.ant-menu-dark .ant-menu-sub{
background: @menu-bakg !important; background: @menu-bakg !important;
} }
.ant-menu-submenu-popup{
left:67px !important;
}
.ant-menu-submenu-popup>.ant-menu { .ant-menu-submenu-popup>.ant-menu {
background: @menu-bakg !important; background: @menu-bakg !important;
color: #333; color: #333;
padding-left: 15px;
width: 132px; width: 132px;
min-width: auto; min-width: auto;
li { li {
......
src/modules/teach-tool/examination-manager/index.less
...@@ -6,4 +6,11 @@ ...@@ -6,4 +6,11 @@
padding: 2px 4px; padding: 2px 4px;
line-height: 16px; line-height: 16px;
} }
.ant-table-column-sorters {
justify-content: flex-end;
}
.ant-table-column-sorter {
margin-top: 0px !important;
}
} }
\ No newline at end of file
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