From 5832e276fe04748fc2c91decfd280c78541f41d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 16 Nov 2019 17:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4ie=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/public/css/edu-all.css | 2 +-
public/react/src/modules/tpm/TPMIndexHOC.js | 6 +++---
public/react/src/modules/user/usersInfo/usersInfo.css | 2 ++
public/stylesheets/educoder/edu-all.css | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index abdf253b1..d25a6fdde 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -97,7 +97,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*更多*/
.moreitem{position: absolute;right: 5px;top:35px;height: 15px;color:#656565}
/*块状列表*/
-.square-list{width: 100%;box-sizing: border-box;margin-top:20px}
+.square-list{width: 100%;box-sizing: border-box;margin-top:20px;flex-wrap:wrap;display:flex;}
.square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
.square-Item:hover{
/*bottom: 3px;*/
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 713562f58..69f54bd77 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1`));
+ .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`));
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
// index.html有加载
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`));
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
// $('head').append($('')
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 2804a37dd..fc45a4480 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -434,6 +434,8 @@
/* 防抖 */
.educontent .square-list {
min-height: 400px;
+ flex-wrap:wrap;
+ display:flex;
}
.h10 {
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 037ef87df..5aace2464 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -101,7 +101,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*更多*/
.moreitem{position: absolute;right: 5px;top:35px;height: 15px;color:#656565}
/*块状列表*/
-.square-list{width: 100%;box-sizing: border-box;margin-top:20px}
+.square-list{width: 100%;box-sizing: border-box;margin-top:20px;flex-wrap:wrap;display:flex;}
.square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
.square-Item:hover{
/*bottom: 3px; */