From 1d76673c8a2b841cc9c862554b50176048c12c76 Mon Sep 17 00:00:00 2001 From: Argo-MacBookPro Date: Sun, 30 Sep 2018 15:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F=EF=BC=9A?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E9=80=9A=E7=94=A8=E6=A0=B7=E5=BC=8F=E5=88=B0?= =?UTF-8?q?theme=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E4=BE=BF=E4=BA=8E=E4=BB=A5=E5=90=8E=E5=A4=8D=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/css/admin-responsive.css | 18 +++ Bootstrap.Admin/wwwroot/css/admin.css | 8 +- Bootstrap.Admin/wwwroot/css/site.css | 20 ---- .../wwwroot/css/theme-responsive.css | 18 +-- Bootstrap.Admin/wwwroot/css/theme.css | 21 +++- .../wwwroot/css/site-responsive.css | 25 +++++ Bootstrap.Client/wwwroot/css/site.css | 10 +- .../wwwroot/css/theme-responsive.css | 20 +--- Bootstrap.Client/wwwroot/css/theme.css | 103 ++++++++++++++---- 9 files changed, 156 insertions(+), 87 deletions(-) diff --git a/Bootstrap.Admin/wwwroot/css/admin-responsive.css b/Bootstrap.Admin/wwwroot/css/admin-responsive.css index 58f7d3f7..3b468de8 100644 --- a/Bootstrap.Admin/wwwroot/css/admin-responsive.css +++ b/Bootstrap.Admin/wwwroot/css/admin-responsive.css @@ -8,6 +8,24 @@ } } +@media (min-width: 568px) { + .toolbar { + display: none; + } + + .bs-bars { + display: inline-block; + } +} + +@media (min-width: 576px) { + .btn-fill { + width: auto; + align-self: flex-end; + margin-bottom: 2px; + } +} + @media (min-width: 768px) { .main-content { position: fixed; diff --git a/Bootstrap.Admin/wwwroot/css/admin.css b/Bootstrap.Admin/wwwroot/css/admin.css index f7d64ff2..d03b45f7 100644 --- a/Bootstrap.Admin/wwwroot/css/admin.css +++ b/Bootstrap.Admin/wwwroot/css/admin.css @@ -17,10 +17,6 @@ display: none; } -.mCSB_scrollTools { - width: 10px; -} - .main-content { padding: 15px 15px 0 15px; margin-left: 0; @@ -74,6 +70,10 @@ color: #235e90; } +.btn-fill { + width: 100%; +} + /*Messages*/ .mail-box { display: flex; diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css index 25ddfb88..5ab5b095 100644 --- a/Bootstrap.Admin/wwwroot/css/site.css +++ b/Bootstrap.Admin/wwwroot/css/site.css @@ -94,26 +94,6 @@ aside { margin-bottom: 15px; } -a, a:hover, a:focus { - text-decoration: none; - outline: none; -} - -.dropdown-select + .dropdown-menu a:hover { - background: #007AC0; - color: #fff; -} - -.dropdown-menu a { - transition: all .25s linear; - padding: 6px 20px; - display: block; -} - -.dropdown-menu .divider { - margin: 1px 0; -} - /*Title*/ .sidebar-toggle-box { font-size: 1.25rem; diff --git a/Bootstrap.Admin/wwwroot/css/theme-responsive.css b/Bootstrap.Admin/wwwroot/css/theme-responsive.css index c959b8c7..8b9b7663 100644 --- a/Bootstrap.Admin/wwwroot/css/theme-responsive.css +++ b/Bootstrap.Admin/wwwroot/css/theme-responsive.css @@ -4,16 +4,6 @@ } } -@media (min-width: 568px) { - .toolbar { - display: none; - } - - .bs-bars { - display: inline-block; - } -} - @media (min-width: 576px) { .form-group .form-control-url { width: calc(100% - 125px); @@ -28,13 +18,7 @@ max-width: calc(90%); } - .btn-fill { - width: auto; - align-self: flex-end; - margin-bottom: 2px; - } - - .input-group.date.form_date { + .input-group.date { width: 186px; } } diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css index 432a44f4..b2b64c0f 100644 --- a/Bootstrap.Admin/wwwroot/css/theme.css +++ b/Bootstrap.Admin/wwwroot/css/theme.css @@ -25,12 +25,19 @@ outline: none; } -.dropdown-divider { - margin: 0.125rem 0; +.dropdown-select + .dropdown-menu a:hover { + background: #007AC0; + color: #fff; } -.btn-fill { - width: 100%; +.dropdown-menu a { + transition: all .25s linear; + padding: 6px 20px; + display: block; +} + +.dropdown-divider { + margin: 0.125rem 0; } .tooltip-inner { @@ -149,7 +156,7 @@ input.pending { } .bootstrap-table .fixed-table-toolbar .columns-right .btn-group .dropdown-menu { - padding: 10px 0; + padding-top: 8px; } .card { @@ -244,3 +251,7 @@ input.pending { -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); } + +.mCSB_scrollTools { + width: 10px; +} diff --git a/Bootstrap.Client/wwwroot/css/site-responsive.css b/Bootstrap.Client/wwwroot/css/site-responsive.css index cb914c60..8dd7198c 100644 --- a/Bootstrap.Client/wwwroot/css/site-responsive.css +++ b/Bootstrap.Client/wwwroot/css/site-responsive.css @@ -1,7 +1,32 @@ +@media (min-width: 375px) { + .toolbar .dropdown-menu a { + padding: 0 20px; + } + + .toolbar .dropdown-menu a:first-child { + border-left: none; + } +} + @media (min-width: 568px) { .sidebar-toggle-box span { display: inline; } + + .toolbar { + display: none; + } + + .bs-bars { + display: inline-block; + } +} + +@media (min-width: 576px) { + .btn-fill { + width: auto; + align-self: flex-end; + } } @media (min-width: 667px) { diff --git a/Bootstrap.Client/wwwroot/css/site.css b/Bootstrap.Client/wwwroot/css/site.css index beb3206c..2553e137 100644 --- a/Bootstrap.Client/wwwroot/css/site.css +++ b/Bootstrap.Client/wwwroot/css/site.css @@ -360,7 +360,11 @@ a, a:hover, a:focus { .breadcrumb i { padding-right: 6px; } - -.container-fluid { - padding-top: 15px; + +.bs-bars { + display: none; +} + +.btn-fill { + width: 100%; } diff --git a/Bootstrap.Client/wwwroot/css/theme-responsive.css b/Bootstrap.Client/wwwroot/css/theme-responsive.css index a4098dd4..8b9b7663 100644 --- a/Bootstrap.Client/wwwroot/css/theme-responsive.css +++ b/Bootstrap.Client/wwwroot/css/theme-responsive.css @@ -4,19 +4,9 @@ } } -@media (min-width: 568px) { - .toolbar { - display: none; - } - - .bs-bars { - display: inline-block; - } -} - @media (min-width: 576px) { .form-group .form-control-url { - width: calc(100% - 90px); + width: calc(100% - 125px); } .form-inline .control-label { @@ -28,13 +18,7 @@ max-width: calc(90%); } - .btn-fill { - width: auto; - align-self: flex-end; - margin-bottom: 2px; - } - - .input-group.date.form_date { + .input-group.date { width: 186px; } } diff --git a/Bootstrap.Client/wwwroot/css/theme.css b/Bootstrap.Client/wwwroot/css/theme.css index 7be5295c..2c9b8bd1 100644 --- a/Bootstrap.Client/wwwroot/css/theme.css +++ b/Bootstrap.Client/wwwroot/css/theme.css @@ -8,6 +8,10 @@ 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; } @@ -25,12 +29,19 @@ outline: none; } -.dropdown-divider { - margin: 0.125rem 0; +.dropdown-select + .dropdown-menu a:hover { + background: #007AC0; + color: #fff; } -.btn-fill { - width: 100%; +.dropdown-menu a { + transition: all .25s linear; + padding: 6px 20px; + display: block; +} + +.dropdown-divider { + margin: 0.125rem 0; } .tooltip-inner { @@ -86,6 +97,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; } @@ -94,10 +111,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; @@ -115,7 +152,18 @@ input.pending { display: inline-block; } -/*Bootstrap Table BUG */ +.date > input { + cursor: pointer; +} + +.datetimepicker { + padding: 4px; +} + + .datetimepicker table tr td span { + white-space: nowrap; + } + .bootstrap-table .table thead > tr > th { border-top: none; } @@ -128,14 +176,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; } @@ -148,13 +188,22 @@ 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: 10px 0; + padding-top: 8px; } -.card { - margin-bottom: 15px; -} + .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; @@ -163,7 +212,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; @@ -244,3 +303,7 @@ input.pending { -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); } + +.mCSB_scrollTools { + width: 10px; +}