Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/priyo-dev' into rupok-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
rupok committed Sep 2, 2019
2 parents f23f174 + a2ef024 commit fa47d00
Show file tree
Hide file tree
Showing 22 changed files with 312 additions and 106 deletions.
44 changes: 43 additions & 1 deletion admin/assets/css/notificationx-admin-global.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,18 @@

/* CSS for Admin Page */
.nx-admin-wrapper {
padding: 30px 15px;
padding: 30px 20px 30px 15px;
}

.nx-admin-header {
display: flex;
align-items: center;
}

.nx-admin-header > img {
width: 300px;
}

.nx-admin-header a.nx-add-new-btn {
margin-left: 40px;
background-color: #fff;
Expand Down Expand Up @@ -232,6 +236,44 @@
color: #313236;
}

.nx-admin-items-pagination ul {
margin: 0px;
display: flex;
align-items: center;
}

.nx-admin-items-pagination ul > li {
display: inline-block;
margin-right: 5px;
margin-bottom: 0px;
}
.nx-admin-items-pagination ul > li > a:focus {
outline: none;
box-shadow: none;
}
.nx-admin-items-pagination ul > li > a {
display: flex;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
border: 1px solid #5614d5;
text-align: center;
font-weight: 600;
text-decoration: none;
line-height: 30px;
color: #5614d5;
border-radius: 3px;
transition: all 0.1s ease-in;
}

.nx-admin-items-pagination ul > li.nx-current-page > a,
.nx-admin-items-pagination ul > li > a:hover {
background-color: #2ec7ad;
border-color: #2ec7ad;
color: #fff;
}

.nx-admin-type,
.nx-admin-date .nx-admin-publish-status,
.nx-admin-title>strong {
Expand Down
2 changes: 1 addition & 1 deletion admin/assets/css/nx-admin-global.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion admin/assets/css/nx-admin.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit fa47d00

Please sign in to comment.