Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-28 3f1889e77f861a8284770c85bdd83204f6863f39

 javaweb-plus/javaweb-admin/src/main/resources/templates/index.html

@@ -31,10 +31,16 @@
<!--                  <li class="logo">-->
<!--                <span class="logo-lg" >钻探工程平台</span>-->
<!--                 </li>-->
               <li style="margin: 36px auto;text-align: center">
               <li id="logo" style="margin: 36px auto;text-align: center">
                  <img th:src="@{/images/logo.png}">
               </li>
               </a>
				
            <li id="minilogo" style="display: none;height: 100px;align-content: center;">
               <a style="text-align: center;padding: 0;" th:href="@{/index}">
                  <img th:src="@{/images/minilogo.png}">
               </a>
            </li>

<!--               <li>-->
<!--                  <div class="user-panel">-->
@@ -175,7 +181,7 @@
        <div class="row border-bottom">
            <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
                <div class="navbar-header">
                    <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="#" title="收起菜单">
                    <a class="navbar-minimalize minimalize-styl-2" style="color:#565656;" href="#" title="收起菜单">
                       <i class="fa fa-bars"></i>
                    </a>
                </div>