From 7abd517cf1b62f72967dca0efb3a8074d822e6f6 Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Tue, 9 Jul 2024 17:22:57 +0800
Subject: [PATCH] css update

---
 themes/beauty/views/site/index.php | 32 +++++++++++++++---------------
 www/css/beauty.css                 | 23 ++++++++++++++++++---
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/themes/beauty/views/site/index.php b/themes/beauty/views/site/index.php
index d9ad1a7..cd83432 100644
--- a/themes/beauty/views/site/index.php
+++ b/themes/beauty/views/site/index.php
@@ -20,7 +20,19 @@
         </div>
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="nav navbar-nav">
+            <div class="nb_right nav navbar-nav navbar-right hidden-xs">
+                <img class="svg icon1 svgimg verMiddle cleanCacheJS" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="width:24px">
+                <img class="svg icon1 svgimg iconr2 lampJS verMiddle" src="/img/beauty/buld.svg" alt="点击关灯/开灯" title="点击关灯/开灯">
+                <img class="icon1 svg connectmeJS svgimg iconr2 verMiddle" src="/img/beauty/contactUs.svg" alt="联系我们" title="联系我们" />
+            </div>
+            <form class="navbar-form navbar-right">
+                <div class="form-group">
+                    <input type="text" class="form-control" placeholder="搜索图片名称">
+                </div>
+                <button type="submit" class="btn btn-default">搜索</button>
+            </form>
+
+            <ul class="nav navbar-fixed-left">
                 <?php
                 $selectedId = $viewData['cateId'];
                 $breadcrumbs = !empty($viewData['breadcrumbs']) ? $viewData['breadcrumbs'] : [];
@@ -34,23 +46,13 @@ eof;
                 }
                 ?>
             </ul>
-            <?php /*
-            <form class="navbar-form navbar-left">
-                <div class="form-group">
-                    <input type="text" class="form-control" placeholder="搜索图片名称">
-                </div>
-                <button type="submit" class="btn btn-default">搜索</button>
-            </form>
-            */ ?>
-            <div class="nb_right nav navbar-nav navbar-right hidden-xs">
-                <img class="svg icon1 svgimg verMiddle cleanCacheJS" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="width:24px">
-                <img class="svg icon1 svgimg iconr2 lampJS verMiddle" src="/img/beauty/buld.svg" alt="点击关灯/开灯" title="点击关灯/开灯">
-                <img class="icon1 svg connectmeJS svgimg iconr2 verMiddle" src="/img/beauty/contactUs.svg" alt="联系我们" title="联系我们" />
-            </div>
         </div><!-- /.navbar-collapse -->
     </div><!-- /.container-fluid -->
 </nav>
 
+<!-- 内容主题 -->
+<div class="img_main">
+
 <?php
 if (!empty($breadcrumbs)) {
     echo <<<eof
@@ -76,8 +78,6 @@ eof;
 }
 ?>
 
-<!-- 内容主题 -->
-<div class="img_main">
     <div class="im_mainl row">
         <?php
         $imgExts = !empty(FSC::$app['config']['supportedImageExts']) ? FSC::$app['config']['supportedImageExts'] : array('jpg', 'jpeg', 'png', 'webp', 'gif');
diff --git a/www/css/beauty.css b/www/css/beauty.css
index a1346a9..b78d8f2 100644
--- a/www/css/beauty.css
+++ b/www/css/beauty.css
@@ -40,7 +40,6 @@ a:link{text-decoration:none}
         1px 1px 5px rgb(183 183 183 / 80%);
 }
 .navbar .navbar-brand img{width:30px;display:inline-block}
-/* .navbar{box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, .6)} */
 .navbar .navbar-toggle{padding:0;border:none;margin-top:10px}
 .navbar .mr_button{border:none;background:none}
 .svgimg{width:2em;height:2em;vertical-align:middle;fill: currentColor;overflow: hidden}
@@ -49,10 +48,26 @@ a:link{text-decoration:none}
 .navbar .svg:hover{color:#000}
 .navbar .navbar-toggle:focus,
 .navbar .navbar-toggle:hover{background:none}
-.nb_right{padding:10px 2% 0 0}
+.nb_right{padding:10px 13px 0 0}
 .nb_right .iconr2{margin:3px 0 0 10px}
 
-.img_main{min-height:510px}
+.navbar-fixed-left{
+    position: fixed;
+    left: 0;
+    top: 52px;
+    width: 160px;
+    background-color: #FFF;
+    overflow-y: auto;
+    bottom: 0;
+    z-index: 1000;
+}
+.navbar-fixed-left .active a{background-color:#e7e7e7;color:#555}
+.lampshow .navbar-fixed-left{background-color:#222}
+.lampshow .navbar-fixed-left a{color:#DDD}
+.lampshow .navbar-fixed-left .active a{background-color:#e7e7e7;color:#555}
+.lampshow .navbar-fixed-left a:hover{background-color:#CCC;color:#444}
+
+.img_main{min-height:510px;margin-left:160px}
 .im_mainl{margin:0 10px 12px 10px}
 .bor_radius{border-radius:10px}
 .im_img{transform:scale(1);transition:all 0.5s ease;object-fit:cover;display:block;width:100%;height:100%}
@@ -122,6 +137,8 @@ a:link{text-decoration:none}
         height: 45vw;
     }
     .hidden-xs{display:none}
+    .navbar-fixed-left{position:static;width:100%}
+    .img_main{margin-left:0}
 }
 
 @keyframes musicTurn {