From 6ee8b893fd3241f006ea595acab6312a391f049c Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 16 Mar 2020 13:19:45 +0800 Subject: [PATCH] change to mini-pagination --- public/react/src/components/mini-pagination/index.less | 5 +++++ public/react/src/modules/courses/coursesHome/CoursesHome.js | 2 +- public/react/src/modules/paths/ShixunPathSearch.js | 1 + public/react/src/modules/tpm/shixuns/shixun-card.js | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) 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/modules/courses/coursesHome/CoursesHome.js b/public/react/src/modules/courses/coursesHome/CoursesHome.js index 3ad4e805f..965159832 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.scss'; 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 3ae7c5cac..7fd2f6ae6 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -9,6 +9,7 @@ import '@icedesign/base/lib/pagination/style.js'; 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 f33f4f157..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 './shixunCss/shixunCard.scss'; +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) {