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

Labels Milestones

New Pull Request

Resolve "Вёрстка страницы просмотра информации о конференции" #153

Merged
romanov73 merged 1 commits from 54-view-conference into dev 5 years ago
Conversation 16 Commits 1 Files Changed 2
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

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

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

@ -29,24 +29,18 @@
<div class="form-group"> <div class="form-group">
<label for="title">Название:</label> <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" <input class="form-control" id="title" type="text"
placeholder="Название конференции"/> placeholder="Название конференции"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="url">URL:</label> <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" <input class="form-control" id="url" type="text"
placeholder="URL адрес"/> placeholder="URL адрес"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="description">Описание:</label> <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 class="form-control" rows="8" id="description">
</textarea> </textarea>
</div> </div>
@ -58,8 +52,6 @@
<input class="form-control deadline-text" type="text" <input class="form-control deadline-text" type="text"
placeholder="Текст дедлайна"/> placeholder="Текст дедлайна"/>
<input type="date"/> <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" <img class="icon grey-border icon-delete" src="/img/conference/delete.png"
alt="Удалить"/> alt="Удалить"/>
</div> </div>
@ -114,7 +106,7 @@
</div> </div>
<div class="form-group d-flex justify-content-end"> <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>
@ -149,17 +141,17 @@
<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 d-flex justify-content-between">
<!--<button id="sendMessageButton" name="save"--> <button id="send-message-button" 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="cancel-button" 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