更新样式:删除admin以及适应样式,全部合并到site样式文件中

This commit is contained in:
Argo-MacBookPro 2018-10-01 01:04:36 +08:00
parent 8e520dc590
commit 4a1dd62616
8 changed files with 405 additions and 317 deletions

View File

@ -13,8 +13,6 @@
<link href="~/css/jquery.mCustomScrollbar.min.css" rel="stylesheet" />
</environment>
@RenderSection("css", false)
<link href="~/css/admin.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/admin-responsive.css" rel="stylesheet" asp-append-version="true" />
}
@section javascript {
<environment include="Development">

View File

@ -1,44 +0,0 @@
@media (min-width: 375px) {
.toolbar .dropdown-menu a {
padding: 0 20px;
}
.toolbar .dropdown-menu a:first-child {
border-left: none;
}
}
@media (min-width: 568px) {
.toolbar {
display: none;
}
.bs-bars {
display: inline-block;
}
}
@media (min-width: 576px) {
.btn-fill {
width: auto;
}
}
@media (min-width: 768px) {
.main-content {
position: fixed;
overflow: auto;
}
}
@media (min-width: 769px) {
.sidebar-open .main-content {
margin-left: 0;
display: block;
}
.main-content {
margin-left: 210px;
transition: none;
}
}

View File

@ -1,209 +0,0 @@
.logTs, .logSql, .logDbExcep {
color: red;
font-weight: 600;
}
.logExcep {
color: #337ab7;
font-weight: 600;
}
.logMsg {
color: #ce2520;
font-weight: 600;
}
.sidebar-open .main-content {
display: none;
}
.main-content {
padding: 15px 15px 0 15px;
margin-left: 0;
left: 0;
bottom: 40px;
right: 0;
top: 98px;
}
.main-content > .panel:last-child .panel-body {
padding-bottom: 0;
}
.main-content > .panel > .panel-body > .modal-footer {
text-align: left;
}
.affix {
position: fixed;
bottom: 95px;
right: 50px;
}
.affix a {
font-size: 2rem;
margin-top: 16px;
}
.bs-bars {
display: none;
}
.toolbar {
position: relative;
margin-top: 10px;
margin-bottom: 10px;
line-height: 34px;
}
.toolbar .dropdown-menu a {
padding: 0 14px;
display: table-cell;
color: #504d4d;
}
.toolbar .dropdown-menu a:not(:first-child) {
border-left: solid 1px #aeb2b7;
}
.toolbar .dropdown-menu a:hover {
color: #235e90;
}
.btn-fill {
width: 100%;
}
/*Messages*/
.mail-box {
display: flex;
}
.mail-box .sm-side {
flex: 0.4;
background: #e5e8ef;
border-radius: 4px 0 0 4px;
}
.mail-box .sm-side .user-head {
background: #00a8b3;
border-radius: 4px 0 0 0;
padding: 10px;
color: #fff;
min-height: 80px;
}
.mail-box .sm-side .user-head .inbox-avatar {
width: 65px;
float: left;
}
.mail-box .sm-side .user-head .inbox-avatar img {
height: 65px;
border-radius: 4px;
border: 0;
vertical-align: middle;
}
.mail-box .sm-side .user-head .user-name {
display: inline-block;
margin: 0 0 0 10px;
}
.mail-box .sm-side .user-head .user-name h5 {
margin-top: 15px;
margin-bottom: 0;
font-weight: 300;
}
.mail-box .sm-side .user-head .user-name h5 a {
color: #fff;
}
.mail-box .sm-side .inbox-body, .mail-box .lg-side .inbox-body {
padding: 20px;
}
.mail-box .sm-side .inbox-body .btn-compose {
background: #ff6c60;
padding: 12px 0;
text-align: center;
width: 100%;
color: #fff;
}
.mail-box .sm-side .inbox-body .btn-compose:hover {
background: #f5675c;
color: #fff;
}
.mail-box .sm-side ul.inbox-nav {
display: inline-block;
width: 100%;
margin: 0;
padding: 0;
}
.mail-box .sm-side ul.inbox-nav li {
display: inline-block;
line-height: 45px;
width: 100%;
}
.mail-box .sm-side ul.inbox-nav li a {
color: #6a6a6a;
line-height: 45px;
width: 100%;
display: inline-block;
padding: 0 20px;
}
.mail-box .sm-side ul.inbox-nav li a:hover, .mail-box .sm-side ul.inbox-nav li.active a, .mail-box .sm-side ul.inbox-nav li a:focus {
color: #6a6a6a;
background: #d5d7de;
}
.mail-box .sm-side ul.inbox-nav li a .label {
margin-top: 13px;
padding: 0.5em 0.8em;
}
.mail-box .sm-side ul.inbox-nav li a i {
width: 18px;
}
.mail-box .lg-side {
flex: 0.6;
background: #fff;
border-radius: 0 4px 4px 0;
}
.mail-box .lg-side .inbox-head {
padding: 12px;
background: #41cac0;
color: #fff;
border-radius: 0 4px 0 0;
min-height: 80px;
}
.mail-box .lg-side .table-inbox {
border: 1px solid #d3d3d3;
margin-bottom: 0;
}
.mail-box .lg-side .table-inbox .unread td {
font-weight: 600;
background: #f7f7f7;
}
.mail-box .lg-side .table-inbox tr td {
padding: 12px;
}
.mail-box .lg-side .table-inbox tr td .fa-star.inbox-started, .mail-box .lg-side .table-inbox tr td .fa-star:hover {
color: #f78a09;
}
.mail-box .lg-side .table-inbox tr td:hover {
cursor: pointer;
}

View File

@ -1,4 +1,22 @@
@media (min-width: 375px) {
.toolbar .dropdown-menu a {
padding: 0 20px;
}
.toolbar .dropdown-menu a:first-child {
border-left: none;
}
}
@media (min-width: 568px) {
.toolbar {
display: none;
}
.bs-bars {
display: inline-block;
}
.sidebar-toggle-box span {
display: inline;
}
@ -15,6 +33,12 @@
}
}
@media (min-width: 576px) {
.btn-fill {
width: auto;
}
}
@media (min-width: 667px) {
.header .nav {
display: flex;
@ -34,6 +58,11 @@
.header, .site-footer {
position: fixed;
}
.main-content {
position: fixed;
overflow: auto;
}
}
@media (min-width: 769px) {
@ -52,4 +81,14 @@
overflow: hidden;
bottom: 40px;
}
.sidebar-open .main-content {
margin-left: 0;
display: block;
}
.main-content {
margin-left: 210px;
transition: none;
}
}

View File

@ -90,18 +90,24 @@ aside {
background: #3a4756;
}
.modal-body .dd {
margin-bottom: 15px;
a, a:hover, a:focus {
text-decoration: none;
outline: none;
}
/*Title*/
.sidebar-toggle-box {
font-size: 1.25rem;
color: #333;
color: #777;
flex: 1 1 auto;
padding: 12px 0;
transition: color .3s linear;
}
.sidebar-toggle-box:hover {
color: #333;
}
.sidebar-toggle-box span {
display: none;
}
@ -119,7 +125,7 @@ aside {
.header .bg {
background-color: #337ab7;
height: 4px;
height: 5px;
margin: 0 -15px;
}
@ -157,6 +163,10 @@ aside {
background-color: transparent;
}
.dropdown-item i + span {
margin-left: 6px;
}
.nav .dropdown-menu {
width: 235px;
border: none;
@ -322,18 +332,46 @@ aside {
}
.breadcrumb {
border: solid 1px #ddd;
border-width: 1px 0 0 0;
border-top: solid 1px #ddd;
background-color: transparent;
border-top-left-radius: 0;
border-top-right-radius: 0;
border-radius: 0;
padding: 8px 10px;
margin-bottom: 0;
}
.breadcrumb i {
padding-right: 6px;
}
.bs-bars {
display: none;
}
.btn-fill {
width: 100%;
}
.toolbar {
position: relative;
margin-top: 10px;
margin-bottom: 10px;
line-height: 34px;
}
.toolbar .dropdown-menu a {
padding: 0 14px;
display: table-cell;
color: #504d4d;
}
.toolbar .dropdown-menu a:not(:first-child) {
border-left: solid 1px #aeb2b7;
}
.toolbar .dropdown-menu a:hover {
color: #235e90;
}
.welcome-bg {
background-image: url('../images/bg.jpg');
background-size: 100% 100%;
@ -402,3 +440,188 @@ aside {
.card-img {
max-width: 258px;
}
.modal-body .dd {
margin-bottom: 15px;
}
.logTs, .logSql, .logDbExcep {
color: red;
font-weight: 600;
}
.logExcep {
color: #337ab7;
font-weight: 600;
}
.logMsg {
color: #ce2520;
font-weight: 600;
}
.sidebar-open .main-content {
display: none;
}
.main-content {
padding: 15px 15px 0 15px;
margin-left: 0;
left: 0;
bottom: 40px;
right: 0;
top: 98px;
}
.main-content > .panel:last-child .panel-body {
padding-bottom: 0;
}
.main-content > .panel > .panel-body > .modal-footer {
text-align: left;
}
.affix {
position: fixed;
bottom: 95px;
right: 50px;
}
.affix a {
font-size: 2rem;
margin-top: 16px;
}
/*Messages*/
.mail-box {
display: flex;
}
.mail-box .sm-side {
flex: 0.4;
background: #e5e8ef;
border-radius: 4px 0 0 4px;
}
.mail-box .sm-side .user-head {
background: #00a8b3;
border-radius: 4px 0 0 0;
padding: 10px;
color: #fff;
min-height: 80px;
}
.mail-box .sm-side .user-head .inbox-avatar {
width: 65px;
float: left;
}
.mail-box .sm-side .user-head .inbox-avatar img {
height: 65px;
border-radius: 4px;
border: 0;
vertical-align: middle;
}
.mail-box .sm-side .user-head .user-name {
display: inline-block;
margin: 0 0 0 10px;
}
.mail-box .sm-side .user-head .user-name h5 {
margin-top: 15px;
margin-bottom: 0;
font-weight: 300;
}
.mail-box .sm-side .user-head .user-name h5 a {
color: #fff;
}
.mail-box .sm-side .inbox-body, .mail-box .lg-side .inbox-body {
padding: 20px;
}
.mail-box .sm-side .inbox-body .btn-compose {
background: #ff6c60;
padding: 12px 0;
text-align: center;
width: 100%;
color: #fff;
}
.mail-box .sm-side .inbox-body .btn-compose:hover {
background: #f5675c;
color: #fff;
}
.mail-box .sm-side ul.inbox-nav {
display: inline-block;
width: 100%;
margin: 0;
padding: 0;
}
.mail-box .sm-side ul.inbox-nav li {
display: inline-block;
line-height: 45px;
width: 100%;
}
.mail-box .sm-side ul.inbox-nav li a {
color: #6a6a6a;
line-height: 45px;
width: 100%;
display: inline-block;
padding: 0 20px;
}
.mail-box .sm-side ul.inbox-nav li a:hover, .mail-box .sm-side ul.inbox-nav li.active a, .mail-box .sm-side ul.inbox-nav li a:focus {
color: #6a6a6a;
background: #d5d7de;
}
.mail-box .sm-side ul.inbox-nav li a .label {
margin-top: 13px;
padding: 0.5em 0.8em;
}
.mail-box .sm-side ul.inbox-nav li a i {
width: 18px;
}
.mail-box .lg-side {
flex: 0.6;
background: #fff;
border-radius: 0 4px 4px 0;
}
.mail-box .lg-side .inbox-head {
padding: 12px;
background: #41cac0;
color: #fff;
border-radius: 0 4px 0 0;
min-height: 80px;
}
.mail-box .lg-side .table-inbox {
border: 1px solid #d3d3d3;
margin-bottom: 0;
}
.mail-box .lg-side .table-inbox .unread td {
font-weight: 600;
background: #f7f7f7;
}
.mail-box .lg-side .table-inbox tr td {
padding: 12px;
}
.mail-box .lg-side .table-inbox tr td .fa-star.inbox-started, .mail-box .lg-side .table-inbox tr td .fa-star:hover {
color: #f78a09;
}
.mail-box .lg-side .table-inbox tr td:hover {
cursor: pointer;
}

View File

@ -8,8 +8,12 @@
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102,175,233,.6);
}
.container-fluid {
padding-top: 15px;
}
.input-group .btn:focus, .btn-group .btn:focus, .page-link:focus {
box-shadow: none !important;
box-shadow: none;
}
.input-group .btn:not(.btn-secondary):not(.btn-primary):not(.btn-warning):not(.btn-info):not(.btn-danger) {
@ -17,6 +21,10 @@
border-color: #ced4da;
}
.nav-link {
transition: color .25s linear;
}
.close {
transition: all .25s linear;
}
@ -30,12 +38,17 @@
color: #fff;
}
.dropdown-menu a {
transition: all .25s linear;
padding: 6px 20px;
display: block;
.dropdown-menu {
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.176);
padding: 0;
}
.dropdown-menu a {
transition: all .25s linear;
padding: 6px 20px;
display: block;
}
.dropdown-divider {
margin: 0.125rem 0;
}
@ -93,6 +106,12 @@ input.pending {
padding: 10px 15px;
}
.modal-title {
overflow-x: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.modal-body, .card-body {
padding: 15px 15px 0 15px;
}
@ -101,10 +120,30 @@ input.pending {
display: inline;
}
.card-header a {
color: #797979;
.card {
margin-bottom: 15px;
}
.card .card-header a {
color: #797979;
}
.card .card-header a[data-toggle="collapse"] {
display: block;
}
.card .card-header a[data-toggle="collapse"] i {
transition: all .25s linear;
}
.card .card-header a[data-toggle="collapse"].collapsed i {
transform: rotate(-90deg);
}
.card .card-header a[data-toggle="collapse"] span {
margin-left: 6px;
}
.btn span:last-child {
margin-left: 4px;
display: none;
@ -122,7 +161,6 @@ input.pending {
display: inline-block;
}
/*Bootstrap Table BUG */
.bootstrap-table .table thead > tr > th {
border-top: none;
}
@ -135,14 +173,6 @@ input.pending {
padding: 5px;
}
.datetimepicker table tr td span {
white-space: nowrap;
}
.card-view:not(:last-child) {
margin-bottom: 6px;
}
.fixed-table-loading {
padding: 8px;
}
@ -155,13 +185,26 @@ input.pending {
border-bottom: none;
}
.bootstrap-table .fixed-table-body .table td > a {
display: block;
}
.bootstrap-table .fixed-table-toolbar .columns-right .btn-group .dropdown-menu {
padding-top: 8px;
}
.card {
margin-bottom: 15px;
}
.bootstrap-table .fixed-table-container .card-view .value {
word-break: break-all;
}
.bootstrap-table .fixed-table-container .card-view .value > a, .bootstrap-table .fixed-table-container .card-view .value > div {
min-width: 60px;
display: inline-block;
}
.bootstrap-table .card-view:not(:last-child) {
margin-bottom: 6px;
}
.card-body .bootstrap-table {
margin-top: -10px;
@ -170,7 +213,17 @@ input.pending {
.fixed-table-toolbar .dropdown-menu {
min-width: unset;
}
/*Bootstrap Table BUG END*/
.popover {
max-width: 320px;
padding: 0;
}
.popover-content {
max-height: 240px;
overflow-y: auto;
overflow-x: hidden;
}
.file-drop-zone.clickable:hover {
border: 1px dashed #999;
@ -190,11 +243,6 @@ input.pending {
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(40, 167, 69,.6);
}
.dropdown-menu {
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.176);
padding: 0;
}
.arrow-primary {
border-color: transparent transparent #007bff;
}
@ -218,35 +266,35 @@ input.pending {
.shadow-primary:hover {
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 123, 255, 0.5);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 123, 255, 0.5);
border-color: #007bff !important;
border-color: #007bff;
}
.shadow-success:hover {
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(40, 167, 69, 0.5);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(40, 167, 69, 0.5);
border-color: #28a745 !important;
border-color: #28a745;
}
.shadow-info:hover {
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(23, 162, 184, 0.5);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(23, 162, 184, 0.5);
border-color: #17a2b8 !important;
border-color: #17a2b8;
}
.shadow-warning:hover {
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(255, 193, 7, 0.5);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(255, 193, 7, 0.5);
border-color: #ffc107 !important;
border-color: #ffc107;
}
.shadow-danger:hover {
border: 1px solid #dc3545 !important;
border: 1px solid #dc3545;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(220, 53, 69, 0.5);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(220, 53, 69, 0.5);
}
.show .shadow-default, .shadow-default:hover {
border: 1px solid #337ab7 !important;
.shadow-default, .shadow-default:hover {
border: 1px solid #337ab7;
color: #333;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102,175,233,.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102,175,233,.6);
@ -255,3 +303,20 @@ input.pending {
.mCSB_scrollTools {
width: 10px;
}
.control-label > a {
margin-left: 6px;
color: #5bc0de;
}
.date > input {
cursor: pointer;
}
.datetimepicker {
padding: 4px;
}
.datetimepicker table tr td span {
white-space: nowrap;
}

View File

@ -9,10 +9,6 @@
}
@media (min-width: 568px) {
.sidebar-toggle-box span {
display: inline;
}
.toolbar {
display: none;
}
@ -20,6 +16,10 @@
.bs-bars {
display: inline-block;
}
.sidebar-toggle-box span {
display: inline;
}
}
@media (min-width: 576px) {
@ -31,6 +31,11 @@
@media (min-width: 667px) {
.header .nav {
display: flex;
flex: 1 1 auto;
}
.sidebar-toggle-box {
flex: 0 1 auto;
}
}

View File

@ -95,15 +95,6 @@ a, a:hover, a:focus {
outline: none;
}
.dropdown-menu a {
transition: all .25s linear;
padding: 6px 20px;
}
.dropdown-menu .divider {
margin: 1px 0;
}
/*Title*/
.sidebar-toggle-box {
font-size: 1.25rem;
@ -111,17 +102,16 @@ a, a:hover, a:focus {
flex: 1 1 auto;
padding: 12px 0;
transition: color .3s linear;
cursor: pointer;
}
.sidebar-toggle-box span {
display: none;
}
.sidebar-toggle-box:hover {
color: #fff;
}
.sidebar-toggle-box span {
display: none;
}
.header {
background: #fff;
border-bottom: 1px solid #ccc;
@ -168,7 +158,7 @@ a, a:hover, a:focus {
background-color: rgba(0, 0, 0, 0.05);
}
.dropdown-item span {
.dropdown-item i + span {
margin-left: 6px;
}
@ -261,9 +251,9 @@ a, a:hover, a:focus {
.userinfo .dropdown-item a {
text-align: center;
color: #777;
padding: 15px 10px;
flex: 1 1 33.333%;
color: #777;
}
.userinfo .dropdown-item a i {
@ -315,7 +305,7 @@ a, a:hover, a:focus {
left: 0;
bottom: 0;
right: 0;
z-index: 1;
z-index: 100;
display: flex;
}
@ -356,7 +346,7 @@ a, a:hover, a:focus {
.breadcrumb i {
padding-right: 6px;
}
.bs-bars {
display: none;
}
@ -364,3 +354,24 @@ a, a:hover, a:focus {
.btn-fill {
width: 100%;
}
.toolbar {
position: relative;
margin-top: 10px;
margin-bottom: 10px;
line-height: 34px;
}
.toolbar .dropdown-menu a {
padding: 0 14px;
display: table-cell;
color: #504d4d;
}
.toolbar .dropdown-menu a:not(:first-child) {
border-left: solid 1px #aeb2b7;
}
.toolbar .dropdown-menu a:hover {
color: #235e90;
}