Tenlion/twoduty
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ly19960718 2021-06-15 10:45:34 +08:00
commit 831a3e59ab
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/static/assets/web/css/style.css
View File

@ -165,10 +165,10 @@
.news-container .news-list ul li span{float: right;font-size: 18px;color: #333} .news-container .news-list ul li span{float: right;font-size: 18px;color: #333}
.street{width: 32%;background: #fff;padding: 15px;box-sizing: border-box;box-shadow: 0 0 10px #eee;float:right;overflow:hidden;height: 420px;} .street{width: 32%;background: #fff;padding: 15px;box-sizing: border-box;box-shadow: 0 0 10px #eee;float:right;overflow:hidden;height: 420px;}
.street-box{width: 100%;height: 100%;} .street-box{width: 100%;height: 100%;}
.street a{display: block;padding: 0 5px;box-sizing:border-box;white-space:nowrap;overflow: hidden;text-overflow: ellipsis;float:left;margin-bottom: 10px;width:49%;background: #064ec0;color: #fff;text-align: center;line-height: 35px;border-radius: 5px;} .street a{display: block;padding: 0 5px;box-sizing:border-box;white-space:nowrap;overflow: hidden;text-overflow: ellipsis;float:left;margin-bottom: 15px;width:49%;background: #064ec0;color: #fff;text-align: center;line-height: 35px;border-radius: 5px;}
.street a:hover{background: rgba(6,78,192,0.8)} .street a:hover{background: rgba(6,78,192,0.8)}
.street a:nth-child(even){float:right} .street a:nth-child(even){float:right}
.street a img{display: block;margin: 5px auto 0;} .street a img{display: block;margin: 10px auto 0;}
@media (min-width: 1420px){ @media (min-width: 1420px){
.banner{ .banner{
height: 450px height: 450px

6
src/main/resources/templates/index.html
View File

@ -72,8 +72,10 @@
</li> </li>
<li class="log-out"> <li class="log-out">
<div class="left fl"> <div class="left fl">
<span th:text="${userName}" th:if="${userUserName eq 'admin'}"></span> <!-- <span th:text="${userName}" th:if="${userUserName eq 'admin'}"></span>-->
<span th:text="${userName}" th:if="${userUserName ne 'admin'}" class="not-admin"></span> <span th:text="${userName}"></span>
<!-- <span th:text="${userName}" th:if="${userUserName ne 'admin'}" class="not-admin"></span>-->
<!-- <a href="default-main" th:if="${userUserName eq 'admin'}">后台</a>-->
<a href="default-main" th:if="${userUserName eq 'admin'}">后台</a> <a href="default-main" th:if="${userUserName eq 'admin'}">后台</a>
</div> </div>
<div class="right fr"> <div class="right fr">