innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BUG：更改Html字体大小为16px

This commit is contained in:
Argo-MacBookPro 2018-08-02 15:21:41 +08:00
parent bf8f19fd7b
commit 3cd9140e03
4 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Bootstrap.Admin/Views/Admin/Users.cshtml
View File

@ -7,18 +7,24 @@
<script src="~/js/Users.js"></script>
}
@section query {
<form class="form-inline" role="form">
<div class="row">
<div class="form-group col-md-5">
<label class="control-label" for="txt_search_name">登陆名称</label>
<input type="text" class="form-control" id="txt_search_name" />
<form class="form-inline">
<div class="form-row">
<div class="col-sm-5">
<div class="form-group">
<label class="control-label" for="txt_search_name">登陆名称</label>
<input type="text" class="form-control" id="txt_search_name" />
</div>
</div>
<div class="form-group col-md-5">
<label class="control-label" for="txt_display_name">显示名称</label>
<input type="text" class="form-control" id="txt_display_name" />
<div class="col-sm-5">
<div class="form-group">
<label class="control-label" for="txt_display_name">显示名称</label>
<input type="text" class="form-control" id="txt_display_name" />
</div>
</div>
<div class="form-group col-md-2">
<button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
<div class="col-sm-2">
<div class="form-group">
<button type="button" id="btn_query" class="btn btn-primary"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
</div>
</div>
</div>
</form>

12
Bootstrap.Admin/Views/Shared/_Default.cshtml
View File

@ -45,9 +45,9 @@
</div>
@RenderSection("customModal", false)
}
<div class="panel panel-default">
<div class="panel-heading">查询条件</div>
<div class="panel-body">
<div class="card">
<div class="card-header">查询条件</div>
<div class="card-body">
@RenderSection("query", false)
</div>
</div>
@ -57,11 +57,11 @@
<button id="btn_edit" type="button" class="btn btn-primary"><i class="fa fa-pencil" aria-hidden="true"></i><span class="hidden-tb">编辑</span></button>
@RenderSection("toolbar", false)
</div>
<div id="panelResult" class="panel panel-default">
<div id="panelResultHeader" class="panel-heading">
<div id="panelResult" class="card">
<div id="panelResultHeader" class="card-header">
查询结果
</div>
<div class="panel-body barTable">
<div class="card-body barTable">
<table></table>
</div>
</div>

6
Bootstrap.Admin/wwwroot/css/admin.css
View File

@ -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;
}

55
Bootstrap.Admin/wwwroot/css/site.css
View File

@ -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;
}