From b0004c957e88ee677cc8e54a83818e64550983de Mon Sep 17 00:00:00 2001
From: Argo-Surface <Argo@163.com>
Date: Wed, 21 Nov 2018 20:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9A?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4form-control-url=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8flex-sm-fill=E4=BB=A3=E6=9B=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Dicts.cshtml         |  6 +++---
 Bootstrap.Admin/Views/Admin/Menus.cshtml         | 14 +++++++-------
 Bootstrap.Admin/wwwroot/css/theme-responsive.css |  4 ----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
index 8f81fc9e..a8714f6e 100644
--- a/Bootstrap.Admin/Views/Admin/Dicts.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
@@ -60,15 +60,15 @@
                 <input type="hidden" id="dictID" data-default-val="0" />
                 <div class="form-group col-12">
                     <label class="control-label" for="dictCate">字典标签</label>
-                    <input type="text" class="form-control form-control-url" id="dictCate" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
+                    <input type="text" class="form-control flex-sm-fill" id="dictCate" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
                 <div class="form-group col-12">
                     <label class="control-label" for="dictName">字典名称</label>
-                    <input type="text" class="form-control form-control-url" id="dictName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
+                    <input type="text" class="form-control flex-sm-fill" id="dictName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
                 <div class="form-group col-12">
                     <label class="control-label" for="dictCode">字典代码</label>
-                    <input type="text" class="form-control form-control-url" id="dictCode" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
+                    <input type="text" class="form-control flex-sm-fill" id="dictCode" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
                 <div class="form-group form-group-dropdown col-12">
                     <label class="control-label" for="dictDefine">字典类型</label>
diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index 32206968..8020e738 100644
--- a/Bootstrap.Admin/Views/Admin/Menus.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Menus.cshtml
@@ -14,15 +14,15 @@
 @section query {
     <form class="form-inline">
         <div class="row">
-            <div class="form-group col-sm-6 col-xl-auto">
+            <div class="form-group col-sm-6 col-lg-auto">
                 <label class="control-label" for="txt_menus_name">菜单名称</label>
                 <input type="text" class="form-control" id="txt_menus_name" />
             </div>
-            <div class="form-group col-sm-6 col-xl-auto">
+            <div class="form-group col-sm-6 col-lg-auto">
                 <label class="control-label" for="txt_parent_menus_name">父级菜单</label>
                 <input type="text" class="form-control" id="txt_parent_menus_name" />
             </div>
-            <div class="form-group form-group-dropdown col-sm-6 col-xl-auto">
+            <div class="form-group form-group-dropdown col-sm-6 col-lg-auto">
                 <label class="control-label" for="sel_menus_category">菜单类别</label>
                 <div class="dropdown">
                     <button id="sel_menus_category" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown">全部</button>
@@ -34,7 +34,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group form-group-dropdown col-sm-6 col-xl-auto">
+            <div class="form-group form-group-dropdown col-sm-6 col-lg-auto">
                 <label class="control-label" for="sel_menus_res">菜单类型</label>
                 <div class="dropdown">
                     <button id="sel_menus_res" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown">全部</button>
@@ -46,7 +46,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group col-xl-auto flex-xl-fill justify-content-xl-end">
+            <div class="form-group col-lg-auto flex-lg-fill justify-content-lg-end">
                 <button type="button" id="btn_query" class="btn btn-primary btn-fill"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
         </div>
@@ -73,7 +73,7 @@
     </div>
     <div class="modal-body">
         <form class="form-inline" id="dataForm">
-            <div class="row">
+            <div class="form-row">
                 <div class="form-group col-sm-6">
                     <input type="hidden" id="menuID" data-default-val="0" />
                     <label class="control-label" for="name">菜单名称</label>
@@ -118,7 +118,7 @@
                 </div>
                 <div class="form-group col-12">
                     <label class="control-label" for="url">路径</label>
-                    <input type="text" class="form-control form-control-url" id="url" placeholder="不可为空，4000字以内" maxlength="4000" data-valid="true" />
+                    <input type="text" class="form-control flex-sm-fill" id="url" placeholder="不可为空，4000字以内" maxlength="4000" data-valid="true" />
                 </div>
                 <div class="form-group form-group-dropdown col-sm-6">
                     <label class="control-label" for="category">菜单类别</label>
diff --git a/Bootstrap.Admin/wwwroot/css/theme-responsive.css b/Bootstrap.Admin/wwwroot/css/theme-responsive.css
index 4ec92f02..8d5c5505 100644
--- a/Bootstrap.Admin/wwwroot/css/theme-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/theme-responsive.css
@@ -5,10 +5,6 @@
 }
 
 @media (min-width: 576px) {
-    .form-group .form-control-url {
-        width: calc(100% - 125px);
-    }
-
     .form-inline .control-label {
         padding-top: 6px;
         padding-bottom: 6px;