diff --git a/docs/物联网中心.EAP b/docs/物联网中心.EAP index 5fbcdd4a..25f9c70e 100644 Binary files a/docs/物联网中心.EAP and b/docs/物联网中心.EAP differ diff --git a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml index e1c475a3..f6111fca 100644 --- a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml +++ b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml @@ -50,7 +50,7 @@ var uihit = prop.DataTypeName ?? prop.TemplateHint;
- @Html.Label(prop.PropertyName, prop.GetDisplayName() + ":", new { @class = labelCalss }) + @Html.Label(prop.PropertyName, prop.GetDisplayName(), new { @class = labelCalss })
@if (isReadOnly) { @@ -392,12 +392,4 @@ window.open(url); }); -} -@section styles{ - } \ No newline at end of file diff --git a/labs/Teacher/TeacherExt/wwwroot/css/site.css b/labs/Teacher/TeacherExt/wwwroot/css/site.css index e00f2286..64e6c214 100644 --- a/labs/Teacher/TeacherExt/wwwroot/css/site.css +++ b/labs/Teacher/TeacherExt/wwwroot/css/site.css @@ -77,50 +77,89 @@ th { h1 { font-size: 1.5rem; - margin:1rem 0 0 0; + margin: 1rem 0 0 0; } -.breadcrumb.float-sm-right{ - background-color:transparent; + +.breadcrumb.float-sm-right { + background-color: transparent; } + .select2-container--bootstrap4 .select2-results > .select2-results__options { max-height: 400px; } + .select2-selection.select2-selection--single { padding-left: 0.75rem; } + .select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder { color: #495057; } + label.col-form-label { text-align: right; overflow: hidden; } + img.icon { height: 48px; width: 48px; - margin:0 auto; + margin: 0 auto; } + img.pointer { cursor: pointer; height: 32px; width: 32px; margin: 8px auto; } -.card-body.device{ - padding:10px; + +.card-body.device { + padding: 10px; } -.h48{ - width:100%; - height:48px; - line-height:48px; - margin:0 auto; - overflow:hidden; +.h48 { + width: 100%; + height: 48px; + line-height: 48px; + margin: 0 auto; + overflow: hidden; } + .h24 { width: 100%; height: 24px; line-height: 24px; margin: 0 auto; overflow: hidden; +} + +.form-control { + font-size: 14px !important; +} +label.col-form-label { + font-size: 14px !important; + font-weight: normal !important; +} + +label.required:before { + content: '*'; + color: red; + font-size: 14px; +} + +label.col-form-label:after { + content: ':'; + position: absolute; + top: 8px; + font-size: 14px; + line-height: 17px; +} +button.swal2-styled{ + font-size:14px!important; + line-height:20px; + padding:5px 10px; +} +.swal2-popup{ + width:16em!important; } \ No newline at end of file