Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

对导航菜单进行优化 #2494

Merged
merged 2 commits into from
Feb 3, 2024
Merged

对导航菜单进行优化 #2494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff0828
对导航菜单进行优化
finovy Jan 29, 2024
f956c8c
调整style.css
finovy Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions common/static/dist/css/login.css
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions common/static/sb-admin-2/css/sb-admin-2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
134 changes: 134 additions & 0 deletions common/static/style.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions common/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion common/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion sql/templates/sqlworkflow.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading