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

refactor: 网站设置中使用正确的 card-footer

This commit is contained in:
Argo Zhang 2020-03-09 13:24:58 +08:00
parent 118864f50c
commit 2ddcf5c827
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
4 changed files with 107 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/admin/Bootstrap.Admin/Pages/Views/Admin/Settings.razor
View File

@ -93,9 +93,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveWebSettings"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveWebSettings"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
</ConditionComponent>
@ -120,12 +120,12 @@
</div>
</div>
</div>
<ConditionComponent Inverse="true">
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveLogin"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</ConditionComponent>
</div>
<ConditionComponent Inverse="true">
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveLogin"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</ConditionComponent>
</div>
</ConditionComponent>
<ConditionComponent AuthKey="lockScreen">
@ -144,9 +144,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
</ConditionComponent>
@ -165,9 +165,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveDefaultApp"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveDefaultApp"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
</ConditionComponent>
@ -186,9 +186,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveBlazor"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveBlazor"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
</ConditionComponent>
@ -204,12 +204,12 @@
<div class="form-group">
<Dropdown @bind-Value="@Model.SelectedIPLocator" Items="@Model.IPLocators"></Dropdown>
</div>
<ConditionComponent Inverse="true">
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveIPLocator"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</ConditionComponent>
</div>
<ConditionComponent Inverse="true">
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveIPLocator"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</ConditionComponent>
</div>
</ConditionComponent>
<ConditionComponent AuthKey="logSettings">
@ -249,12 +249,12 @@
</div>
</div>
</div>
<ConditionComponent Inverse="true">
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveLogSettings"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</ConditionComponent>
</div>
<ConditionComponent Inverse="true">
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveLogSettings"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</ConditionComponent>
</div>
</ConditionComponent>
<div class="card" asp-auth="demo">
@ -272,9 +272,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveSystemModel"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button class="btn btn-secondary" type="button" @onclick="SaveSystemModel"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card">

54
src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml
View File

@ -119,9 +119,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button data-method="UISettings" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button data-method="UISettings" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card" asp-auth="loginSettings">
@ -142,9 +142,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right" asp-condition="!@Model.IsDemo">
<button data-method="loginSettings" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right" asp-condition="!@Model.IsDemo">
<button data-method="loginSettings" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card" asp-auth="lockScreen">
@ -162,9 +162,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button data-method="saveAutoLock" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button data-method="saveAutoLock" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card" asp-auth="defaultApp">
@ -178,9 +178,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button data-method="saveDefaultApp" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button data-method="saveDefaultApp" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card" asp-auth="app">
@ -206,9 +206,9 @@
}
</div>
</div>
<div class="modal-footer text-right" asp-condition="@(!Model.IsDemo)">
<button class="btn btn-secondary" type="button" data-method="addApp"><i class="fa fa-plus"></i><span>新增</span></button>
</div>
</div>
<div class="card-footer text-right" asp-condition="@(!Model.IsDemo)">
<button class="btn btn-secondary" type="button" data-method="addApp"><i class="fa fa-plus"></i><span>新增</span></button>
</div>
</div>
<div class="card" asp-auth="blazor">
@ -222,9 +222,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button data-method="saveBlazor" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button data-method="saveBlazor" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card" asp-auth="iplocate">
@ -245,9 +245,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right" asp-condition="@(!Model.IsDemo)">
<button data-method="saveIpLocator" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right" asp-condition="@(!Model.IsDemo)">
<button data-method="saveIpLocator" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card" asp-auth="logSettings">
@ -284,9 +284,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right" asp-condition="@(!Model.IsDemo)">
<button data-method="saveLogPeriod" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right" asp-condition="@(!Model.IsDemo)">
<button data-method="saveLogPeriod" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card" asp-auth="demo">
@ -304,9 +304,9 @@
</div>
</div>
</div>
<div class="modal-footer text-right">
<button data-method="saveDemo" class="btn btn-secondary" type="submit"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card-footer text-right">
<button data-method="saveDemo" class="btn btn-secondary" type="submit"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
<div class="card">

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

@ -483,9 +483,9 @@ pre {
margin-top: 2px;
}
.userinfo .dropdown-toggle, .header .nav .dropdown > a {
color: #777;
}
.userinfo .dropdown-toggle, .header .nav .dropdown > a {
color: #777;
}
.error-content {
position: absolute;
@ -540,17 +540,17 @@ pre {
color: #371ed4;
}
.modal-query .form-group input.form-control {
flex: 1 1 auto;
}
.modal-query .form-group input.form-control {
flex: 1 1 auto;
}
.bootstrap-table .fixed-table-toolbar .bs-bars, .bootstrap-table .fixed-table-toolbar .search, .bootstrap-table .fixed-table-toolbar .columns {
.bootstrap-table .fixed-table-toolbar .bs-bars, .bootstrap-table .fixed-table-toolbar .search, .bootstrap-table .fixed-table-toolbar .columns {
margin-bottom: 10px;
margin-top: 0;
}
.tooltip-inner .search-input-tooltip {
font-size: 0.75rem;
font-size: 0.75rem;
}
.tooltip-inner .search-input-tooltip kbd {
@ -559,6 +559,9 @@ pre {
padding: 1px 6px;
}
.card-footer {
padding: 0.5rem 15px;
}
.modal-body, .card-body {
padding: 15px 15px 0 15px;
@ -573,31 +576,31 @@ pre {
border: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table thead th,
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody td {
border-top: none;
border-left: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table thead th,
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody td {
border-top: none;
border-left: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table thead th:last-child,
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody tr td:last-child {
border-right: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table thead th:last-child,
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody tr td:last-child {
border-right: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody tr:last-child td{
border-bottom: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body table tbody tr:last-child td {
border-bottom: none;
}
.bootstrap-table .fixed-table-container:not(.fixed-height) .fixed-table-body .fixed-table-loading {
left: 0;
right: 0;
}
.bootstrap-table .fixed-table-container.fixed-height .fixed-table-header {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.bootstrap-table .fixed-table-container.fixed-height .fixed-table-header {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.bootstrap-table td .btn, th.sortable {
white-space: nowrap;
}
}

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

@ -174,10 +174,10 @@ aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdow
padding: 2px 4px;
}
.header .nav .dropdown-blazor img {
width: 28px;
margin-top: 1px;
}
.header .nav .dropdown-blazor img {
width: 28px;
margin-top: 1px;
}
.nav .dropdown-menu {
width: 235px;
@ -568,34 +568,30 @@ input.pending {
color: #797979;
}
.card .card-header a[data-toggle="collapse"] {
display: block;
.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"] i {
transition: all .25s linear;
}
.card .card-header a[data-toggle="collapse"].collapsed i {
transform: rotate(-90deg);
}
.card .card-header a.fa {
transition: color .3s linear;
.card .card-header a[data-toggle="collapse"].collapsed i {
transform: rotate(-90deg);
}
.card .card-header a.fa:hover {
color: #333;
}
.card .card-header a.fa {
transition: color .3s linear;
}
.card .card-header a.fa:hover {
color: #333;
}
.card .card-header i + span {
margin-left: 6px;
}
.card .modal-footer {
padding: 0.5rem 0rem;
}
.no-card-header .card-header {
display: none;
}
@ -758,9 +754,9 @@ input.pending {
padding: 6px 20px;
}
.bootstrap-table .fixed-table-toolbar .columns button i + span, .bootstrap-table .fixed-table-toolbar .search button i + span {
display: none;
}
.bootstrap-table .fixed-table-toolbar .columns button i + span, .bootstrap-table .fixed-table-toolbar .search button i + span {
display: none;
}
.fixed-table-toolbar .dropdown-menu {
min-width: unset;