src/main/resources/public/css/conference.css

@@ -75,12 +75,6 @@
      margin: 5px;
 }
 
-.icon-edit-input-text{
-    width: 27px;
-    height: 27px;
-    float: right;
-}
-
 .grey-border{
     color: #495057;
     background-clip: padding-box;
@@ -93,3 +87,8 @@
     margin-left: 10px;
 }
 
+#cancel-button{
+    position: relative;
+    font-size: 1rem;
+}
+

src/main/resources/templates/conferences/conference.html

@@ -29,24 +29,18 @@
 
                                 <div class="form-group">
                                     <label for="title">Название:</label>
-                                    <img class="icon grey-border float-right icon-edit-input-text"
-                                         src="/img/conference/edit.png" alt="Редактировать"/>
                                     <input class="form-control" id="title" type="text"
                                            placeholder="Название конференции"/>
                                 </div>
 
                                 <div class="form-group">
                                     <label for="url">URL:</label>
-                                    <img class="icon grey-border float-right icon-edit-input-text"
-                                         src="/img/conference/edit.png" alt="Редактировать"/>
                                     <input class="form-control" id="url" type="text"
                                            placeholder="URL адрес"/>
                                 </div>
 
                                 <div class="form-group">
                                     <label for="description">Описание:</label>
-                                    <img class="icon grey-border float-right icon-edit-input-text"
-                                         src="/img/conference/edit.png" alt="Редактировать"/>
                                     <textarea class="form-control" rows="8" id="description">
                                     </textarea>
                                 </div>
@@ -58,8 +52,6 @@
                                             <input class="form-control deadline-text" type="text"
                                                    placeholder="Текст дедлайна"/>
                                             <input type="date"/>
-                                            <img class="icon grey-border" src="/img/conference/edit.png"
-                                                 alt="Редактировать"/>
                                             <img class="icon grey-border icon-delete" src="/img/conference/delete.png"
                                                  alt="Удалить"/>
                                         </div>
@@ -114,7 +106,7 @@
                                 </div>
 
                                 <div class="form-group d-flex justify-content-end">
-                                    <button id="take-part" class="btn btn-primary "
+                                    <button id="take-part" class="btn btn-primary"
                                             type="button">
                                         Принять участие
                                     </button>
@@ -149,17 +141,17 @@
 
                             <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 d-flex justify-content-between">
+                                    <button id="send-message-button" name="save"
+                                            class="btn btn-success text-uppercase"
+                                            type="submit">
+                                        Сохранить
+                                    </button>
+                                    <a id="cancel-button" class="btn btn-default text-uppercase"
+                                       href="/conferences/conferences">
+                                        Отмена
+                                    </a>
+                                </div>
                             </div>
                         </div>
                     </form>