romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#53 added pagination style, css fixes

Browse Source
This commit is contained in:
Nightblade73 2019-03-25 11:41:36 +04:00
parent cc1f5c00c5
commit 79cfd7c0ab
2 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/resources/public/css/conference.css
View File

@ -1,3 +1,7 @@
body {
min-width: 400px;
}
.dashboard { .dashboard {
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -8,7 +12,7 @@
} }
.year-filter { .year-filter {
width: 61px; width: 65px;
margin-right: 5px; margin-right: 5px;
} }
@ -55,6 +59,7 @@
} }
.circle { .circle {
position: relative;
width: 13px; width: 13px;
height: 13px; height: 13px;
margin: 10px 5px; margin: 10px 5px;
@ -63,8 +68,13 @@
border: 1px solid #fed136; border: 1px solid #fed136;
} }
.circle-active { .circle-active:before {
background: #ffa129; content: '';
position: absolute;
width: 11px;
height: 11px;
border-radius: 50%;
background: #ff9800;
} }
.conference-info:hover { .conference-info:hover {
@ -88,6 +98,22 @@
height: auto; height: auto;
} }
.row-bottom {
margin-top: 10px;
}
.pagination li a {
color: #000;
}
.pagination li a:hover {
color: #000;
}
.pagination .active .page-link {
background-color: #ff9800;
border-color: #ff9800;
}
@ -146,7 +172,6 @@
height: 38px; height: 38px;
padding: 2px; padding: 2px;
cursor: pointer; cursor: pointer;
} }
.icon-delete { .icon-delete {
@ -178,7 +203,7 @@
font-size: 1rem; font-size: 1rem;
} }
.paper-control button{ .paper-control button {
margin: 0 0 10px 10px; margin: 0 0 10px 10px;
float: right; float: right;
} }

18
src/main/resources/templates/conferences/conferences.html
View File

@ -75,14 +75,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row justify-content-end"> <div class="row row-bottom">
<ul class="pagination"> <div class="col-lg-12">
<li class="page-item disabled"><a class="page-link" href="#">Предыдущая</a></li> <ul class="pagination justify-content-end">
<li class="page-item active"><a class="page-link" href="#">1</a></li> <li class="page-item disabled"><a class="page-link" href="#">Предыдущая</a></li>
<li class="page-item"><a class="page-link" href="#">2</a></li> <li class="page-item active"><a class="page-link" href="#">1</a></li>
<li class="page-item"><a class="page-link" href="#">3</a></li> <li class="page-item"><a class="page-link" href="#">2</a></li>
<li class="page-item"><a class="page-link" href="#">Следующая</a></li> <li class="page-item"><a class="page-link" href="#">3</a></li>
</ul> <li class="page-item"><a class="page-link" href="#">Следующая</a></li>
</ul>
</div>
</div> </div>
</div> </div>
</section> </section>