From 2ff082808d228b54bc83018c9724c8af90e8af06 Mon Sep 17 00:00:00 2001 From: Finovy Technology Date: Mon, 29 Jan 2024 12:54:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E5=AF=BC=E8=88=AA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/static/dist/css/style.css | 134 ++++++++++++++++++++ common/static/sb-admin-2/css/sb-admin-2.css | 46 ------- common/templates/base.html | 6 +- common/templates/login.html | 2 +- sql/templates/sqlworkflow.html | 2 +- 5 files changed, 137 insertions(+), 53 deletions(-) create mode 100644 common/static/dist/css/style.css diff --git a/common/static/dist/css/style.css b/common/static/dist/css/style.css new file mode 100644 index 0000000000..526b0ee946 --- /dev/null +++ b/common/static/dist/css/style.css @@ -0,0 +1,134 @@ +body { + font-family: Candara, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; +} +a { + color: #222; +} +.fa { + color: #666; +} +.fa.fa-5x { + color: white; +} +.fa.fa-fw { + margin-right: 10px; +} +a:hover { + color: #555555; +} +.navbar-brand strong { + font-size: 26px; + font-family: Candara Light, serif; + margin-left: 4px; + letter-spacing: 2px; +} +.navbar-brand > img { + height: 50px; +} +.user-bottom-div { + display: block; + text-align: center; + background-color: #ddd; + position: fixed; + bottom: 0; + width: 100%; + height: 50px; + line-height: 50px; +} +.lsb-login { + display: flex; + justify-content: center; + align-items: center; + height: 90vh; + margin: 0; +} +.login-form-wrapper { + background-color: #FFF; + border-radius: 4px; + box-shadow: rgba(0, 0, 0, 0.1) 0 3px 5px; + padding: 30px 40px; + border-top: 5px solid #337ab7; +} +table { + max-width: none !important; + /*解决 ios 横向滚动失效*/ +} +.user-bottom-div { + display: block; + text-align: center; + background-color: #ddd; + position: fixed; + bottom: 0; + width: 100%; + height: 50px; + line-height: 50px; +} +.lsb-login { + display: flex; + justify-content: center; + align-items: center; + height: 90vh; + margin: 0; +} +.login-form-wrapper { + background-color: #FFF; + border-radius: 4px; + box-shadow: rgba(0, 0, 0, 0.1) 0 3px 5px; + padding: 30px 10px; + border-top: 5px solid #337ab7; +} +.login-form { + margin: 20px; +} +.sidebar .sidebar-nav.navbar-collapse { + padding-left: 0; + padding-right: 0; +} +.sidebar .sidebar-search { + padding: 15px; +} +.sidebar ul li a { + border-left: 3px solid transparent; + color: #333; +} +.sidebar ul li a.active { + background-color: #eeeeee; + border-left: 3px solid #337ab7; +} +.sidebar .arrow { + float: right; + margin-top: 3px; +} +.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: 47px; +} +.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; + } +} +.fixed-table-container { + border: none; +} +/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/common/static/sb-admin-2/css/sb-admin-2.css b/common/static/sb-admin-2/css/sb-admin-2.css index 0392c8f4c1..84d2d9150c 100755 --- 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/templates/base.html b/common/templates/base.html index 34acc86486..3d2433759a 100644 --- a/common/templates/base.html +++ b/common/templates/base.html @@ -18,11 +18,7 @@ - + diff --git a/common/templates/login.html b/common/templates/login.html index 82ab1224ee..98e2a9ba8b 100644 --- a/common/templates/login.html +++ b/common/templates/login.html @@ -6,7 +6,6 @@ - +
diff --git a/sql/templates/sqlworkflow.html b/sql/templates/sqlworkflow.html index 4702d72471..ed8bb62f9e 100644 --- a/sql/templates/sqlworkflow.html +++ b/sql/templates/sqlworkflow.html @@ -37,7 +37,7 @@
-