From 43d0845865e0d918cfc7cbde092222a555a23f52 Mon Sep 17 00:00:00 2001 From: Argo-MacBookPro Date: Mon, 1 Oct 2018 13:55:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F=EF=BC=9A?= =?UTF-8?q?=E6=95=B4=E5=90=88BA=E5=90=8E=E5=8F=B0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=88=B0=E5=89=8D=E5=8F=B0=E6=A0=B7=E5=BC=8F=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/css/site-responsive.css | 8 ---- Bootstrap.Client/wwwroot/css/site.css | 16 +++++++- Bootstrap.Client/wwwroot/css/theme.css | 39 ++++++++++--------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/Bootstrap.Client/wwwroot/css/site-responsive.css b/Bootstrap.Client/wwwroot/css/site-responsive.css index 9601c06b..9f584e7b 100644 --- a/Bootstrap.Client/wwwroot/css/site-responsive.css +++ b/Bootstrap.Client/wwwroot/css/site-responsive.css @@ -40,14 +40,6 @@ } @media (min-width: 768px) { - .sidebar-toggle-box { - flex: 0 1 auto; - } - - .header .nav { - flex: 1 1 auto; - } - .sidebar-open aside { transform: translate(-100%); } diff --git a/Bootstrap.Client/wwwroot/css/site.css b/Bootstrap.Client/wwwroot/css/site.css index 37481fdb..71a1e85a 100644 --- a/Bootstrap.Client/wwwroot/css/site.css +++ b/Bootstrap.Client/wwwroot/css/site.css @@ -162,10 +162,22 @@ a, a:hover, a:focus { margin-left: 6px; } +.nav [data-toggle="dropdown"] { + border: 1px solid #eee; + border-radius: 4px; + padding: 6px 12px; + color: #777; + transition: all .25s linear; +} + + .nav [data-toggle="dropdown"]:hover { + color: #333; + } + .nav .dropdown-menu { width: 235px; border: none; - margin-left: -74px; + margin-left: -98px; margin-top: 12px; } @@ -173,7 +185,7 @@ a, a:hover, a:focus { border-style: solid; border-width: 0 9px 9px; position: absolute; - left: 85px; + left: 108px; top: -9px; } diff --git a/Bootstrap.Client/wwwroot/css/theme.css b/Bootstrap.Client/wwwroot/css/theme.css index 2f4a8354..37bd6a76 100644 --- a/Bootstrap.Client/wwwroot/css/theme.css +++ b/Bootstrap.Client/wwwroot/css/theme.css @@ -210,6 +210,14 @@ input.pending { margin-top: -10px; } +.card-header a.fa { + transition: color .3s linear; +} + + .card-header a.fa:hover { + color: #333; + } + .fixed-table-toolbar .dropdown-menu { min-width: unset; } @@ -263,41 +271,34 @@ input.pending { border-color: transparent transparent #dc3545; } -.shadow-primary:hover { - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 123, 255, 0.5); +.show .shadow-primary, .shadow-primary:hover { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 123, 255, 0.5); - border-color: #007bff; + border-color: #007bff !important; } -.shadow-success:hover { - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(40, 167, 69, 0.5); +.show .shadow-success, .shadow-success:hover { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(40, 167, 69, 0.5); - border-color: #28a745; + border-color: #28a745 !important; } -.shadow-info:hover { - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(23, 162, 184, 0.5); +.show .shadow-info, .shadow-info:hover { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(23, 162, 184, 0.5); - border-color: #17a2b8; + border-color: #17a2b8 !important; } -.shadow-warning:hover { - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(255, 193, 7, 0.5); +.show .shadow-warning, .shadow-warning:hover { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(255, 193, 7, 0.5); - border-color: #ffc107; + border-color: #ffc107 !important; } -.shadow-danger:hover { - border: 1px solid #dc3545; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(220, 53, 69, 0.5); +.show .shadow-danger, .shadow-danger:hover { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(220, 53, 69, 0.5); + border: 1px solid #dc3545 !important; } -.shadow-default, .shadow-default:hover { - border: 1px solid #337ab7; - color: #333; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102,175,233,.6); +.show .shadow-default, .shadow-default:hover { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102,175,233,.6); + border: 1px solid #337ab7; } .mCSB_scrollTools {