From 79cfd7c0ab04778cf3e3165608633bb03d8d3700 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Mon, 25 Mar 2019 11:41:36 +0400
Subject: [PATCH] #53 added pagination style, css fixes

---
 src/main/resources/public/css/conference.css  | 35 ++++++++++++++++---
 .../templates/conferences/conferences.html    | 18 +++++-----
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index 0722a19..b7ff6d4 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -1,3 +1,7 @@
+body {
+    min-width: 400px;
+}
+
 .dashboard {
     margin-bottom: 10px;
 }
@@ -8,7 +12,7 @@
 }
 
 .year-filter {
-    width: 61px;
+    width: 65px;
     margin-right: 5px;
 }
 
@@ -55,6 +59,7 @@
 }
 
 .circle {
+    position: relative;
     width: 13px;
     height: 13px;
     margin: 10px 5px;
@@ -63,8 +68,13 @@
     border: 1px solid #fed136;
 }
 
-.circle-active {
-    background: #ffa129;
+.circle-active:before {
+    content: '';
+    position: absolute;
+    width: 11px;
+    height: 11px;
+    border-radius: 50%;
+    background: #ff9800;
 }
 
 .conference-info:hover {
@@ -88,6 +98,22 @@
     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;
     padding: 2px;
     cursor: pointer;
-
 }
 
 .icon-delete {
@@ -178,7 +203,7 @@
     font-size: 1rem;
 }
 
-.paper-control button{
+.paper-control button {
     margin: 0 0 10px 10px;
     float: right;
 }
diff --git a/src/main/resources/templates/conferences/conferences.html b/src/main/resources/templates/conferences/conferences.html
index d4c148b..d126f8e 100644
--- a/src/main/resources/templates/conferences/conferences.html
+++ b/src/main/resources/templates/conferences/conferences.html
@@ -75,14 +75,16 @@
                     </div>
                 </div>
             </div>
-            <div class="row justify-content-end">
-                <ul class="pagination">
-                    <li class="page-item disabled"><a class="page-link" href="#">Предыдущая</a></li>
-                    <li class="page-item active"><a class="page-link" href="#">1</a></li>
-                    <li class="page-item"><a class="page-link" href="#">2</a></li>
-                    <li class="page-item"><a class="page-link" href="#">3</a></li>
-                    <li class="page-item"><a class="page-link" href="#">Следующая</a></li>
-                </ul>
+            <div class="row row-bottom">
+                <div class="col-lg-12">
+                    <ul class="pagination justify-content-end">
+                        <li class="page-item disabled"><a class="page-link" href="#">Предыдущая</a></li>
+                        <li class="page-item active"><a class="page-link" href="#">1</a></li>
+                        <li class="page-item"><a class="page-link" href="#">2</a></li>
+                        <li class="page-item"><a class="page-link" href="#">3</a></li>
+                        <li class="page-item"><a class="page-link" href="#">Следующая</a></li>
+                    </ul>
+                </div>
             </div>
         </div>
     </section>