diff --git a/public/react/src/components/mini-pagination/index.less b/public/react/src/components/mini-pagination/index.less index a1e9f053d..b6ce51ff8 100644 --- a/public/react/src/components/mini-pagination/index.less +++ b/public/react/src/components/mini-pagination/index.less @@ -55,6 +55,11 @@ background-color: #f7f8fa; border-color: #e6e7eb; color: #e0e0e0; + + &:before { + border-top: 1px solid #e0e0e0; + border-left: 1px solid #e0e0e0; + } } } } \ No newline at end of file diff --git a/public/react/src/index.js b/public/react/src/index.js index b14646e0d..18c11c03f 100644 --- a/public/react/src/index.js +++ b/public/react/src/index.js @@ -1,7 +1,7 @@ import React from 'react' import ReactDOM from 'react-dom' import './index.css' -import App from './app-test' +import App from './App' import * as serviceWorker from './serviceWorker' window.__useKindEditor = false; diff --git a/public/react/src/modules/courses/coursesHome/CoursesHome.js b/public/react/src/modules/courses/coursesHome/CoursesHome.js index 94267dc94..df3a03b61 100644 --- a/public/react/src/modules/courses/coursesHome/CoursesHome.js +++ b/public/react/src/modules/courses/coursesHome/CoursesHome.js @@ -2,13 +2,13 @@ import React, { Component, Fragment } from 'react'; import { getImageUrl } from 'educoder'; import CoursesHomeCard from "./CoursesHomeCard.js" import axios from 'axios'; -import { Pagination } from 'antd'; import LoadingSpin from '../../../common/LoadingSpin'; import UpgradeModals from '../../modals/UpgradeModals'; import './css/CoursesHome.css'; import '../../tpm/shixuns/shixun-keyword-list.less'; import btnNew from './btn-new.png' import btnJoin from './btn-join.png' +import Pagination from '../../../components/mini-pagination' class CoursesHome extends Component { constructor(props) { diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index d48438cd7..b8b125842 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -7,6 +7,7 @@ import UpgradeModals from '../modals/UpgradeModals'; import './ShixunPaths.css'; import KeywordList from '../tpm/shixuns/shixun-keyword-list'; import btnUrl from './btn-new.png'; +import Pagination from '../../components/mini-pagination' class ShixunPathSearch extends Component { constructor(props) { diff --git a/public/react/src/modules/tpm/shixuns/shixun-card.js b/public/react/src/modules/tpm/shixuns/shixun-card.js index a5455bd17..c673ac4e2 100644 --- a/public/react/src/modules/tpm/shixuns/shixun-card.js +++ b/public/react/src/modules/tpm/shixuns/shixun-card.js @@ -1,7 +1,8 @@ import React from 'react'; import { getImageUrl, setImagesUrl, getUrl } from 'educoder'; -import { Spin, Tooltip, Rate, Pagination } from 'antd'; +import { Spin, Tooltip, Rate } from 'antd'; import './shixunCss/shixunCard.less'; +import Pagination from '../../../components/mini-pagination' export default ({ middleshixundata, pagination, typepvisible, pages, totalcount, shixunsPage }) => { function onPageChange(number) {