Skip to content

Commit

Permalink
对导航菜单进行优化
Browse files Browse the repository at this point in the history
  • Loading branch information
finovy committed Jan 29, 2024
1 parent 7e2d5e7 commit 5b33606
Show file tree
Hide file tree
Showing 7 changed files with 302 additions and 53 deletions.
135 changes: 135 additions & 0 deletions common/static/dist/css/style.css

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

1 change: 1 addition & 0 deletions common/static/dist/css/style.css.map

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

163 changes: 163 additions & 0 deletions common/static/dist/css/style.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@

body{
font-family: "GitLab Sans", -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";
font-family: Candara;
}
a{
color: #222;
}
.fa{
color: #666;
&.fa-5x{
color: white;
}
&.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 {
//border-bottom: 1px solid #e7e7e7;
}

.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;
}
46 changes: 0 additions & 46 deletions common/static/sb-admin-2/css/sb-admin-2.css
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
6 changes: 1 addition & 5 deletions common/templates/base.html
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 'dist/css/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
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 'dist/css/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
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

0 comments on commit 5b33606

Please sign in to comment.