Merge branch 'dev-style'

This commit is contained in:
Argo Zhang 2019-07-12 12:38:01 +08:00
commit db6a1c6cef
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
13 changed files with 670 additions and 579 deletions

View File

@ -21,7 +21,7 @@
}
@section query {
<div>
<div class="tip">
<div class="alert alert-info">
<p class="font-weight-bold">后台任务说明:</p>
<p>1. 默认任务 (立即执行,仅执行一次)</p>
<p>
@ -33,6 +33,7 @@
<p>
<code>
var trigger = TriggerBuilder.Default.WithInterval(TimeSpan.FromSeconds(5)).WithRepeatCount(2).WithStartTime(DateTimeOffset.Now.AddMinutes(1)).Build();
<br/>
TaskServicesManager.GetOrAdd("测试任务", token => Task.Delay(1000), trigger);
</code>
</p>

View File

@ -12,59 +12,30 @@
margin-left: 10px;
}
.bootstrap-table .bs-bars .gear {
.bootstrap-table .bs-bars .toolbar .btn i + span {
display: none;
}
.bootstrap-table .bs-bars .toolbar {
display: inline-flex;
}
}
@media (min-width: 667px) {
.header .nav {
display: flex;
flex: 1 1 auto;
}
.sidebar-toggle-box {
flex: 0 1 auto;
.bootstrap-table .bs-bars .toolbar .btn span {
display: inherit;
}
}
@media (min-width: 768px) {
html {
-ms-overflow-style: none;
}
.main-content {
position: fixed;
overflow: auto;
-ms-overflow-style: auto;
}
.header, footer {
.header, .footer {
position: fixed;
}
}
@media (min-width: 769px) {
.sidebar-open aside {
transform: translate(-100%);
}
.sidebar-open footer {
display: flex;
}
aside {
transition: none;
transform: translate(0);
width: 210px;
overflow: hidden;
bottom: 40px;
}
.sidebar-open .main-content {
margin-left: 0;
display: block;
@ -77,7 +48,7 @@
}
@media (min-width: 1077px) {
.bootstrap-table .bs-bars .btn span:last-child {
.bootstrap-table .bs-bars .toolbar .btn i + span {
display: inline;
}
}

View File

@ -1,8 +1,7 @@
/*Title*/
/*Title*/
.header {
padding: 0 15px;
background: #fff;
border-bottom: 1px solid #ddd;
padding: 0 15px;
top: 0;
left: 0;
right: 0;
@ -14,166 +13,6 @@
height: 3px;
margin: 0 -15px;
}
.header .nav {
display: none;
margin-left: 15px;
}
.header .nav .dropdown {
margin-right: 6px;
}
.header .badge {
position: absolute;
right: -6px;
top: -14px;
opacity: 0.8;
}
.nav [data-toggle="dropdown"] {
border-radius: 4px;
padding: 6px 12px;
transition: all .25s linear;
}
.nav .dropdown-menu {
width: 235px;
border: none;
margin-left: -98px;
margin-top: 12px;
}
.nav .dropdown-arrow {
border-style: solid;
border-width: 0 9px 9px;
position: absolute;
left: 108px;
top: -9px;
}
.nav .dropdown-header {
color: #fff;
padding: 10px;
border-radius: 4px 4px 0 0;
}
.nav .dropdown-footer {
padding: 6px 0;
background-color: #f1f2f7;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.nav .dropdown-item {
display: flex;
border-bottom: 1px solid #EBEBEB;
padding: 10px 12px;
font-size: 0.75rem;
}
.nav .dropdown-item:nth-of-type(odd), .cache-item:nth-of-type(odd) {
background-color: rgba(0, 0, 0, 0.05);
}
.nav .dropdown-item.active, .nav .dropdown-item:active {
color: #212529;
}
.nav .dropdown-item > :nth-child(2) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
flex: 1 1 auto;
padding: 0 6px;
}
.nav .dropdown-item .small {
font-weight: bold;
}
.userinfo img {
height: 29px;
width: 29px;
border-radius: 2px;
}
.userinfo .dropdown-toggle {
display: block;
padding: 6px;
border-radius: 4px;
transition: all .25s linear;
}
.userinfo .dropdown-toggle, .nav [data-toggle="dropdown"] {
border: 1px solid #eee;
color: #777;
}
.userinfo .dropdown-toggle:after {
vertical-align: middle;
}
.userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .nav [data-toggle="dropdown"]:hover {
color: #333;
border: solid 1px #337ab7;
}
.userinfo .dropdown-item {
display: flex;
width: 270px;
padding: 0;
justify-content: space-around;
background-color: #fff;
}
.userinfo .dropdown-item a {
text-align: center;
color: #777;
padding: 15px 10px;
flex: 1 1 33.333%;
}
.userinfo .dropdown-item a i {
font-size: 1.025rem;
display: block;
margin-bottom: 4px;
}
.userinfo .dropdown-item:first-child {
border-radius: 4px 4px 0 0;
}
.userinfo .dropdown-item:first-child a:hover {
color: #333;
}
.userinfo .dropdown-item:last-child {
border-radius: 0 0 4px 4px;
}
.userinfo .dropdown-item:last-child a {
color: #ca3a39;
border-radius: 0 0 0.15rem 0.15rem;
background: #a9d96c;
background-image: linear-gradient(to bottom, #a9d96c 0%, #799e51 100%);
}
.userinfo .dropdown-item:last-child a:hover {
color: #d40c0b;
}
.userinfo .username {
max-width: 90px;
vertical-align: middle;
}
.userinfo .badge {
left: 234px;
right: auto;
top: 6px;
}
/*end title*/
.welcome-bg {
@ -230,15 +69,11 @@
top: -8px;
}
.cache-item .btn:not(:first-child), td .btn:not(.btn-lg) {
.cache-item .btn:not(:first-child) {
font-size: 0.75rem;
padding: 1px 5px;
}
td .btn:not(:first-child) {
margin-left: 5px;
}
.card-img {
max-width: 258px;
margin-bottom: 15px;
@ -571,76 +406,6 @@ li[data-category="1"] .dd3-content .menuType {
border: 1px solid #404040;
}
.bootstrap-table .badge {
padding: 4px 6px;
}
.bootstrap-table .badge .fa {
margin-right: 4px;
}
.bootstrap-table .fa-info {
width: 9px;
}
.bootstrap-table .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
line-height: normal;
}
.bootstrap-table .bs-bars .btn span:last-child {
display: none;
}
.bootstrap-table .bs-bars .toolbar {
display: none;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a {
padding: 8px 12px;
display: table-cell;
color: #504d4d;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a:not(:first-child) {
border-left: solid 1px #aeb2b7;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a:hover {
color: #235e90;
}
.bootstrap-table td {
word-break: break-all;
}
.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text {
font-size: 0.875rem;
}
.bootstrap-table td, .bootstrap-table .fixed-table-container .table thead th .th-inner {
padding: 0.5rem;
}
.bootstrap-table .fixed-table-container .table thead th .th-inner.sortable {
padding-right: 30px;
}
.bootstrap-table .table tbody tr:nth-of-type(odd) {
background-color: rgba(0,0,0,.05);
}
.bootstrap-table .fixed-table-container .fixed-table-body {
border-radius: 4px;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label {
margin-bottom: 0;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label input[type='checkbox'] {
cursor: pointer;
}
pre {
padding: 5px;
margin: 5px;
@ -674,3 +439,11 @@ pre {
overflow: auto;
padding: 6px 0;
}
.refreshIcon {
color: rgba(255,255,255,.8);
}
.refreshIcon:hover {
color: #fff;
}

View File

@ -16,6 +16,18 @@
.sidebar-toggle-box span {
display: inline;
}
.bootstrap-table .bs-bars .gear {
display: none;
}
.bootstrap-table .bs-bars .toolbar {
display: inline-flex;
}
.bootstrap-table .bs-bars .toolbar .btn i + span {
display: inline;
}
}
@media (min-width: 576px) {
@ -24,29 +36,66 @@
padding-bottom: 6px;
}
.form-inline select.form-control {
min-width: 194px;
.form-inline input.form-control, .form-select > input.form-control {
width: 194px;
}
.form-inline .date input.form-control {
width: 1%;
}
.input-group.date {
width: 194px;
}
.modal-lg {
max-width: calc(90%);
}
.input-group.date {
width: 186px;
}
.btn-fill {
width: auto;
}
}
@media (min-width: 667px) {
.header .nav {
display: flex;
flex: 1 1 auto;
}
.sidebar-toggle-box {
flex: 0 1 auto;
}
}
@media (min-width: 768px) {
html {
-ms-overflow-style: none;
}
.sidebar-open aside {
transform: translate(0);
}
}
@media (min-width: 769px) {
.sidebar-open aside {
transform: translate(-100%);
}
.sidebar-open footer {
display: flex;
}
aside {
transition: none;
transform: translate(0);
width: 210px;
overflow: hidden;
bottom: 40px;
}
}
@media (min-width: 940px) {
.form-check-input + span, .form-check-input + label {
max-width: 192px;

View File

@ -1,4 +1,4 @@
html {
html {
font-size: 16px;
-ms-overflow-style: auto;
}
@ -11,12 +11,176 @@ body {
-webkit-overflow-scrolling: touch;
}
.header {
background: #fff;
}
.header .nav {
display: none;
margin-left: 15px;
}
.header .nav .dropdown {
margin-right: 6px;
}
.header .badge {
position: absolute;
right: -6px;
top: -14px;
opacity: 0.8;
}
.userinfo img {
height: 29px;
width: 29px;
border-radius: 2px;
}
.userinfo .dropdown-toggle {
display: block;
padding: 6px;
border-radius: 4px;
transition: all .25s linear;
}
.userinfo .dropdown-toggle, .nav [data-toggle="dropdown"] {
border: 1px solid #eee;
color: #777;
}
.userinfo .dropdown-toggle:after {
vertical-align: middle;
}
.userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .nav [data-toggle="dropdown"]:hover {
color: #333;
border: solid 1px #337ab7;
}
.userinfo .dropdown-item {
display: flex;
width: 270px;
padding: 0;
justify-content: space-around;
background-color: #fff;
}
.userinfo .dropdown-item a {
text-align: center;
color: #777;
padding: 15px 10px;
flex: 1 1 33.333%;
}
.userinfo .dropdown-item a i {
font-size: 1.025rem;
display: block;
margin-bottom: 4px;
}
.userinfo .dropdown-item:first-child {
border-radius: 4px 4px 0 0;
}
.userinfo .dropdown-item:first-child a:hover {
color: #333;
}
.userinfo .dropdown-item:last-child {
border-radius: 0 0 4px 4px;
}
.userinfo .dropdown-item:last-child a {
color: #ca3a39;
border-radius: 0 0 0.15rem 0.15rem;
background: #a9d96c;
background-image: linear-gradient(to bottom, #a9d96c 0%, #799e51 100%);
}
.userinfo .dropdown-item:last-child a:hover {
color: #d40c0b;
}
.userinfo .username {
max-width: 90px;
vertical-align: middle;
}
.userinfo .badge {
left: 234px;
right: auto;
top: 6px;
}
.nav [data-toggle="dropdown"] {
border-radius: 4px;
padding: 6px 12px;
transition: all .25s linear;
}
.nav .dropdown-menu {
width: 235px;
border: none;
margin-left: -98px;
margin-top: 12px;
}
.nav .dropdown-arrow {
border-style: solid;
border-width: 0 9px 9px;
position: absolute;
left: 108px;
top: -9px;
}
.nav .dropdown-header {
color: #fff;
padding: 10px;
border-radius: 4px 4px 0 0;
}
.nav .dropdown-footer {
padding: 6px 0;
background-color: #f1f2f7;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.nav .dropdown-item {
display: flex;
border-bottom: 1px solid #EBEBEB;
padding: 10px 12px;
font-size: 0.75rem;
}
.nav .dropdown-item:nth-of-type(odd), .cache-item:nth-of-type(odd) {
background-color: rgba(0, 0, 0, 0.05);
}
.nav .dropdown-item.active, .nav .dropdown-item:active {
color: #212529;
}
.nav .dropdown-item > :nth-child(2) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
flex: 1 1 auto;
padding: 0 6px;
}
.nav .dropdown-item .small {
font-weight: bold;
}
a, a:hover, a:focus {
text-decoration: none;
outline: none;
}
body, .form-control, .dropdown-menu, .btn:not(.btn-lg), .input-group-text, .popover-header {
body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-group-text, .popover-header {
font-size: 0.875rem;
}
@ -275,7 +439,7 @@ input.pending {
}
.form-inline .form-row, .form-inline .row {
flex: 1 1 auto;
flex: 1 1 100%;
}
.modal-header {
@ -317,7 +481,7 @@ input.pending {
margin-left: 6px;
}
.btn span:last-child {
.btn i + span {
margin-left: 4px;
}
@ -382,6 +546,93 @@ input.pending {
background-color: #f8f9fa;
}
.bootstrap-table .card-view-value > .btn:first-child {
margin-left: 4px;
}
.bootstrap-table td > .btn:not(:first-child) {
margin-left: 5px;
}
.bootstrap-table .badge {
padding: 4px 6px;
}
.bootstrap-table .badge .fa {
margin-right: 4px;
}
.bootstrap-table .fa-info {
width: 9px;
}
.bootstrap-table .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
line-height: normal;
}
.bootstrap-table .bs-bars .toolbar {
display: none;
}
.bootstrap-table .bs-bars .toolbar .btn i + span {
display: none;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a {
padding: 8px 12px;
display: table-cell;
color: #504d4d;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a:not(:first-child) {
border-left: solid 1px #aeb2b7;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a:hover {
color: #235e90;
}
.bootstrap-table td {
word-break: break-all;
}
.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text {
font-size: 0.875rem;
}
.bootstrap-table td, .bootstrap-table .fixed-table-container .table thead th .th-inner {
padding: 0.5rem;
}
.bootstrap-table .fixed-table-container .table thead th .th-inner.sortable {
padding-right: 30px;
}
.bootstrap-table .table tbody tr:nth-of-type(odd) {
background-color: rgba(0,0,0,.05);
}
.bootstrap-table .fixed-table-container .fixed-table-body {
border-radius: 4px;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label {
margin-bottom: 0;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label input[type='checkbox'] {
cursor: pointer;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table td .btn:not(.btn-lg) {
font-size: 0.75rem;
padding: 1px 5px;
}
.bootstrap-table .fixed-table-container .table.table-sm tbody td {
padding: 0.3rem;
}
.card-body .bootstrap-table {
margin-top: -10px;
}
@ -521,14 +772,6 @@ input.pending {
padding: 0.4em 1em;
}
.refreshIcon {
color: rgba(255,255,255,.8);
}
.refreshIcon:hover {
color: #fff;
}
.alert-info {
border-left: solid 4px #53d0e4;
}
@ -536,11 +779,3 @@ input.pending {
.alert-danger {
border-left: solid 4px #f78792;
}
.tip {
padding: 0.5rem 1rem;
background-color: #ecf8ff;
border-radius: 4px;
border-left: 5px solid #50bfff;
margin-bottom: 1rem;
}

View File

@ -224,7 +224,7 @@
return prefix;
},
footer: function (options) {
var op = $.extend({ header: "header", content: ".main-content", ele: 'footer' }, options);
var op = $.extend({ header: "header", content: "body > section:first", ele: 'footer' }, options);
var $ele = $(op.ele);
return $(op.header).outerHeight() + $(op.content).outerHeight() + $ele.outerHeight() > $(window).height() ? $ele.removeClass('position-fixed') : $ele.addClass('position-fixed');
},

View File

@ -18,7 +18,7 @@ namespace Bootstrap.Client.Models
/// <param name="identity"></param>
public HeaderBarModel(IIdentity identity)
{
var user = DbHelper.RetrieveUserByUserName(identity.Name);
var user = DbHelper.RetrieveUserByUserNameWithCache(identity.Name);
DisplayName = user.DisplayName;
UserName = user.UserName;
SettingsUrl = DbHelper.RetrieveSettingsUrl();
@ -33,7 +33,7 @@ namespace Bootstrap.Client.Models
// set Icon
var icon = $"/{DbHelper.RetrieveIconFolderPath().Trim('~', '/')}/{user.Icon}";
Icon = $"{authHost.TrimEnd('/')}{icon}";
Icon = string.IsNullOrEmpty(ConfigurationManager.GetValue("SimulateUserName", string.Empty)) ? $"{authHost.TrimEnd('/')}{icon}" : "/images/admin.jpg";
if (!string.IsNullOrEmpty(user.Css)) Theme = user.Css;
}

View File

@ -1,6 +1,6 @@
@model ModelBase
<footer class="position-fixed">
<span id="websiteFooter">@Model.Footer</span>
<div><span id="websiteFooter">@Model.Footer</span></div>
<a id="gotoTop" href="#" class="go-top" title="返回顶部" data-toggle="tooltip" data-placement="left">
<i class="fa fa-angle-up"></i>
</a>

View File

@ -9,6 +9,12 @@
}
}
@media (min-width: 768px) {
.sidebar-open aside {
transform: translate(-100%);
}
}
@media (min-width: 769px) {
footer {
display: flex;

View File

@ -1,6 +1,5 @@
/*Title*/
.header {
background: #fff;
border-bottom: 1px solid #ccc;
}
@ -21,95 +20,16 @@
padding: 0 15px;
}
.header .nav {
display: none;
margin-left: 15px;
.sidebar-toggle-box {
color: #eee;
}
.sidebar-toggle-box:hover {
color: #fff;
}
.header .nav .dropdown {
margin-right: 6px;
}
.header .badge {
position: absolute;
right: -6px;
top: -14px;
opacity: 0.8;
}
.nav [data-toggle="dropdown"] {
border-radius: 4px;
padding: 6px 12px;
transition: all .25s linear;
}
.nav .dropdown-menu {
width: 235px;
border: none;
margin-left: -98px;
margin-top: 12px;
}
.nav .dropdown-arrow {
border-style: solid;
border-width: 0 9px 9px;
position: absolute;
left: 108px;
top: -9px;
}
.nav .dropdown-header {
color: #fff;
padding: 10px;
border-radius: 4px 4px 0 0;
}
.nav .dropdown-footer {
padding: 6px 0;
background-color: #f1f2f7;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.nav .dropdown-item {
display: flex;
border-bottom: 1px solid #EBEBEB;
padding: 10px 12px;
font-size: 0.75rem;
}
.nav .dropdown-item:nth-of-type(odd), .cache-item:nth-of-type(odd) {
background-color: rgba(0, 0, 0, 0.05);
}
.nav .dropdown-item.active, .nav .dropdown-item:active {
color: #212529;
}
.nav .dropdown-item > :nth-child(2) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
flex: 1 1 auto;
padding: 0 6px;
}
.nav .dropdown-item .small {
font-weight: bold;
}
.userinfo img {
height: 29px;
width: 29px;
border-radius: 2px;
}
.userinfo .dropdown-toggle {
display: block;
padding: 6px;
border-radius: 4px;
transition: all .25s linear;
aside {
top: 92px;
}
.userinfo .dropdown-toggle, .nav [data-toggle="dropdown"] {
@ -117,66 +37,7 @@
color: #eee;
}
.userinfo .dropdown-toggle:after {
vertical-align: middle;
}
.userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .nav [data-toggle="dropdown"]:hover {
color: #fff;
border: 1px solid #fff;
}
.userinfo .dropdown-item {
display: flex;
width: 270px;
padding: 0;
justify-content: space-around;
}
.userinfo .dropdown-item a {
text-align: center;
color: #777;
padding: 15px 10px;
flex: 1 1 33.333%;
}
.userinfo .dropdown-item a i {
font-size: 1.025rem;
display: block;
margin-bottom: 4px;
}
.userinfo .dropdown-item:first-child {
border-radius: 4px 4px 0 0;
}
.userinfo .dropdown-item:first-child a:hover {
color: #333;
}
.userinfo .dropdown-item:last-child {
border-radius: 0 0 4px 4px;
}
.userinfo .dropdown-item:last-child a {
color: #ca3a39;
border-radius: 0 0 0.15rem 0.15rem;
background: #a9d96c;
background-image: linear-gradient(to bottom, #a9d96c 0%, #799e51 100%);
}
.userinfo .dropdown-item:last-child a:hover {
color: #d40c0b;
}
.userinfo .username {
max-width: 90px;
vertical-align: middle;
}
.userinfo .badge {
left: 234px;
right: auto;
top: 6px;
}
/*end title*/
}

View File

@ -1,6 +1,6 @@
@media (min-width: 375px) {
.toolbar .dropdown-menu a {
padding: 0 20px;
padding: 0 14px;
}
.toolbar .dropdown-menu a:first-child {
@ -17,13 +17,17 @@
display: inline;
}
.toolbar {
.bootstrap-table .bs-bars .gear {
display: none;
}
.bs-bars {
display: inline-block;
.bootstrap-table .bs-bars .toolbar {
display: inline-flex;
}
.bootstrap-table .bs-bars .toolbar .btn i + span {
display: inline;
}
}
@media (min-width: 576px) {
@ -32,7 +36,7 @@
padding-bottom: 6px;
}
.form-inline select.form-control {
.form-inline select.form-control, .form-inline .select.form-control {
min-width: 194px;
}
@ -41,7 +45,7 @@
}
.input-group.date {
width: 186px;
width: 194px;
}
.btn-fill {
@ -49,21 +53,46 @@
}
}
@media (min-width: 667px) {
.header .nav {
display: flex;
flex: 1 1 auto;
}
.sidebar-toggle-box {
flex: 0 1 auto;
}
}
@media (min-width: 768px) {
html {
-ms-overflow-style: none;
}
.sidebar-open aside {
transform: translate(0);
}
}
@media (min-width: 769px) {
.sidebar-open aside {
transform: translate(-100%);
}
.modal-body .bootstrap-table {
margin-top: -15px;
.sidebar-open footer {
display: flex;
}
aside {
transition: none;
transform: translate(0);
width: 210px;
overflow: hidden;
bottom: 40px;
}
}
@media (min-width: 940px) {
.btn span:last-child {
display: inline;
}
.form-check-input + span, .form-check-input + label {
max-width: 192px;
}

View File

@ -11,6 +11,170 @@ body {
-webkit-overflow-scrolling: touch;
}
.header {
background: #fff;
}
.header .nav {
display: none;
margin-left: 15px;
}
.header .nav .dropdown {
margin-right: 6px;
}
.header .badge {
position: absolute;
right: -6px;
top: -14px;
opacity: 0.8;
}
.userinfo img {
height: 29px;
width: 29px;
border-radius: 2px;
}
.userinfo .dropdown-toggle {
display: block;
padding: 6px;
border-radius: 4px;
transition: all .25s linear;
}
.userinfo .dropdown-toggle, .nav [data-toggle="dropdown"] {
border: 1px solid #eee;
color: #777;
}
.userinfo .dropdown-toggle:after {
vertical-align: middle;
}
.userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .nav [data-toggle="dropdown"]:hover {
color: #333;
border: solid 1px #337ab7;
}
.userinfo .dropdown-item {
display: flex;
width: 270px;
padding: 0;
justify-content: space-around;
background-color: #fff;
}
.userinfo .dropdown-item a {
text-align: center;
color: #777;
padding: 15px 10px;
flex: 1 1 33.333%;
}
.userinfo .dropdown-item a i {
font-size: 1.025rem;
display: block;
margin-bottom: 4px;
}
.userinfo .dropdown-item:first-child {
border-radius: 4px 4px 0 0;
}
.userinfo .dropdown-item:first-child a:hover {
color: #333;
}
.userinfo .dropdown-item:last-child {
border-radius: 0 0 4px 4px;
}
.userinfo .dropdown-item:last-child a {
color: #ca3a39;
border-radius: 0 0 0.15rem 0.15rem;
background: #a9d96c;
background-image: linear-gradient(to bottom, #a9d96c 0%, #799e51 100%);
}
.userinfo .dropdown-item:last-child a:hover {
color: #d40c0b;
}
.userinfo .username {
max-width: 90px;
vertical-align: middle;
}
.userinfo .badge {
left: 234px;
right: auto;
top: 6px;
}
.nav [data-toggle="dropdown"] {
border-radius: 4px;
padding: 6px 12px;
transition: all .25s linear;
}
.nav .dropdown-menu {
width: 235px;
border: none;
margin-left: -98px;
margin-top: 12px;
}
.nav .dropdown-arrow {
border-style: solid;
border-width: 0 9px 9px;
position: absolute;
left: 108px;
top: -9px;
}
.nav .dropdown-header {
color: #fff;
padding: 10px;
border-radius: 4px 4px 0 0;
}
.nav .dropdown-footer {
padding: 6px 0;
background-color: #f1f2f7;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.nav .dropdown-item {
display: flex;
border-bottom: 1px solid #EBEBEB;
padding: 10px 12px;
font-size: 0.75rem;
}
.nav .dropdown-item:nth-of-type(odd), .cache-item:nth-of-type(odd) {
background-color: rgba(0, 0, 0, 0.05);
}
.nav .dropdown-item.active, .nav .dropdown-item:active {
color: #212529;
}
.nav .dropdown-item > :nth-child(2) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
flex: 1 1 auto;
padding: 0 6px;
}
.nav .dropdown-item .small {
font-weight: bold;
}
a, a:hover, a:focus {
text-decoration: none;
outline: none;
@ -59,7 +223,7 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou
.sidebar .nav-link {
color: #aeb2b7;
padding: 15px 10px;
transition: all .3s linear;
transition: background .3s linear, color .3s linear;
display: flex;
align-items: center;
}
@ -101,14 +265,14 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou
.sidebar-toggle-box {
display: block;
font-size: 1.25rem;
color: #eee;
color: #777;
flex: 1 1 auto;
padding: 12px 0;
transition: color .3s linear;
}
.sidebar-toggle-box:hover {
color: #fff;
color: #333;
}
.sidebar-toggle-box span {
@ -119,7 +283,7 @@ aside {
transition: transform .4s ease-in-out;
transform: translate(-100%);
position: absolute;
top: 92px;
top: 96px;
bottom: 0;
left: 0;
right: 0;
@ -151,11 +315,9 @@ footer {
display: flex;
}
footer > span {
footer div {
flex: 1 1 auto;
text-align: center;
margin-left: 4px;
display: inline-block;
}
.go-top {
@ -178,35 +340,10 @@ footer {
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;
}
@ -270,34 +407,6 @@ footer {
border-bottom-color: #dc3545;
}
.radioGroup, .checkGroup, [radioGroup="true"], [checkGroup="true"] {
border: solid 1px transparent;
border-radius: 4px;
padding: 1px 4px;
}
.radioGroup.is-invalid, .checkGroup.is-invalid, [radioGroup="true"].is-invalid, [checkGroup="true"].is-invalid {
border: solid 1px #dc3545;
}
.radioGroup.is-invalid .form-check-input ~ .form-check-label,
.checkGroup.is-invalid .form-check-input ~ .form-check-label,
[radioGroup="true"].is-invalid .form-check-input ~ .form-check-label,
[checkGroup="true"].is-invalid .form-check-input ~ .form-check-label {
color: #dc3545;
}
.radioGroup.is-valid .form-check-input ~ .form-check-label,
[radioGroup="true"].is-valid .form-check-input ~ .form-check-label {
color: #28a745;
}
.checkGroup.is-valid .form-check-input ~ .form-check-label,
[checkGroup="true"].is-valid .form-check-input ~ .form-check-label {
color: unset;
}
input.is-invalid {
background-repeat: no-repeat;
background-image: url('../images/error.png');
@ -330,7 +439,7 @@ input.pending {
}
.form-inline .form-row, .form-inline .row {
flex: 1 1 auto;
flex: 1 1 100%;
}
.modal-header {
@ -338,10 +447,6 @@ input.pending {
padding: 10px 15px;
}
.modal-body, .modal-footer, .popover-body {
background-color: #fff;
}
.modal-title {
overflow-x: hidden;
text-overflow: ellipsis;
@ -352,10 +457,6 @@ input.pending {
padding: 15px 15px 0 15px;
}
.modal-footer .btn span:last-child {
display: inline;
}
.card {
margin-bottom: 15px;
}
@ -380,7 +481,7 @@ input.pending {
margin-left: 6px;
}
.btn i.fa + span {
.btn span:last-child {
margin-left: 4px;
}
@ -400,10 +501,6 @@ input.pending {
border-top: none;
}
.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
line-height: normal;
}
.table-condensed > thead > tr > th, .table-condensed > tfoot > tr > th, .table-condensed > tbody > tr > td {
padding: 2px 0;
}
@ -416,14 +513,10 @@ input.pending {
margin-bottom: 15px;
}
.bootstrap-table .fixed-table-body .table {
border-bottom: none;
.bootstrap-table .fixed-table-body .table td > a {
display: block;
}
.bootstrap-table .fixed-table-body .table td > a {
display: block;
}
.bootstrap-table .fixed-table-toolbar .columns-right .btn-group .dropdown-menu {
padding-top: 8px;
}
@ -432,7 +525,7 @@ input.pending {
word-break: break-all;
}
.bootstrap-table .fixed-table-container .card-view .value > a, .bootstrap-table .fixed-table-container .card-view .value > div:not(.form-check) {
.bootstrap-table .fixed-table-container .card-view .value > a, .bootstrap-table .fixed-table-container .card-view .value > div:not(.btn-group) {
min-width: 60px;
display: inline-block;
}
@ -441,7 +534,103 @@ input.pending {
margin-bottom: 6px;
}
.card-body:not(.nobar) .bootstrap-table {
.bootstrap-table .export .dropdown-menu a {
min-width: 110px;
}
.bootstrap-table .export .dropdown-menu {
padding-bottom: 8px;
}
.bootstrap-table .export .dropdown-menu li:hover {
background-color: #f8f9fa;
}
.bootstrap-table .card-view-value > .btn:first-child {
margin-left: 4px;
}
.bootstrap-table td > .btn:not(:first-child) {
margin-left: 5px;
}
.bootstrap-table .badge {
padding: 4px 6px;
}
.bootstrap-table .badge .fa {
margin-right: 4px;
}
.bootstrap-table .fa-info {
width: 9px;
}
.bootstrap-table .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
line-height: normal;
}
.bootstrap-table .bs-bars .toolbar {
display: none;
}
.bootstrap-table .bs-bars .toolbar .btn i + span {
display: none;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a {
padding: 8px 12px;
display: table-cell;
color: #504d4d;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a:not(:first-child) {
border-left: solid 1px #aeb2b7;
}
.bootstrap-table .bs-bars .gear .dropdown-menu a:hover {
color: #235e90;
}
.bootstrap-table td {
word-break: break-all;
}
.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text {
font-size: 0.875rem;
}
.bootstrap-table td, .bootstrap-table .fixed-table-container .table thead th .th-inner {
padding: 0.5rem;
}
.bootstrap-table .fixed-table-container .table thead th .th-inner.sortable {
padding-right: 30px;
}
.bootstrap-table .table tbody tr:nth-of-type(odd) {
background-color: rgba(0,0,0,.05);
}
.bootstrap-table .fixed-table-container .fixed-table-body {
border-radius: 4px;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label {
margin-bottom: 0;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table .bs-checkbox label input[type='checkbox'] {
cursor: pointer;
}
.bootstrap-table .fixed-table-container .fixed-table-body .table td .btn:not(.btn-lg) {
font-size: 0.75rem;
padding: 1px 5px;
}
.card-body .bootstrap-table {
margin-top: -10px;
}
@ -571,42 +760,19 @@ input.pending {
display: inline-block;
}
.toggle .btn-default, .toggle.btn-default {
text-shadow: 0 1px 0 #fff;
background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
background-image: -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border-color: #ccc;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
}
.toggle .btn-default.active {
background-image: none;
background-color: #e0e0e0;
border-color: #dbdbdb;
}
.toggle .btn-default.active:hover {
color: #333;
background-color: #d4d4d4;
border-color: #8c8c8c;
}
.toggle.btn .toggle-handle {
display: inline-block;
margin-left: 0;
}
.sweet-alert h2 {
margin-top: 32px;
.swal2-popup .swal2-title {
margin-bottom: 16px;
font-size: 1.5rem;
}
.sweet-alert .sa-button-container .btn-lg {
padding: 0.375rem 1.5rem;
font-size: 1rem;
.swal2-popup .swal2-styled {
padding: 0.4em 1em;
}
.alert-info {
border-left: solid 4px #53d0e4;
}
.alert-danger {
border-left: solid 4px #f78792;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB