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

#54 add back link, css fixes

Browse Source
merge-requests/26/head
Nightblade73 5 years ago
parent f90d92b19d
commit 2fec35264c
3 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File

20
src/main/resources/public/css/conference.css
Unescape Escape View File

@ -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{ .form-group textarea{
min-height: 206px; min-height: 206px;
max-height: 463px; max-height: 463px;
@ -55,7 +65,7 @@
} }
.icon-delete{ .icon-delete{
background: #ff4444; background-color: #f44;
} }
.icon-paper{ .icon-paper{
@ -73,9 +83,13 @@
.grey-border{ .grey-border{
color: #495057; color: #495057;
background-color: #fff;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ced4da; border: 1px solid #ced4da;
border-radius: .25rem; border-radius: .25rem;
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
} }
#add-paper{
margin-left: 10px;
}

BIN
src/main/resources/public/img/conference/back.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

40
src/main/resources/templates/conferences/conference.html
Unescape Escape View File

@ -10,8 +10,12 @@
<section id="conference"> <section id="conference">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-12 text-center"> <div class="col-lg-12">
<h3 class="section-heading text-uppercase">Редактирование конференции</h3> <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>
</div> </div>
<hr/> <hr/>
@ -62,7 +66,7 @@
</div> </div>
</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" <input type="submit" id="add-deadline" name="add-deadline"
class="btn btn-primary" class="btn btn-primary"
value="Добавить дедлайн"/> value="Добавить дедлайн"/>
@ -109,8 +113,8 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> type="button">
Принять участие Принять участие
</button> </button>
@ -131,7 +135,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group d-flex justify-content-end">
<button id="attach-paper" class="btn btn-primary" <button id="attach-paper" class="btn btn-primary"
type="button"> type="button">
Прикрепить статью Прикрепить статью
@ -141,23 +145,21 @@
Добавить статью Добавить статью
</button> </button>
</div> </div>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="col-lg-12"> <div class="col-lg-12">
<div class="form-group"> <!--<div class="form-group">-->
<button id="sendMessageButton" name="save" <!--<button id="sendMessageButton" name="save"-->
class="btn btn-success text-uppercase" <!--class="btn btn-success text-uppercase"-->
type="submit"> <!--type="submit">-->
Сохранить <!--Сохранить-->
</button> <!--</button>-->
<a id="cancelButton" class="btn btn-default text-uppercase" <!--<a id="cancelButton" class="btn btn-default text-uppercase"-->
href="/conferences/conferences"> <!--href="/conferences/conferences">-->
Отмена <!--Отмена-->
</a> <!--</a>-->
</div> <!--</div>-->
</div> </div>
</div> </div>
</form> </form>

Write Preview
Loading…
Cancel
Save