From 15b709854e4f4127b04a350e1f62ff2aeeec0507 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 16 Aug 2019 16:32:36 +0800
Subject: [PATCH] css
---
.../react/src/modules/user/usersInfo/InfosBank.js | 2 +-
.../src/modules/user/usersInfo/InfosBanner.js | 6 +++---
.../src/modules/user/usersInfo/InfosCourse.js | 2 +-
.../src/modules/user/usersInfo/InfosPackage.js | 2 +-
.../react/src/modules/user/usersInfo/InfosPath.js | 2 +-
.../src/modules/user/usersInfo/InfosProject.js | 2 +-
.../src/modules/user/usersInfo/InfosShixun.js | 2 +-
.../user/usersInfo/common/HeadlessModal.js | 15 ++++++++++++---
.../src/modules/user/usersInfo/common/InfoTab.js | 2 +-
.../src/modules/user/usersInfo/usersInfo.css | 7 ++++---
10 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/public/react/src/modules/user/usersInfo/InfosBank.js b/public/react/src/modules/user/usersInfo/InfosBank.js
index cf670063d..eb07a066c 100644
--- a/public/react/src/modules/user/usersInfo/InfosBank.js
+++ b/public/react/src/modules/user/usersInfo/InfosBank.js
@@ -161,7 +161,7 @@ class InfosBank extends Component{
modalSave={modalSave}
></Modals>
<Spin size="large" spinning={isSpin}>
- <div className="white-panel edu-back-white pt25 pb25 clearfix ">
+ <div className="white-panel edu-back-white pt20 pb20 clearfix ">
<li className={type=="publicly" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("publicly")}>{is_current ? "我":"TA"}的题库</a></li>
<li className={type=="personal" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("personal")}>公共题库</a></li>
</div>
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index ef13e5830..e5ff05c76 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -45,10 +45,10 @@ class InfosBanner extends Component{
</p>
<p className="mt20">
<Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>
- <i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-15 user-colorgrey-green mr30 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-15 user-colorgrey-B8 mr30 ml2"}></i>
+ <i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-green mr30 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr30 ml2"}></i>
</Tooltip>
<Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>
- <i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-15 user-colorgrey-green":"iconfont icon-renzhengshangjia font-15 user-colorgrey-B8"}></i>
+ <i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-green":"iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>
</Tooltip>
</p>
</div>
@@ -63,7 +63,7 @@ class InfosBanner extends Component{
</div>
{
is_current ?
- <span className="fl mt35 ml80">
+ <span className="fl mt35 ml60">
{
data && data.attendance_signed ?
<span className="user_default_btn user_grey_btn font-18">已签到</span>
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index bff9792e7..0149573c5 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -107,7 +107,7 @@ class InfosCourse extends Component{
return(
<div className="educontent">
<Spin size="large" spinning={isSpin}>
- <div className="white-panel edu-back-white pt25 pb25 clearfix ">
+ <div className="white-panel edu-back-white pt20 pb20 clearfix ">
<li className={category ? "" : "active"}><a href="javascript:void(0)" onClick={()=>this.changeCategory()}>全部</a></li>
<li className={category=="manage" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的</a></li>
<li className={category=="study" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("study")}>{is_current ? "我":"TA"}学习的</a></li>
diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js
index 0355e2d76..aca31a7b5 100644
--- a/public/react/src/modules/user/usersInfo/InfosPackage.js
+++ b/public/react/src/modules/user/usersInfo/InfosPackage.js
@@ -168,7 +168,7 @@ class InfosPackage extends Component{
modalSave={this.state.ModalSave}
/>
<Spin size="large" spinning={isSpin}>
- <div className="white-panel edu-back-white pt25 pb25 clearfix ">
+ <div className="white-panel edu-back-white pt20 pb20 clearfix ">
<li className={category ? "" : "active"}><a onClick={()=>this.changeCategory()}>全部</a></li>
<li className={category=="manage" ? "active" : ""}><a onClick={()=>this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的</a></li>
<li className={category=="bidden" ? "active" : ""}><a onClick={()=>this.changeCategory("bidden")}>{is_current ? "我":"TA"}参与的</a></li>
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index 11f50ebf9..e3912216b 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -120,7 +120,7 @@ class InfosPath extends Component{
return(
<div className="educontent">
<Spin size="large" spinning={isSpin}>
- <div className="white-panel edu-back-white pt25 pb25 clearfix ">
+ <div className="white-panel edu-back-white pt20 pb20 clearfix ">
<li className={category ? "" : "active"}><a href="javascript:void(0)" onClick={()=>this.changeCategory()}>全部</a></li>
<li className={category=="manage" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的</a></li>
<li className={category=="study" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("study")}>{is_current ? "我":"TA"}学习的</a></li>
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index c4ce920f0..f65db5792 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -102,7 +102,7 @@ class InfosProject extends Component{
return(
<div className="educontent">
<Spin size="large" spinning={isSpin}>
- <div className="white-panel edu-back-white pt25 pb25 clearfix ">
+ <div className="white-panel edu-back-white pt20 pb20 clearfix ">
<li className={category ? "" : "active"}><a href="javascript:void(0)" onClick={()=>this.changeCategory()}>全部</a></li>
<li className={category=="manage" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的</a></li>
<li className={category=="study" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("study")}>{is_current ? "我":"TA"}学习的</a></li>
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index 1550230ab..e8b6eb7c8 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -120,7 +120,7 @@ class InfosShixun extends Component{
return(
<div className="educontent">
<Spin size="large" spinning={isSpin}>
- <div className="white-panel edu-back-white pt25 pb25 clearfix ">
+ <div className="white-panel edu-back-white pt20 pb20 clearfix ">
<li className={category ? "" : "active"}><a href="javascript:void(0)" onClick={()=>this.changeCategory()}>全部</a></li>
<li className={category=="manage" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的</a></li>
<li className={category=="study" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("study")}>{is_current ? "我":"TA"}学习的</a></li>
diff --git a/public/react/src/modules/user/usersInfo/common/HeadlessModal.js b/public/react/src/modules/user/usersInfo/common/HeadlessModal.js
index 88cb77eef..8e1d38c6f 100644
--- a/public/react/src/modules/user/usersInfo/common/HeadlessModal.js
+++ b/public/react/src/modules/user/usersInfo/common/HeadlessModal.js
@@ -32,10 +32,19 @@ function HeadlessModal (props) {
}
.headless .closeBtn {
position: absolute;
- top: -20px;
- right: -14px;
+ color: ${theme.foreground_select};
+ top: -8px;
+ right: -10px;
font-size: 24px !important;
- color: ${theme.foreground_select}
+ background: #fff;
+ width: 14px;
+ height: 8px;
+ margin-right: 0px;
+ }
+ .headless .icon-htmal5icon19:before {
+ left: -4px;
+ position: absolute;
+ top: -13px;
}
`}</style>
<i className="iconfont icon-htmal5icon19 closeBtn" onClick={ () => setVisible(false) }></i>
diff --git a/public/react/src/modules/user/usersInfo/common/InfoTab.js b/public/react/src/modules/user/usersInfo/common/InfoTab.js
index 546b61820..d4b374886 100644
--- a/public/react/src/modules/user/usersInfo/common/InfoTab.js
+++ b/public/react/src/modules/user/usersInfo/common/InfoTab.js
@@ -16,7 +16,7 @@ function InfoTab (props) {
}, [])
return (
- <div className="white-panel edu-back-white pt25 pb25 clearfix ">
+ <div className="white-panel edu-back-white pt20 pb20 clearfix ">
{categories && categories.map(item => {
return (
<li key={item.key} className={category == item.key ? "active" : ''}><a href="javascript:void(0)" onClick={()=>changeCategory(item.key)}>{item.name}</a></li>
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 61f74a0eb..7510075c9 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -130,6 +130,7 @@
padding-top:25px;
box-sizing: border-box;
background: url('../../../images/account/infobanner.png') no-repeat top center;
+ background-color: #0d4473
}
.username{
@@ -145,7 +146,7 @@
}
.myPhoto{
border-radius: 50%;
- border:2px solid #fff;
+ /* border:2px solid #fff; */
width:110px;
height:110px;
}
@@ -176,7 +177,7 @@
text-align: center;
}
.headtab {
- width: 160px;
+ width: 140px;
height: 70px;
text-align: center;
}
@@ -194,7 +195,7 @@
height: 54px;
line-height: 54px;
background: #fff;
- box-shadow:0px 0px 24px 3px rgba(230,230,230,0.5);
+ box-shadow:0px 5px 12px 3px #e6e6e6;
border-radius:7px;
padding:0px 10px;
}