对导航菜单进行优化 (#2494)

* 对导航菜单进行优化 * 调整style.css
hhyo · Feb 3, 2024 · b390854 · b390854 · te87037 · May 21, 2024
1 parent 8bec5f4
commit b390854
Show file tree

Hide file tree

Showing 6 changed files with 137 additions and 84 deletions.
diff --git a/common/static/dist/css/login.css b/common/static/dist/css/login.css
diff --git a/common/static/sb-admin-2/css/sb-admin-2.css b/common/static/sb-admin-2/css/sb-admin-2.css
@@ -68,52 +68,6 @@ body {
   right: 0;
   left: auto;
 }
-.sidebar .sidebar-nav.navbar-collapse {
-  padding-left: 0;
-  padding-right: 0;
-}
-.sidebar .sidebar-search {
-  padding: 15px;
-}
-.sidebar ul li {
-  border-bottom: 1px solid #e7e7e7;
-}
-.sidebar ul li a.active {
-  background-color: #eeeeee;
-}
-.sidebar .arrow {
-  float: right;
-}
-.sidebar .fa.arrow:before {
-  content: "\f104";
-}
-.sidebar .active > a > .fa.arrow:before {
-  content: "\f107";
-}
-.sidebar .nav-second-level li,
-.sidebar .nav-third-level li {
-  border-bottom: none !important;
-}
-.sidebar .nav-second-level li a {
-  padding-left: 37px;
-}
-.sidebar .nav-third-level li a {
-  padding-left: 52px;
-}
-@media (min-width: 768px) {
-  .sidebar {
-    z-index: 1;
-    position: absolute;
-    width: 200px;
-    margin-top: 51px;
-  }
-
-  .navbar-top-links .dropdown-messages,
-  .navbar-top-links .dropdown-tasks,
-  .navbar-top-links .dropdown-alerts {
-    margin-left: auto;
-  }
-}
 .btn-outline {
   color: inherit;
   background-color: transparent;

diff --git a/common/static/style.css b/common/static/style.css
diff --git a/common/templates/base.html b/common/templates/base.html
@@ -18,11 +18,7 @@
     <link href="{% static 'bootstrap-select/css/bootstrap-select.min.css' %}" rel="stylesheet">
     <link href="{% static 'bootstrap-table/css/bootstrap-table.min.css' %}" rel="stylesheet">
     <link href="{% static 'bootstrap-switch/css/bootstrap-switch.min.css' %}" rel="stylesheet">
-    <style type="text/css">
-    table{
-        max-width: none !important;      /*解决 ios 横向滚动失效*/
-    }
-    </style>
+    <link href="{% static 'style.css' %}" rel="stylesheet">
     <!-- django i18n -->
     <script type="text/javascript" src="{% url 'sql:javascript-catalog' %}"></script>
 </head>

diff --git a/common/templates/login.html b/common/templates/login.html
@@ -6,14 +6,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- 引入 Bootstrap -->
     <link href="{% static 'bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
-    <link href="{% static 'dist/css/login.css' %}" rel="stylesheet">
     <!-- HTML5 Shim 和 Respond.js 用于让 IE8 支持 HTML5元素和媒体查询 -->
     <!-- 注意： 如果通过 file://  引入 Respond.js 文件，则该文件无法起效果 -->
     <!--[if lt IE 9]>
          <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
          <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
       <![endif]-->
     <link rel="shortcut icon" href="{% static 'img/favicon.ico' %}" />
+    <link href="{% static 'style.css' %}" rel="stylesheet">
 </head>
 <body style="background-color:#edeff1;">
 <div class="row lsb-login">

diff --git a/sql/templates/sqlworkflow.html b/sql/templates/sqlworkflow.html
@@ -37,7 +37,7 @@
             </div>
         </div>
         <div class="form-group ">
-            <button id="btn_add" type="button" class="btn btn-default"
+            <button id="btn_add" type="button" class="btn btn-success"
                     onclick="window.location.href='/submitsql/'">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                 提交SQL