diff --git a/src/layouts/About/data.js b/src/layouts/About/data.js index ca4d69c..13bec1b 100644 --- a/src/layouts/About/data.js +++ b/src/layouts/About/data.js @@ -4,25 +4,21 @@ import qrWeibo from '../../assets/images/qr-weibo.png'; import qrGithub from '../../assets/images/qr-github.png'; const details = [{ - "title": "weixin", - "desc": "官方微信公众号", - "img": qrWechat - }, - { - "title": "qq", - "desc": "官方QQ群", - "img": qrQq - }, - { - "title": "weibo", - "desc": "官方微博", - "img": qrWeibo - }, - { - "title": "github", - "desc": "官方github", - "img": qrGithub - }, -]; + "title": "weixin", + "desc": "官方微信公众号", + "img": qrWechat + },{ + "title": "qq", + "desc": "官方QQ群", + "img": qrQq + },{ + "title": "weibo", + "desc": "官方微博", + "img": qrWeibo + },{ + "title": "github", + "desc": "官方github", + "img": qrGithub + }]; export default details; \ No newline at end of file diff --git a/src/layouts/About/index.js b/src/layouts/About/index.js index a139cd3..683d5ff 100644 --- a/src/layouts/About/index.js +++ b/src/layouts/About/index.js @@ -15,38 +15,39 @@ require ('bootstrap'); // import {Row, Col, Popover, Button} from 'antd'; class Index extends Component { showDetail(img, title){ - return `
- ${title}/ -
` - } - render() { - - return ( -
-
- { - details.map((ele,index) => { - $(() => { - $(`#popover${index}`).popover( - { - title: ele.desc, - trigger: 'focus', - content: this.showDetail(ele.img, ele.title), - html: true - } - ) - }) - return ( - ) - }) - } -
-
- ); - } + return `
+ ${title}/ +
` + } + render() { + return ( +
+
+ { + details.map((ele,index) => { + $(() => { + $(`#popover${index}`).popover({ + title: ele.desc, + trigger: 'focus', + content: this.showDetail(ele.img, ele.title), + html: true, + placement: 'top' + }); + }); + return ( + + ); + }) + } +
+
+ ); + } } + +///////////////////////////////antd/////////////////////////////////// // render() { // return ( //
diff --git a/src/layouts/About/style.scss b/src/layouts/About/style.scss index f29b189..faba4d3 100644 --- a/src/layouts/About/style.scss +++ b/src/layouts/About/style.scss @@ -4,7 +4,8 @@ margin: 5px 5px; } .detail-img { - max-width: 134px; + width: 134px; + height:134px; img { width: 100%; height: auto; diff --git a/src/layouts/Footer.js b/src/layouts/Footer.js index 07486f1..a880d41 100644 --- a/src/layouts/Footer.js +++ b/src/layouts/Footer.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; //import {Row, Col} from 'antd'; import About from './About' -import $ from'jquery'; -require('popper.js'); -require ('bootstrap'); +// import $ from'jquery'; +// require('popper.js'); +// require ('bootstrap'); class Footer extends Component { render() { diff --git a/src/pages/Sponsors/data.js b/src/pages/Sponsors/data.js index 8d833a2..1481727 100644 --- a/src/pages/Sponsors/data.js +++ b/src/pages/Sponsors/data.js @@ -2,19 +2,15 @@ import logoMicroSoft from '../../assets/images/Microsoft.png'; import logoBBD from '../../assets/images/BBD.png'; import logoGDG from '../../assets/images/GDG.png'; -const sponsors = [ - { - "title": "BBD", - "img": logoMicroSoft - }, - { - "title": "MicroSoft", - "img": logoBBD - }, - { - "title": "GDG", - "img": logoGDG - }, -]; +const sponsors = [{ + "title": "BBD", + "img": logoMicroSoft + },{ + "title": "MicroSoft", + "img": logoBBD + },{ + "title": "GDG", + "img": logoGDG + }]; export default sponsors; \ No newline at end of file diff --git a/src/pages/Sponsors/index.js b/src/pages/Sponsors/index.js index a60f1ba..4ff2d38 100644 --- a/src/pages/Sponsors/index.js +++ b/src/pages/Sponsors/index.js @@ -7,21 +7,21 @@ import sponsors from './data'; import './style.css'; class Sponsors extends Component { - render() { - return ( -
- { - sponsors.map((ele,index) => { - return ( -
- {ele.title} -
- ) - }) - } -
- ); - } + render() { + return ( +
+ { + sponsors.map((ele,index) => { + return ( +
+ {ele.title} +
+ ); + }) + } +
+ ); + } } export default Sponsors;