From 72d3f1fa3cc3afad9eef4073c4acf48a1449e717 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 9 Jul 2019 14:11:18 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E5=90=88=E5=B9=B6=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=88=B0theme.css=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/Views/Admin/Tasks.cshtml | 2 +- .../wwwroot/css/site-responsive.css | 39 +- Bootstrap.Admin/wwwroot/css/site.css | 247 +---------- .../wwwroot/css/theme-responsive.css | 49 ++- Bootstrap.Admin/wwwroot/css/theme.css | 265 +++++++++++- .../wwwroot/lib/longbow/longbow.common.js | 2 +- Bootstrap.Client/Views/Shared/Footer.cshtml | 2 +- .../wwwroot/css/site-responsive.css | 6 + Bootstrap.Client/wwwroot/css/site.css | 157 +------ .../wwwroot/css/theme-responsive.css | 53 ++- Bootstrap.Client/wwwroot/css/theme.css | 393 ++++++++++++------ 11 files changed, 644 insertions(+), 571 deletions(-) diff --git a/Bootstrap.Admin/Views/Admin/Tasks.cshtml b/Bootstrap.Admin/Views/Admin/Tasks.cshtml index d21bb6dc..d2efcd1c 100644 --- a/Bootstrap.Admin/Views/Admin/Tasks.cshtml +++ b/Bootstrap.Admin/Views/Admin/Tasks.cshtml @@ -21,7 +21,7 @@ } @section query {
-
+

后台任务说明：

1. 默认任务 (立即执行，仅执行一次)

diff --git a/Bootstrap.Admin/wwwroot/css/site-responsive.css b/Bootstrap.Admin/wwwroot/css/site-responsive.css index b0d9ba71..fa843b68 100644 --- a/Bootstrap.Admin/wwwroot/css/site-responsive.css +++ b/Bootstrap.Admin/wwwroot/css/site-responsive.css @@ -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; } } diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css index 241af937..c94902c1 100644 --- a/Bootstrap.Admin/wwwroot/css/site.css +++ b/Bootstrap.Admin/wwwroot/css/site.css @@ -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 { @@ -235,10 +74,6 @@ 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; + } diff --git a/Bootstrap.Admin/wwwroot/css/theme-responsive.css b/Bootstrap.Admin/wwwroot/css/theme-responsive.css index c0117814..3033cb38 100644 --- a/Bootstrap.Admin/wwwroot/css/theme-responsive.css +++ b/Bootstrap.Admin/wwwroot/css/theme-responsive.css @@ -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,7 +36,7 @@ padding-bottom: 6px; } - .form-inline select.form-control { + .form-inline select.form-control, .form-inline .select.form-control { min-width: 194px; } @@ -33,7 +45,7 @@ } .input-group.date { - width: 186px; + width: 194px; } .btn-fill { @@ -41,12 +53,45 @@ } } +@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; diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css index cc2c7ee3..f97ae11f 100644 --- a/Bootstrap.Admin/wwwroot/css/theme.css +++ b/Bootstrap.Admin/wwwroot/css/theme.css @@ -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 { @@ -382,6 +546,85 @@ 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; + } + .card-body .bootstrap-table { margin-top: -10px; } @@ -521,14 +764,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 +771,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; -} \ No newline at end of file diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js index 461b44b0..0ce05430 100644 --- a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js +++ b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js @@ -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'); }, diff --git a/Bootstrap.Client/Views/Shared/Footer.cshtml b/Bootstrap.Client/Views/Shared/Footer.cshtml index 0760e553..673ad7ad 100644 --- a/Bootstrap.Client/Views/Shared/Footer.cshtml +++ b/Bootstrap.Client/Views/Shared/Footer.cshtml @@ -1,6 +1,6 @@ @model ModelBase