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; */