重构代码:移动部分通用样式到theme架构中

This commit is contained in:
Argo-Surface 2018-11-23 12:41:10 +08:00
parent 0ae84888d9
commit 3825ae39d8
9 changed files with 515 additions and 516 deletions

View File

@ -12,10 +12,10 @@
<link href="~/lib/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
</environment>
@RenderSection("css", false)
<link href="~/css/site.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/site-responsive.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/theme.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/theme-responsive.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/site.css" rel="stylesheet" asp-append-version="true" />
<link href="~/css/site-responsive.css" rel="stylesheet" asp-append-version="true" />
@if (!string.IsNullOrEmpty(Model.Theme))
{
<link href="~/css/@Model.Theme" rel="stylesheet" asp-append-version="true" />

View File

@ -1,26 +1,4 @@
@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;
}
.cache-item > :nth-child(2) {
flex: 0 0 144px;
}
@ -35,12 +13,6 @@
}
}
@media (min-width: 576px) {
.btn-fill {
width: auto;
}
}
@media (min-width: 667px) {
.header .nav {
display: flex;
@ -57,19 +29,15 @@
-ms-overflow-style: none;
}
.sidebar-open aside {
transform: translate(0);
}
.header, footer {
position: fixed;
}
.main-content {
position: fixed;
overflow: auto;
-ms-overflow-style: auto;
}
.header, footer {
position: fixed;
}
}
@media (min-width: 769px) {

View File

@ -1,119 +1,4 @@
html {
font-size: 16px;
-ms-overflow-style: auto;
}
body {
color: #797979;
background: #f1f2f7;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-webkit-overflow-scrolling: touch;
}
.sidebar-open aside {
transform: translate(0);
}
.sidebar-open footer {
display: none;
}
aside {
transition: transform .4s ease-in-out;
transform: translate(-100%);
position: absolute;
top: 96px;
bottom: 0;
left: 0;
right: 0;
z-index: 4;
background: #2a3542;
}
.sidebar {
padding: 20px 0;
background: inherit;
}
.sidebar .nav-item {
margin: 5px 10px;
}
.sidebar .nav-item .nav-link:hover, .sidebar .nav-item .nav-link:focus {
background: #35404d;
color: #fff;
}
.sidebar .nav-item.active > .nav-link {
color: #FF6C60;
}
.sidebar .nav-link {
color: #aeb2b7;
padding: 15px 10px;
transition: all .3s linear;
display: flex;
align-items: center;
}
.sidebar .nav-link .dcjq-icon {
height: 17px;
width: 17px;
background: url(../images/nav-expand.png) no-repeat;
margin-left: auto;
}
.sidebar .nav-link i {
width: 22px;
}
.sidebar .nav-link.active, .sidebar .nav-link.active + .sub,
.sidebar .sub .sub .nav-item .nav-link:hover, .sidebar .sub .sub .nav-item .nav-link:focus {
background: #35404D;
}
.sidebar .nav-link.active .dcjq-icon {
background-position: bottom;
}
.sidebar .sub .nav-item.dcjq-parent-li {
margin-left: 0;
margin-right: 0;
}
.sidebar .sub .nav-item.dcjq-parent-li .nav-link {
padding-left: 20px;
}
.sidebar .sub .dcjq-parent-li .nav-link.active, .sidebar .sub .dcjq-parent-li .nav-link.active + .sub,
.sidebar .sub .nav-item .nav-link:hover, .sidebar .sub .nav-item .nav-link:focus {
background: #3a4756;
}
a, a:hover, a:focus {
text-decoration: none;
outline: none;
}
/*Title*/
.sidebar-toggle-box {
display: block;
font-size: 1.25rem;
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;
}
/*Title*/
.header {
padding: 0 15px;
background: #fff;
@ -146,15 +31,6 @@ a, a:hover, a:focus {
opacity: 0.8;
}
.dropdown-item.active, .dropdown-item:active {
color: rgba(0, 0, 0, 0.9);
background-color: rgba(0, 0, 0, 0.05);
}
.dropdown-item i + span {
margin-left: 6px;
}
.nav [data-toggle="dropdown"] {
border-radius: 4px;
padding: 6px 12px;
@ -242,6 +118,10 @@ a, a:hover, a:focus {
color: #333;
}
.userinfo [data-toggle="dropdown"]:hover {
border-color: #337ab7;
}
.userinfo .dropdown-item {
display: flex;
width: 270px;
@ -297,86 +177,6 @@ a, a:hover, a:focus {
}
/*end title*/
footer {
background: #5b6e84;
color: #fff;
padding: 10px 4px;
height: 40px;
left: 0;
bottom: 0;
right: 0;
z-index: 100;
display: flex;
}
footer > span {
flex: 1 1 auto;
text-align: center;
margin-left: 4px;
display: inline-block;
}
.go-top {
background: rgba(255,255,255,.5);
width: 20px;
height: 20px;
border-radius: 50%;
-webkit-border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-right: 4px;
}
.go-top:hover {
background-color: white;
}
.go-top i {
color: #2A3542;
}
.breadcrumb {
border-top: solid 1px #ddd;
background-color: transparent;
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%;
@ -627,6 +427,16 @@ footer {
cursor: pointer;
}
#nprogress .bar {
background: #673AB7;
height: 3px;
}
#nprogress .spinner {
top: 22px;
right: 17px;
}
.dd {
max-width: 100%;
}

View File

@ -1,9 +1,31 @@
@media (min-width: 375px) {
.toolbar .dropdown-menu a {
padding: 0 20px;
}
.toolbar .dropdown-menu a:first-child {
border-left: none;
}
.form-check-input + span, .form-check-input + label {
max-width: 146px;
}
}
@media (min-width: 568px) {
.sidebar-toggle-box span {
display: inline;
}
.toolbar {
display: none;
}
.bs-bars {
display: inline-block;
}
}
@media (min-width: 576px) {
.form-inline .control-label {
padding-top: 6px;
@ -21,6 +43,16 @@
.input-group.date {
width: 186px;
}
.btn-fill {
width: auto;
}
}
@media (min-width: 768px) {
.sidebar-open aside {
transform: translate(0);
}
}
@media (min-width: 940px) {

View File

@ -1,4 +1,22 @@
body, .form-control, .dropdown-menu, .btn:not(.btn-lg), .input-group-text, .popover-header {
html {
font-size: 16px;
-ms-overflow-style: auto;
}
body {
color: #797979;
background: #f1f2f7;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-webkit-overflow-scrolling: touch;
}
a, a:hover, a:focus {
text-decoration: none;
outline: none;
}
body, .form-control, .dropdown-menu, .btn:not(.btn-lg), .input-group-text, .popover-header {
font-size: 0.875rem;
}
@ -12,6 +30,183 @@
padding-top: 15px;
}
.sidebar-open aside {
transform: translate(0);
}
.sidebar-open footer, .sidebar-open .container-fluid {
display: none;
}
.sidebar {
padding: 20px 0;
background: inherit;
}
.sidebar .nav-item {
margin: 5px 10px;
}
.sidebar .nav-item .nav-link:hover, .sidebar .nav-item .nav-link:focus {
background: #35404d;
color: #fff;
}
.sidebar .nav-item.active > .nav-link {
color: #FF6C60;
}
.sidebar .nav-link {
color: #aeb2b7;
padding: 15px 10px;
transition: all .3s linear;
display: flex;
align-items: center;
}
.sidebar .nav-link .dcjq-icon {
height: 17px;
width: 17px;
background: url(../images/nav-expand.png) no-repeat;
margin-left: auto;
}
.sidebar .nav-link i {
width: 22px;
}
.sidebar .nav-link.active, .sidebar .nav-link.active + .sub,
.sidebar .sub .sub .nav-item .nav-link:hover, .sidebar .sub .sub .nav-item .nav-link:focus {
background: #35404D;
}
.sidebar .nav-link.active .dcjq-icon {
background-position: bottom;
}
.sidebar .sub .nav-item.dcjq-parent-li {
margin-left: 0;
margin-right: 0;
}
.sidebar .sub .nav-item.dcjq-parent-li .nav-link {
padding-left: 20px;
}
.sidebar .sub .dcjq-parent-li .nav-link.active, .sidebar .sub .dcjq-parent-li .nav-link.active + .sub,
.sidebar .sub .nav-item .nav-link:hover, .sidebar .sub .nav-item .nav-link:focus {
background: #3a4756;
}
.sidebar-toggle-box {
display: block;
font-size: 1.25rem;
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;
}
aside {
transition: transform .4s ease-in-out;
transform: translate(-100%);
position: absolute;
top: 96px;
bottom: 0;
left: 0;
right: 0;
z-index: 4;
background: #2a3542;
}
.breadcrumb {
border-top: solid 1px #ddd;
background-color: transparent;
border-radius: 0;
padding: 8px 10px;
margin-bottom: 0;
}
.breadcrumb i {
padding-right: 6px;
}
footer {
background: #5b6e84;
color: #fff;
padding: 10px 4px;
height: 40px;
left: 0;
bottom: 0;
right: 0;
z-index: 100;
display: flex;
}
footer > span {
flex: 1 1 auto;
text-align: center;
margin-left: 4px;
display: inline-block;
}
.go-top {
background: rgba(255,255,255,.5);
width: 20px;
height: 20px;
border-radius: 50%;
-webkit-border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-right: 4px;
}
.go-top:hover {
background-color: white;
}
.go-top i {
color: #2A3542;
}
.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;
}
.input-group .btn:focus, .btn-group .btn:focus, .page-link:focus {
box-shadow: none;
}
@ -53,6 +248,15 @@
margin: 0.125rem 0;
}
.dropdown-item.active, .dropdown-item:active {
color: rgba(0, 0, 0, 0.9);
background-color: rgba(0, 0, 0, 0.05);
}
.dropdown-item i + span {
margin-left: 6px;
}
.tooltip-inner {
max-width: 768px;
}
@ -336,16 +540,6 @@ input.pending {
display: inline-block;
}
#nprogress .bar {
background: #673AB7;
height: 3px;
}
#nprogress .spinner {
top: 22px;
right: 17px;
}
.sweet-alert h2 {
margin-top: 32px;
margin-bottom: 16px;
@ -355,4 +549,4 @@ input.pending {
.sweet-alert .sa-button-container .btn-lg {
padding: 0.375rem 1.5rem;
font-size: 1rem;
}
}

View File

@ -1,33 +1,3 @@
@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;
}
}
@media (min-width: 576px) {
.btn-fill {
width: auto;
}
}
@media (min-width: 667px) {
.header .nav {
display: flex;
@ -38,21 +8,3 @@
flex: 0 1 auto;
}
}
@media (min-width: 768px) {
.sidebar-open aside {
transform: translate(-100%);
}
.sidebar-open footer {
display: flex;
}
.breadcrumb {
border-color: #ddd;
}
.modal-body .bootstrap-table {
margin-top: -15px;
}
}

View File

@ -1,119 +1,4 @@
html {
font-size: 16px;
-ms-overflow-style: auto;
}
body {
color: #797979;
background: #f1f2f7;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-webkit-overflow-scrolling: touch;
}
.sidebar-open aside {
transform: translate(0);
}
.sidebar-open footer, .sidebar-open .container-fluid {
display: none;
}
aside {
transition: transform .4s ease-in-out;
transform: translate(-100%);
position: absolute;
top: 92px;
bottom: 0;
left: 0;
right: 0;
z-index: 4;
background: #2a3542;
}
.sidebar {
padding: 20px 0;
background: inherit;
}
.sidebar .nav-item {
margin: 5px 10px;
}
.sidebar .nav-item .nav-link:hover, .sidebar .nav-item .nav-link:focus {
background: #35404d;
color: #fff;
}
.sidebar .nav-item.active > .nav-link {
color: #FF6C60;
}
.sidebar .nav-link {
color: #aeb2b7;
padding: 15px 10px;
transition: all .3s linear;
display: flex;
align-items: center;
}
.sidebar .nav-link .dcjq-icon {
height: 17px;
width: 17px;
background: url(../images/nav-expand.png) no-repeat;
margin-left: auto;
}
.sidebar .nav-link i {
width: 22px;
}
.sidebar .nav-link.active, .sidebar .nav-link.active + .sub,
.sidebar .sub .sub .nav-item .nav-link:hover, .sidebar .sub .sub .nav-item .nav-link:focus {
background: #35404D;
}
.sidebar .nav-link.active .dcjq-icon {
background-position: bottom;
}
.sidebar .sub .nav-item.dcjq-parent-li {
margin-left: 0;
margin-right: 0;
}
.sidebar .sub .nav-item.dcjq-parent-li .nav-link {
padding-left: 20px;
}
.sidebar .sub .dcjq-parent-li .nav-link.active, .sidebar .sub .dcjq-parent-li .nav-link.active + .sub,
.sidebar .sub .nav-item .nav-link:hover, .sidebar .sub .nav-item .nav-link:focus {
background: #3a4756;
}
a, a:hover, a:focus {
text-decoration: none;
outline: none;
}
/*Title*/
.sidebar-toggle-box {
display: block;
font-size: 1.25rem;
color: #eee;
flex: 1 1 auto;
padding: 12px 0;
transition: color .3s linear;
}
.sidebar-toggle-box:hover {
color: #fff;
}
.sidebar-toggle-box span {
display: none;
}
/*Title*/
.header {
background: #fff;
border-bottom: 1px solid #ccc;
@ -152,15 +37,6 @@ a, a:hover, a:focus {
opacity: 0.8;
}
.dropdown-item.active, .dropdown-item:active {
color: rgba(0, 0, 0, 0.9);
background-color: rgba(0, 0, 0, 0.05);
}
.dropdown-item i + span {
margin-left: 6px;
}
.nav [data-toggle="dropdown"] {
border-radius: 4px;
padding: 6px 12px;
@ -303,83 +179,3 @@ a, a:hover, a:focus {
top: 6px;
}
/*end title*/
footer {
background: #5b6e84;
color: #fff;
padding: 10px 4px;
height: 40px;
left: 0;
bottom: 0;
right: 0;
z-index: 100;
display: flex;
}
footer > span {
flex: 1 1 auto;
text-align: center;
margin-left: 4px;
display: inline-block;
}
.go-top {
background: rgba(255,255,255,.5);
width: 20px;
height: 20px;
border-radius: 50%;
-webkit-border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-right: 4px;
}
.go-top:hover {
background-color: white;
}
.go-top i {
color: #2A3542;
}
.breadcrumb {
border-top: solid 1px #fff;
background-color: transparent;
border-radius: 0;
padding: 8px 10px;
margin: 0 15px;
}
.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;
}

View File

@ -1,14 +1,32 @@
@media (min-width: 375px) {
.toolbar .dropdown-menu a {
padding: 0 20px;
}
.toolbar .dropdown-menu a:first-child {
border-left: none;
}
.form-check-input + span, .form-check-input + label {
max-width: 146px;
}
}
@media (min-width: 576px) {
.form-group .form-control-url {
width: calc(100% - 125px);
@media (min-width: 568px) {
.sidebar-toggle-box span {
display: inline;
}
.toolbar {
display: none;
}
.bs-bars {
display: inline-block;
}
}
@media (min-width: 576px) {
.form-inline .control-label {
padding-top: 6px;
padding-bottom: 6px;
@ -25,6 +43,20 @@
.input-group.date {
width: 186px;
}
.btn-fill {
width: auto;
}
}
@media (min-width: 768px) {
.sidebar-open aside {
transform: translate(-100%);
}
.modal-body .bootstrap-table {
margin-top: -15px;
}
}
@media (min-width: 940px) {

View File

@ -1,4 +1,22 @@
body, .form-control, .dropdown-menu, .btn:not(.btn-lg), .input-group-text, .popover-header {
html {
font-size: 16px;
-ms-overflow-style: auto;
}
body {
color: #797979;
background: #f1f2f7;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-webkit-overflow-scrolling: touch;
}
a, a:hover, a:focus {
text-decoration: none;
outline: none;
}
body, .form-control, .dropdown-menu, .btn:not(.btn-lg), .input-group-text, .popover-header {
font-size: 0.875rem;
}
@ -12,6 +30,183 @@
padding-top: 15px;
}
.sidebar-open aside {
transform: translate(0);
}
.sidebar-open footer, .sidebar-open .container-fluid {
display: none;
}
.sidebar {
padding: 20px 0;
background: inherit;
}
.sidebar .nav-item {
margin: 5px 10px;
}
.sidebar .nav-item .nav-link:hover, .sidebar .nav-item .nav-link:focus {
background: #35404d;
color: #fff;
}
.sidebar .nav-item.active > .nav-link {
color: #FF6C60;
}
.sidebar .nav-link {
color: #aeb2b7;
padding: 15px 10px;
transition: all .3s linear;
display: flex;
align-items: center;
}
.sidebar .nav-link .dcjq-icon {
height: 17px;
width: 17px;
background: url(../images/nav-expand.png) no-repeat;
margin-left: auto;
}
.sidebar .nav-link i {
width: 22px;
}
.sidebar .nav-link.active, .sidebar .nav-link.active + .sub,
.sidebar .sub .sub .nav-item .nav-link:hover, .sidebar .sub .sub .nav-item .nav-link:focus {
background: #35404D;
}
.sidebar .nav-link.active .dcjq-icon {
background-position: bottom;
}
.sidebar .sub .nav-item.dcjq-parent-li {
margin-left: 0;
margin-right: 0;
}
.sidebar .sub .nav-item.dcjq-parent-li .nav-link {
padding-left: 20px;
}
.sidebar .sub .dcjq-parent-li .nav-link.active, .sidebar .sub .dcjq-parent-li .nav-link.active + .sub,
.sidebar .sub .nav-item .nav-link:hover, .sidebar .sub .nav-item .nav-link:focus {
background: #3a4756;
}
.sidebar-toggle-box {
display: block;
font-size: 1.25rem;
color: #eee;
flex: 1 1 auto;
padding: 12px 0;
transition: color .3s linear;
}
.sidebar-toggle-box:hover {
color: #fff;
}
.sidebar-toggle-box span {
display: none;
}
aside {
transition: transform .4s ease-in-out;
transform: translate(-100%);
position: absolute;
top: 92px;
bottom: 0;
left: 0;
right: 0;
z-index: 4;
background: #2a3542;
}
.breadcrumb {
border-top: solid 1px #ddd;
background-color: transparent;
border-radius: 0;
padding: 8px 10px;
margin-bottom: 0;
}
.breadcrumb i {
padding-right: 6px;
}
footer {
background: #5b6e84;
color: #fff;
padding: 10px 4px;
height: 40px;
left: 0;
bottom: 0;
right: 0;
z-index: 100;
display: flex;
}
footer > span {
flex: 1 1 auto;
text-align: center;
margin-left: 4px;
display: inline-block;
}
.go-top {
background: rgba(255,255,255,.5);
width: 20px;
height: 20px;
border-radius: 50%;
-webkit-border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-right: 4px;
}
.go-top:hover {
background-color: white;
}
.go-top i {
color: #2A3542;
}
.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;
}
.input-group .btn:focus, .btn-group .btn:focus, .page-link:focus {
box-shadow: none;
}
@ -53,6 +248,15 @@
margin: 0.125rem 0;
}
.dropdown-item.active, .dropdown-item:active {
color: rgba(0, 0, 0, 0.9);
background-color: rgba(0, 0, 0, 0.05);
}
.dropdown-item i + span {
margin-left: 6px;
}
.tooltip-inner {
max-width: 768px;
}
@ -80,7 +284,7 @@ input.is-valid {
input.pending {
background-repeat: no-repeat;
background-image: url(../img/loading-sm.gif);
background-image: url(../images/loading-sm.gif);
background-position: right 8px center;
}
@ -140,9 +344,9 @@ input.pending {
transform: rotate(-90deg);
}
.card .card-header i + span {
margin-left: 6px;
}
.card .card-header i + span {
margin-left: 6px;
}
.btn span:last-child {
margin-left: 4px;
@ -335,3 +539,14 @@ input.pending {
.form-inline .form-group-dropdown .dropdown, .form-inline .form-group-dropdown .dropup {
display: inline-block;
}
.sweet-alert h2 {
margin-top: 32px;
margin-bottom: 16px;
font-size: 1.5rem;
}
.sweet-alert .sa-button-container .btn-lg {
padding: 0.375rem 1.5rem;
font-size: 1rem;
}