From 2fec35264c5491d49aa0f677d0fe7cde8e9fb340 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Mon, 11 Mar 2019 12:58:40 +0400
Subject: [PATCH] #54 add back link, css fixes

---
 src/main/resources/public/css/conference.css  |  20 +++++++--
 .../resources/public/img/conference/back.png  | Bin 0 -> 307 bytes
 .../templates/conferences/conference.html     |  40 +++++++++---------
 3 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 src/main/resources/public/img/conference/back.png

diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index e29ef9a..38b12c4 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -1,3 +1,13 @@
+.col-lg-12 a{
+    position: absolute;
+    font-size: smaller;
+}
+
+.col-lg-12 a img{
+    width: 36px;
+    height: 33px;
+}
+
 .form-group textarea{
     min-height: 206px;
     max-height: 463px;
@@ -55,7 +65,7 @@
 }
 
 .icon-delete{
-    background: #ff4444;
+    background-color: #f44;
 }
 
 .icon-paper{
@@ -73,9 +83,13 @@
 
 .grey-border{
     color: #495057;
-    background-color: #fff;
     background-clip: padding-box;
     border: 1px solid #ced4da;
     border-radius: .25rem;
     transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
-}
\ No newline at end of file
+}
+
+#add-paper{
+    margin-left: 10px;
+}
+
diff --git a/src/main/resources/public/img/conference/back.png b/src/main/resources/public/img/conference/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..7667350d3643f051f4b4b3134515e3434643bcc8
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DU!E?GAr*{o&KNQ>FmN2+(D}^0
zD)3^rt3yzKNN$Mm8@b)b-)*c0Qzy5&vrBNe1WL5}w<>w4F5psBU}9xb+}h62qQJ0-
ziGxuwSE;FCMFwN5LWcq;SAejb<Rz0lJ%i`$65oyQb!y74aw$D`+kEkg%6mDEuAleZ
zoU`R#<!0;LKUL4qUUMmk75CmC%Nb)XAjlqc>&UbTW`<0;i@wQkOgulcow-2q4}an(
zK}GLQF>bq!b|*T|KQf8@w57IKSxtT4)Wjs`HU-r=r#4sqcMkBf5MR(<IhpN5$Ni~0
zlQuF*K3pcFt~1H#P^@R4Nx<3z5>H<}c=|N;J*(ln`Y68HM;d{lz~JfX=d#Wzp$Pyd
Cw|1`p

literal 0
HcmV?d00001

diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index e8b8935..7500f08 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -10,8 +10,12 @@
     <section id="conference">
         <div class="container">
             <div class="row">
-                <div class="col-lg-12 text-center">
-                    <h3 class="section-heading text-uppercase">Редактирование конференции</h3>
+                <div class="col-lg-12">
+                    <a class="d-flex align-items-center" href="/conferences/conferences">
+                        <img class="icon" src="/img/conference/back.png"/>
+                        Назад к списку конференций
+                    </a>
+                    <h3 class="section-heading text-uppercase text-center">Редактирование конференции</h3>
                 </div>
             </div>
             <hr/>
@@ -62,7 +66,7 @@
                                     </div>
                                 </div>
 
-                                <div class="form-group float-right">
+                                <div class="form-group d-flex justify-content-end">
                                     <input type="submit" id="add-deadline" name="add-deadline"
                                            class="btn btn-primary"
                                            value="Добавить дедлайн"/>
@@ -109,8 +113,8 @@
                                     </div>
                                 </div>
 
-                                <div class="form-group">
-                                    <button id="take-part" class="btn btn-primary"
+                                <div class="form-group d-flex justify-content-end">
+                                    <button id="take-part" class="btn btn-primary "
                                             type="button">
                                         Принять участие
                                     </button>
@@ -131,7 +135,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group">
+                                <div class="form-group d-flex justify-content-end">
                                     <button id="attach-paper" class="btn btn-primary"
                                             type="button">
                                         Прикрепить статью
@@ -141,23 +145,21 @@
                                         Добавить статью
                                     </button>
                                 </div>
-
-
                             </div>
 
                             <div class="clearfix"></div>
                             <div class="col-lg-12">
-                                <div class="form-group">
-                                    <button id="sendMessageButton" name="save"
-                                            class="btn btn-success text-uppercase"
-                                            type="submit">
-                                        Сохранить
-                                    </button>
-                                    <a id="cancelButton" class="btn btn-default text-uppercase"
-                                       href="/conferences/conferences">
-                                        Отмена
-                                    </a>
-                                </div>
+                                <!--<div class="form-group">-->
+                                <!--<button id="sendMessageButton" name="save"-->
+                                <!--class="btn btn-success text-uppercase"-->
+                                <!--type="submit">-->
+                                <!--Сохранить-->
+                                <!--</button>-->
+                                <!--<a id="cancelButton" class="btn btn-default text-uppercase"-->
+                                <!--href="/conferences/conferences">-->
+                                <!--Отмена-->
+                                <!--</a>-->
+                                <!--</div>-->
                             </div>
                         </div>
                     </form>