orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev-UI' into dev

This commit is contained in:
Argo Zhang 2019-10-05 23:03:00 +08:00
parent e7525b617d a4fd36c3a3
commit 88e5c6642b
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/Bootstrap.Admin/Views/Home/Index.cshtml
View File

@ -9,7 +9,7 @@
left: 0;
bottom: 40px;
right: 0;
top: 93px;
top: 89px;
overflow: hidden;
}

19
src/admin/Bootstrap.Admin/wwwroot/css/lte.css
View File

@ -47,7 +47,6 @@
border-radius: 4px;
width: 2rem;
height: 2rem;
margin: 0.25rem 0;
}
.userinfo .username {
@ -56,6 +55,9 @@
.userinfo .dropdown-toggle {
border-radius: 0;
height: 50px;
display: flex;
align-items: center;
}
.userinfo .dropdown-toggle, .userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .header .nav a, .header .nav a:hover {
@ -116,12 +118,12 @@
}
.userinfo.show .dropdown-menu {
margin-top: 4px;
margin-top: 5px;
cursor: default;
}
aside, .main-content {
top: 55px;
top: 51px;
}
aside {
@ -129,7 +131,7 @@ aside {
}
aside .nav-brand, .sidebar-open aside:hover .nav-brand {
height: 55px;
height: 50px;
align-items: center;
padding: 0 0.625rem;
}
@ -182,10 +184,6 @@ aside {
border-top: none;
}
.card-header {
padding: 0.625rem 1rem;
}
/* color */
.main-content {
background-color: #ecf0f5;
@ -265,6 +263,7 @@ footer {
.header .nav {
display: flex;
flex: 0 1 auto;
height: 3.125rem;
}
.sidebar-toggle-box {
@ -291,7 +290,7 @@ footer {
}
aside .sidebar, .sidebar-open aside:hover .sidebar {
top: 121px;
top: 116px;
transition: top .3s linear;
}
@ -383,7 +382,7 @@ footer {
}
.sidebar-open aside .sidebar {
top: 115px;
top: 107px;
}
.sidebar-open .main-content {

6
src/admin/Bootstrap.Admin/wwwroot/css/site.css
View File

@ -25,7 +25,7 @@ body.trans-mute * {
font-weight: bold;
color: #0077de;
background-color: #b5f1b6;
padding: 12px 15px;
padding: 0.5rem 1rem;
border-radius: 4px 4px 0 0;
margin-bottom: 0;
}
@ -33,7 +33,7 @@ body.trans-mute * {
.cache-item {
display: flex;
align-items: center;
padding: 10px;
padding: 0.5rem 0.625rem;
border: 1px solid #eee;
border-width: 0 1px 1px 1px;
}
@ -115,7 +115,7 @@ body.trans-mute * {
left: 0;
bottom: 40px;
right: 0;
top: 93px;
top: 89px;
transition: margin-left .3s ease-in-out;
}

17
src/admin/Bootstrap.Admin/wwwroot/css/theme.css
View File

@ -33,7 +33,6 @@ aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdow
.header .nav .dropdown {
margin-right: 6px;
height: 53px;
display: flex;
align-items: center;
}
@ -89,7 +88,7 @@ aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdow
.userinfo .dropdown-toggle {
display: block;
padding: 6px;
padding: 6px 6px;
border-radius: 4px;
transition: all .25s linear;
}
@ -186,12 +185,12 @@ aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdow
.nav .dropdown-header {
color: #fff;
padding: 10px;
padding: 0.5rem 0.625rem;
border-radius: 4px 4px 0 0;
}
.nav .dropdown-footer {
padding: 6px 0;
padding: 0.375rem 0;
background-color: #f1f2f7;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
@ -267,7 +266,7 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou
.sidebar .nav-link {
color: #aeb2b7;
padding: 10px 10px;
padding: 0.5rem 0.625rem;
transition: background .3s linear, color .3s linear;
display: block;
white-space: nowrap;
@ -336,7 +335,7 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou
display: block;
color: #777;
flex: 1 1 auto;
padding: 12px 0;
padding: 0.625rem 0;
white-space: nowrap;
transition: color .3s linear;
}
@ -353,7 +352,7 @@ aside {
transition: transform .3s ease-in-out;
transform: translate(-100%);
position: absolute;
top: 93px;
top: 89px;
bottom: 0;
left: 0;
right: 0;
@ -555,6 +554,10 @@ input.pending {
box-shadow: none;
}
.card-header {
padding: 0.5rem 1rem;
}
.card .card-header a {
color: #797979;
}