Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #2

Closed
wants to merge 4 commits into from
Closed

Master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d89dec2
continous commit
Jan 10, 2024
2f991ed
merge from dev branch
Jan 10, 2024
d08d7a5
refactory Pagination widget
Jan 10, 2024
d012cdb
continous refactory
Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/assets/frontend/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1956,6 +1956,11 @@ section {
transition: 0.3s;
}

.blog .blog-pagination li.active,
.blog .blog-pagination li:hover {
background: #94c045;
}

.blog .blog-pagination li a {
color: #3c4133;
padding: 7px 16px;
Expand All @@ -1964,15 +1969,50 @@ section {
justify-content: center;
}

.blog .blog-pagination li.active,
.blog .blog-pagination li:hover {
background: #94c045;
/*
.blog .blog-pagination .dots:hover {
background-color: transparent;
cursor: default;
}

.blog .blog-pagination :hover {
background-color: rgba(0, 0, 0, 0.04);
cursor: pointer;
}

.blog .blog-pagination .selected {
background-color: rgba(0, 0, 0, 0.08);
}

.blog .blog-pagination .arrow::before {
position: relative;
content: '';
display: inline-block;
width: 0.4em;
height: 0.4em;
border-right: 0.12em solid rgba(0, 0, 0, 0.87);
border-top: 0.12em solid rgba(0, 0, 0, 0.87);
}

.blog .blog-pagination .disabled {
pointer-events: none;
}

.blog .blog-pagination .disabled .arrow::before {
border-right: 0.12em solid rgba(0, 0, 0, 0.43);
border-top: 0.12em solid rgba(0, 0, 0, 0.43);
}

.blog .blog-pagination .disabled:hover {
background-color: transparent;
cursor: default;
}

.blog .blog-pagination li.active a,
.blog .blog-pagination li:hover a {
color: #fff;
}
*/

.blog .sidebar {
padding: 30px;
Expand Down Expand Up @@ -2283,4 +2323,4 @@ section {
text-align: center;
font-size: 13px;
color: #fff;
}
}
8 changes: 7 additions & 1 deletion client/src/pages/Blog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function Blog() {
<time
dateTime={format(new Date(post.created_at), 'dd-mm-yyyy')}
>
{format(new Date(post.created_at), 'dd MMM yyyy')}
{new Date(post.created_at).toDateString()}
</time>
</Link>
</li>
Expand All @@ -88,6 +88,7 @@ function Blog() {

<div className="mb-5 blog-pagination">
{posts && (<Pagination
className="justify-content-center"
currentPage={currentPage}
totalCount={posts.length}
pageSize={pageSize}
Expand All @@ -112,3 +113,8 @@ function Blog() {
}

export default Blog;


/*

*/
Loading