From 3cd9140e03c6a926a779749c11c57d749cf39758 Mon Sep 17 00:00:00 2001 From: Argo-MacBookPro Date: Thu, 2 Aug 2018 15:21:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=94=B9Html=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E4=B8=BA16px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/Views/Admin/Users.cshtml | 26 +++++---- Bootstrap.Admin/Views/Shared/_Default.cshtml | 12 ++--- Bootstrap.Admin/wwwroot/css/admin.css | 6 +-- Bootstrap.Admin/wwwroot/css/site.css | 55 ++++++++++---------- 4 files changed, 52 insertions(+), 47 deletions(-) diff --git a/Bootstrap.Admin/Views/Admin/Users.cshtml b/Bootstrap.Admin/Views/Admin/Users.cshtml index 11b5ed63..b4c85641 100644 --- a/Bootstrap.Admin/Views/Admin/Users.cshtml +++ b/Bootstrap.Admin/Views/Admin/Users.cshtml @@ -7,18 +7,24 @@ } @section query { -
-
-
- - + +
+
+
+ + +
-
- - +
+
+ + +
-
- +
+
+ +
diff --git a/Bootstrap.Admin/Views/Shared/_Default.cshtml b/Bootstrap.Admin/Views/Shared/_Default.cshtml index 07472c27..0372eeef 100644 --- a/Bootstrap.Admin/Views/Shared/_Default.cshtml +++ b/Bootstrap.Admin/Views/Shared/_Default.cshtml @@ -45,9 +45,9 @@
@RenderSection("customModal", false) } -
-
查询条件
-
+
+
查询条件
+
@RenderSection("query", false)
@@ -57,11 +57,11 @@ @RenderSection("toolbar", false)
-
-
+
+
查询结果
-
+
\ No newline at end of file diff --git a/Bootstrap.Admin/wwwroot/css/admin.css b/Bootstrap.Admin/wwwroot/css/admin.css index 834f0e9d..2d906259 100644 --- a/Bootstrap.Admin/wwwroot/css/admin.css +++ b/Bootstrap.Admin/wwwroot/css/admin.css @@ -57,7 +57,7 @@ } -.modal-dialog .modal-body, .panel-body { +.modal-dialog .modal-body, .card-body { padding-bottom: 0; } @@ -220,7 +220,6 @@ aside { color: #aeb2b7; display: block; padding: 15px 10px; - font-size: 1.2rem; transition: all 0.3s ease; border-radius: 4px; } @@ -235,7 +234,6 @@ aside { } .sidebar-menu li a i { - font-size: 1.5rem; width: 22px; } @@ -498,5 +496,5 @@ input[type="datetime"] { } .barTable { - padding: 5px 15px 15px 15px; + padding: 5px 15px 0px 15px; } diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css index 55d020fa..a2147a2c 100644 --- a/Bootstrap.Admin/wwwroot/css/site.css +++ b/Bootstrap.Admin/wwwroot/css/site.css @@ -1,12 +1,12 @@ html { - font-size: 62.5%; + font-size: 16px; } body { color: #797979; background: #f1f2f7; font-family: 'Open Sans', sans-serif; - font-size: 1.4rem; + font-size: 0.875rem; text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -webkit-overflow-scrolling: touch; @@ -16,13 +16,13 @@ ul li { list-style: none; } -.btn { - font-size: 1.4rem; +.btn:focus { + box-shadow: none; } - .btn:focus { - box-shadow: none; - } +.form-control { + font-size: 0.875rem; +} a, a:hover, a:focus { text-decoration: none; @@ -32,8 +32,8 @@ a, a:hover, a:focus { .dropdown-menu { box-shadow: 0 2px 8px rgba(0, 0, 0, 0.176); padding: 0; - font-size: 1.4rem; margin-top: 1rem; + font-size: 0.875rem; } .dropdown-menu > li > a { @@ -163,7 +163,7 @@ a, a:hover, a:focus { /*Title*/ .sidebar-toggle-box { - font-size: 2.1rem; + font-size: 1.25rem; color: #333; float: left; margin-top: 15px; @@ -207,6 +207,7 @@ a, a:hover, a:focus { .notify-row { margin-top: 20px; padding-left: 20px; + font-size: 1rem; } .notify-row .bg-success, .notify-row .dropdown-menu.tasks-bar li p { @@ -239,7 +240,6 @@ a, a:hover, a:focus { color: #666666; border-radius: 4px; -webkit-border-radius: 4px; - font-size: 1.6rem; border: 1px solid #f0f0f8; padding: 2px 6px; margin-right: 15px; @@ -247,19 +247,17 @@ a, a:hover, a:focus { .notify-row > li > a .badge { position: absolute; - top: -1.6rem; - left: 3.2rem; + top: -14px; + left: 38px; z-index: 1; opacity: 0.8; } .notify-row .dropdown-menu { - float: left; - max-width: 300px; - min-width: 160px; width: 235px; border: none; - margin-left: -7.2rem; + margin-left: -72px; + margin-top: 12px; } .notify-row .dropdown-menu .notify-arrow { @@ -310,14 +308,16 @@ a, a:hover, a:focus { .notify-row .dropdown-menu li:last-child a { border-bottom: 0; + padding-left: 12px; + font-size: 0.875rem; } .notify-row .dropdown-menu li a { - border-bottom: 0.1rem solid #EBEBEB; - font-size: 1.2rem; + border-bottom: 1px solid #EBEBEB; list-style: none; - padding: 1.5rem 1rem; + padding: 12px 6px; display: block; + font-size: 0.75rem; } .notify-row .dropdown-menu li a:hover { @@ -328,13 +328,13 @@ a, a:hover, a:focus { color: #fff; margin: 0; padding: 10px; - border-radius: 0.4rem 0.4rem 0 0; + border-radius: 4px 4px 0 0; } .notify-row .dropdown-menu .content { position: absolute; - left: 3.6rem; - right: 4.4rem; + left: 36px; + right: 44px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -342,18 +342,15 @@ a, a:hover, a:focus { } .notify-row .dropdown-menu .label { - height: 18px; width: 20px; - padding: 0.5rem; - margin-right: 0.5rem; + padding: 5px; } .notify-row .dropdown-menu .small { font-style: italic; font-weight: bold; float: right; - font-size: 1rem; - line-height: 1.8rem; + font-size: 0.75rem; } .notify-row .dropdown-menu.tasks-bar .desc { @@ -484,3 +481,7 @@ a, a:hover, a:focus { .form-check-input { margin-top: 0.4rem; } + +.card { + margin-bottom: 15px; +}