From 6f1d7018ce179e63fc85d22510225e6512d796a6 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 5 Oct 2019 22:20:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(#I12YES):=20=E8=B0=83=E6=95=B4=20h?= =?UTF-8?q?eader=20=E9=AB=98=E5=BA=A6=E4=B8=BA=2050px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #Comment comment #I12YES #Issue close #I12YES --- .../Bootstrap.Admin/Views/Home/Index.cshtml | 2 +- src/admin/Bootstrap.Admin/wwwroot/css/lte.css | 19 +++++++++---------- .../Bootstrap.Admin/wwwroot/css/site.css | 2 +- .../Bootstrap.Admin/wwwroot/css/theme.css | 17 ++++++++++------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/admin/Bootstrap.Admin/Views/Home/Index.cshtml b/src/admin/Bootstrap.Admin/Views/Home/Index.cshtml index b65b4f50..4ce3d874 100644 --- a/src/admin/Bootstrap.Admin/Views/Home/Index.cshtml +++ b/src/admin/Bootstrap.Admin/Views/Home/Index.cshtml @@ -9,7 +9,7 @@ left: 0; bottom: 40px; right: 0; - top: 93px; + top: 89px; overflow: hidden; } diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/lte.css b/src/admin/Bootstrap.Admin/wwwroot/css/lte.css index cdb9da1f..00f21fad 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/lte.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/lte.css @@ -47,7 +47,6 @@ border-radius: 4px; width: 2rem; height: 2rem; - margin: 0.25rem 0; } .userinfo .username { @@ -56,6 +55,9 @@ .userinfo .dropdown-toggle { border-radius: 0; + height: 50px; + display: flex; + align-items: center; } .userinfo .dropdown-toggle, .userinfo .dropdown-toggle:hover, .userinfo.show .dropdown-toggle, .header .nav a, .header .nav a:hover { @@ -116,12 +118,12 @@ } .userinfo.show .dropdown-menu { - margin-top: 4px; + margin-top: 5px; cursor: default; } aside, .main-content { - top: 55px; + top: 51px; } aside { @@ -129,7 +131,7 @@ aside { } aside .nav-brand, .sidebar-open aside:hover .nav-brand { - height: 55px; + height: 50px; align-items: center; padding: 0 0.625rem; } @@ -182,10 +184,6 @@ aside { border-top: none; } -.card-header { - padding: 0.625rem 1rem; -} - /* color */ .main-content { background-color: #ecf0f5; @@ -265,6 +263,7 @@ footer { .header .nav { display: flex; flex: 0 1 auto; + height: 3.125rem; } .sidebar-toggle-box { @@ -291,7 +290,7 @@ footer { } aside .sidebar, .sidebar-open aside:hover .sidebar { - top: 121px; + top: 116px; transition: top .3s linear; } @@ -383,7 +382,7 @@ footer { } .sidebar-open aside .sidebar { - top: 115px; + top: 107px; } .sidebar-open .main-content { diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/site.css b/src/admin/Bootstrap.Admin/wwwroot/css/site.css index 4dd35b3b..fd4cfb45 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/site.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/site.css @@ -111,7 +111,7 @@ left: 0; bottom: 40px; right: 0; - top: 93px; + top: 89px; transition: margin-left .3s ease-in-out; } diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/theme.css b/src/admin/Bootstrap.Admin/wwwroot/css/theme.css index 5c88beec..d56c0dc5 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/theme.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/theme.css @@ -33,7 +33,6 @@ aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdow .header .nav .dropdown { margin-right: 6px; - height: 53px; display: flex; align-items: center; } @@ -89,7 +88,7 @@ aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdow .userinfo .dropdown-toggle { display: block; - padding: 6px; + padding: 6px 6px; border-radius: 4px; transition: all .25s linear; } @@ -186,12 +185,12 @@ aside .bg, aside .nav-brand, aside .nav-header, .header .nav, .userinfo .dropdow .nav .dropdown-header { color: #fff; - padding: 10px; + padding: 0.5rem 0.625rem; border-radius: 4px 4px 0 0; } .nav .dropdown-footer { - padding: 6px 0; + padding: 0.375rem 0; background-color: #f1f2f7; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; @@ -267,7 +266,7 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou .sidebar .nav-link { color: #aeb2b7; - padding: 10px 10px; + padding: 0.5rem 0.625rem; transition: background .3s linear, color .3s linear; display: block; white-space: nowrap; @@ -336,7 +335,7 @@ body, .form-control, .dropdown-menu, .btn:not(.btn-lg):not(.btn-xs), .input-grou display: block; color: #777; flex: 1 1 auto; - padding: 12px 0; + padding: 0.625rem 0; white-space: nowrap; transition: color .3s linear; } @@ -353,7 +352,7 @@ aside { transition: transform .3s ease-in-out; transform: translate(-100%); position: absolute; - top: 93px; + top: 89px; bottom: 0; left: 0; right: 0; @@ -555,6 +554,10 @@ input.pending { box-shadow: none; } + .card-header { + padding: 0.5rem 1rem; + } + .card .card-header a { color: #797979; } From a4fd36c3a317dfacf03fd20331a8c9a12da702c1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 5 Oct 2019 23:01:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E5=BE=AE=E8=B0=83=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E8=AE=BE=E7=BD=AE=20Cache=20=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=97=B4=E9=9A=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/Bootstrap.Admin/wwwroot/css/site.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/site.css b/src/admin/Bootstrap.Admin/wwwroot/css/site.css index fd4cfb45..867351e9 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/site.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/site.css @@ -21,7 +21,7 @@ font-weight: bold; color: #0077de; background-color: #b5f1b6; - padding: 12px 15px; + padding: 0.5rem 1rem; border-radius: 4px 4px 0 0; margin-bottom: 0; } @@ -29,7 +29,7 @@ .cache-item { display: flex; align-items: center; - padding: 10px; + padding: 0.5rem 0.625rem; border: 1px solid #eee; border-width: 0 1px 1px 1px; }