fix style
This commit is contained in:
parent
5adcddc40a
commit
c2257739ef
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,6 +4,7 @@
|
||||
.idea
|
||||
.idea/*
|
||||
.gradle
|
||||
out
|
||||
build
|
||||
|
||||
# Log file
|
||||
|
@ -3,7 +3,7 @@ package ru.ulstu.model;
|
||||
import java.util.Date;
|
||||
|
||||
public class News {
|
||||
private final static int MAX_NEWS_TEXT_PREVIEW_LENGTH = 100;
|
||||
private final static int MAX_NEWS_TEXT_PREVIEW_LENGTH = 200;
|
||||
private final String title;
|
||||
private final Date date;
|
||||
private final String text;
|
||||
|
@ -1,11 +1,26 @@
|
||||
@media (min-width: 1200px) {
|
||||
.container {
|
||||
max-width: 970px;
|
||||
}
|
||||
}
|
||||
|
||||
.news {
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
.news-item {
|
||||
margin: 10px;
|
||||
margin: 20px;
|
||||
position: relative;
|
||||
text-align: justify;
|
||||
}
|
||||
|
||||
.news-date {
|
||||
font-size: 10px;
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 25px;
|
||||
}
|
||||
|
||||
.news-image {
|
||||
width: 300px;
|
||||
}
|
@ -10,7 +10,7 @@
|
||||
<head>
|
||||
<meta charset="UTF-8"/>
|
||||
<title th:text="#{messages.app-name}">app-name</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<script type="text/javascript" src="/webjars/jquery/3.6.0/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="/webjars/bootstrap/4.6.0/js/bootstrap.bundle.min.js"></script>
|
||||
<script type="text/javascript" src="/webjars/bootstrap-select/1.13.8/js/bootstrap-select.min.js"></script>
|
||||
@ -20,31 +20,31 @@
|
||||
<link rel="stylesheet" href="css/main.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<nav class="navbar navbar-expand-lg navbar-light bg-white">
|
||||
<nav class="navbar navbar-expand-md navbar-light bg-white">
|
||||
<a class="navbar-brand" href="/">
|
||||
<img src="img/logo.svg" width="50px">
|
||||
<div class="navbar-text" th:text="#{messages.logo-title}" style="font-size: 16px"></div>
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
|
||||
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<!-- <div class="collapse navbar-collapse" id="navbarSupportedContent">-->
|
||||
<!-- <ul class="navbar-nav mr-auto">-->
|
||||
<!-- <li class="nav-item active">-->
|
||||
<!-- <div th:text="#{messages.app-name}"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- </ul>-->
|
||||
<!-- </div>-->
|
||||
</nav>
|
||||
<div class="wrapper">
|
||||
<div id="sidebar" class="collapse navbar-collapse sidebar-mobile">
|
||||
<ul id="menu" class="list-unstyled">
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<ul class="navbar-nav mr-auto">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="news">Новости</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="news">Заседания</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="news">Отчеты</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</nav>
|
||||
<div class="wrapper">
|
||||
<div id="content">
|
||||
<div id="breadcrumbs" class="container-fluid">
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<ul id="messages" class="feedback-panel">
|
||||
<div class="alert alert-danger" role="alert" th:if="${error}" th:text="${error}">
|
||||
|
@ -14,9 +14,17 @@
|
||||
</head>
|
||||
<div class="container" layout:fragment="content">
|
||||
<div th:each="n : ${news}" class="news">
|
||||
<h5 th:text="${n.title}"/>
|
||||
<div th:text="${n.preview}" class="news-item"></div>
|
||||
<div th:text="${'Опубликовано: ' + n.date}" class="news-date"></div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<img class="news-image" src="img/logo.svg"/>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<h5 th:text="${n.title}"/>
|
||||
<div th:text="${n.preview}" class="news-item"></div>
|
||||
<div th:text="${'Опубликовано: ' + #calendars.format(n.date, 'dd.MM.yyyy HH:mm')}"
|
||||
class="news-date"></div>
|
||||
</div>
|
||||
</div>
|
||||
<hr/>
|
||||
</div>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user