public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liuwu 2023-08-24 14:15:35 +08:00
parent ba2d233abd 9d5e27bdaf
commit 6a0535e15d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cyx-admin/src/main/resources/static/css/style.css
View File

@ -3339,8 +3339,8 @@ nav.page-tabs .page-tabs-content {
left: auto; left: auto;
} }
#content-main { {
height: calc(100% - 127px); height: calc(100% - 90px);
overflow: hidden; overflow: hidden;
} }

2
cyx-admin/src/main/resources/static/css/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
cyx-admin/src/main/resources/static/img/profile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

9
cyx-admin/src/main/resources/templates/index.html
View File

@ -274,9 +274,9 @@
<iframe class="RuoYi_iframe" frameborder="0" height="100%" name="iframe0" seamless <iframe class="RuoYi_iframe" frameborder="0" height="100%" name="iframe0" seamless
th:data-id="@{/system/main}" th:src="@{/system/main}" width="100%"></iframe> th:data-id="@{/system/main}" th:src="@{/system/main}" width="100%"></iframe>
</div> </div>
<div class="footer" th:if="${footer}"> <!-- <div class="footer" th:if="${footer}">-->
<div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright</div> <!-- <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright</div>-->
</div> <!-- </div>-->
</div> </div>
<!--右侧部分结束--> <!--右侧部分结束-->
</div> </div>
@ -294,6 +294,9 @@
<script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script> <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
<script th:inline="javascript"> <script th:inline="javascript">
window.history.forward(1); window.history.forward(1);
//默认隐藏左侧菜单
$("body").addClass("mini-navbar");
$(".navbar-default").find(".logo").addClass("hide");
var ctx = [[@{/}]]; var ctx = [[@{/}]];
var lockscreen = [[${session.lockscreen}]]; var lockscreen = [[${session.lockscreen}]];
if (lockscreen) { if (lockscreen) {

3
cyx-admin/src/main/resources/templates/login.html
View File

@ -55,9 +55,6 @@
</form> </form>
</div> </div>
</div> </div>
<div class="signup-footer">
Copyright © 2018-2023 ruoyi.vip All Rights Reserved.
</div>
<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script> <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
<!--[if lte IE 8]> <!--[if lte IE 8]>
<script>window.location.href = ctx + 'html/ie.html';</script><![endif]--> <script>window.location.href = ctx + 'html/ie.html';</script><![endif]-->

2
cyx-admin/src/main/resources/templates/system/user/profile/profile.html
View File

@ -16,7 +16,7 @@
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="text-center"> <div class="text-center">
<p class="user-info-head" onclick="avatar()"><img class="img-circle img-lg" th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}" th:onerror="'this.src=\'' + @{'/img/profile.jpg'} + '\''"></p> <p class="user-info-head" onclick="avatar()"><img class="img-circle img-lg" th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.png} : @{${user.avatar}}" th:onerror="'this.src=\'' + @{'/img/profile.jpg'} + '\''"></p>
<p><a href="javascript:avatar()">修改头像</a></p> <p><a href="javascript:avatar()">修改头像</a></p>
</div> </div>
<ul class="list-group list-group-striped"> <ul class="list-group list-group-striped">