Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций" Closes #53 See merge request romanov73/ng-tracker!33environments/staging/deployments/6
Anton Romanov
5 years ago
commit
e98445bb48
@ -1,94 +1,122 @@
|
||||
.col-lg-12 a{
|
||||
position: absolute;
|
||||
font-size: smaller;
|
||||
body {
|
||||
min-width: 400px;
|
||||
}
|
||||
|
||||
.col-lg-12 a img{
|
||||
width: 36px;
|
||||
height: 33px;
|
||||
}
|
||||
|
||||
.form-group textarea{
|
||||
|
||||
|
||||
.form-group textarea {
|
||||
min-height: 206px;
|
||||
max-height: 463px;
|
||||
}
|
||||
|
||||
|
||||
.deadline-list{
|
||||
.deadline-list {
|
||||
height: 200px;
|
||||
padding: 0px;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.deadline{
|
||||
.deadline {
|
||||
margin: 0;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
.deadline-text{
|
||||
.deadline-text {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.member-list{
|
||||
.member-list {
|
||||
height: 200px;
|
||||
padding: 0px;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.member{
|
||||
.member {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.paper-list{
|
||||
.paper-list {
|
||||
height: 200px;
|
||||
padding: 0px;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.paper{
|
||||
.paper {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.paper-name{
|
||||
.paper-name {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.paper-name span{
|
||||
.paper-name span {
|
||||
margin: 6px 15px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.icon{
|
||||
.icon {
|
||||
width: 38px;
|
||||
height: 38px;
|
||||
padding: 2px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-delete{
|
||||
.icon-delete {
|
||||
background-color: #f44;
|
||||
}
|
||||
|
||||
.icon-paper{
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
float: right;
|
||||
margin: 5px;
|
||||
.icon-delete:hover {
|
||||
background-color: #ff2929;
|
||||
transition: background-color .15s ease-in-out;
|
||||
}
|
||||
|
||||
.grey-border{
|
||||
.icon-paper {
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
float: right;
|
||||
margin: 5px;
|
||||
}
|
||||
|
||||
.grey-border {
|
||||
color: #495057;
|
||||
background-clip: padding-box;
|
||||
border: 1px solid #ced4da;
|
||||
border-radius: .25rem;
|
||||
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
|
||||
}
|
||||
|
||||
#add-paper{
|
||||
margin-left: 10px;
|
||||
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
|
||||
}
|
||||
|
||||
#cancel-button{
|
||||
#cancel-button {
|
||||
position: relative;
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.paper-control button {
|
||||
margin: 0 0 10px 10px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
@media (max-width: 1199px) {
|
||||
.paper-control {
|
||||
display: block!important;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 991px) {
|
||||
.dates-panel {
|
||||
display: block!important;
|
||||
}
|
||||
|
||||
.date {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.dashboard-elements {
|
||||
display: block!important;
|
||||
}
|
||||
|
||||
.dashboard-right {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
$(document).ready(function () {
|
||||
|
||||
$('.data-href-js').click( function() {
|
||||
window.location = $(this).attr('data-href');
|
||||
});
|
||||
|
||||
$('.circle').parent().click( function() {
|
||||
$(this).children('.circle').toggleClass('circle-active');
|
||||
});
|
||||
|
||||
$('.checkbox-js').parent().click( function() {
|
||||
$(this).children('.checkbox').toggleClass('selected');
|
||||
});
|
||||
|
||||
$('#select-all-js').click( function() {
|
||||
$(this).toggleClass('selected');
|
||||
|
||||
var childNodes = $('.conference-item .form-check .checkbox')
|
||||
.each(function(i, elem) {
|
||||
if ($(this).hasClass('selected') && !$('#select-all-js').hasClass('selected')) {
|
||||
$(this).toggleClass('selected');
|
||||
} else if (!$(this).hasClass('selected') && $('#select-all-js').hasClass('selected')){
|
||||
$(this).toggleClass('selected');
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en"
|
||||
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
layout:decorator="default" xmlns:th="">
|
||||
<head>
|
||||
<link rel="stylesheet" type="text/css" href="../css/conference.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<div layout:fragment="content">
|
||||
<section id="conference">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h3 class="section-heading text-uppercase text-center">Актуальные конференции</h3>
|
||||
<div th:replace="conferences/fragments/confNavigationFragment"/>
|
||||
</div>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,21 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head th:fragment="headerfiles">
|
||||
<meta charset="UTF-8"/>
|
||||
</head>
|
||||
<body>
|
||||
<div th:fragment="confDashboard (conference)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
|
||||
<div class="row">
|
||||
<div class="col-2">
|
||||
|
||||
</div>
|
||||
<div class="col col-10 text-right">
|
||||
<h7 class="service-heading"> title</h7>
|
||||
<p class="text-muted"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,23 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head th:fragment="headerfiles">
|
||||
<meta charset="UTF-8"/>
|
||||
</head>
|
||||
<body>
|
||||
<div th:fragment="confLine (conference)" class="row text-left paper-row" style="background-color: white;">
|
||||
<div class="col">
|
||||
<a href="/conference">
|
||||
<span class="h6"></span>
|
||||
<span class="text-muted"></span>
|
||||
</a>
|
||||
<input class="id-class" type="hidden"/>
|
||||
<a class="remove-paper pull-right d-none"
|
||||
data-confirm="Удалить статью?">
|
||||
<i class="fa fa-trash" aria-hidden="true"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,29 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head th:fragment="headerfiles">
|
||||
<meta charset="UTF-8"/>
|
||||
</head>
|
||||
<body>
|
||||
<div class="row justify-content-center control-panel">
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
|
||||
<a href="./conferences" class="btn btn-light toolbar-button">
|
||||
<i class="fa fa-list-alt"></i>
|
||||
Весь список</a>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
|
||||
<a href="./actual" class="btn btn-light toolbar-button">
|
||||
<i class="fa fa-newspaper-o" aria-hidden="true"></i>
|
||||
Актуальное</a>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
|
||||
<a href="./conference?id=0" class="btn btn-light toolbar-button">
|
||||
<i class="fa fa-plus-circle" aria-hidden="true"></i>
|
||||
Добавить конференцию</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue