From cfe124201c54f4d067aec76c747960216f040b3e Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Thu, 4 Oct 2018 13:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F=EF=BC=9A?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E7=BB=84=E5=90=88=E6=8E=A7=E4=BB=B6=E5=9C=A8?=
 =?UTF-8?q?=E5=B0=8F=E5=B1=8F=E5=B9=95=E4=B8=8B=E5=91=88=E7=8E=B0=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Menus.cshtml | 20 ++++++++++----------
 Bootstrap.Admin/wwwroot/css/theme.css    | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index 6adf9cee..aaa87353 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-6 col-md-5 col-xl-auto">
+            <div class="form-group col-sm-6 col-md-5 col-xl-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-6 col-md-5 col-xl-auto">
+            <div class="form-group col-sm-6 col-md-5 col-xl-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 col-6 col-md-5 col-xl-auto">
+            <div class="form-group form-group-dropdown col-sm-6 col-md-5 col-xl-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,8 +34,8 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group col-6 col-md-5 col-xl-auto">
-                <label class="control-label" for="sel_menus_category">菜单类型</label>
+            <div class="form-group form-group-dropdown col-sm-6 col-md-5 col-xl-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>
                     <div class="dropdown-menu">
@@ -46,7 +46,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group col-md-2 col-xl-auto flex-xl-fill justify-content-xl-end">
+            <div class="form-group col-xl-auto flex-xl-fill justify-content-xl-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>
@@ -120,7 +120,7 @@
                     <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" />
                 </div>
-                <div class="form-group col-6">
+                <div class="form-group form-group-dropdown col-sm-6">
                     <label class="control-label" for="category">菜单类别</label>
                     <div class="dropup">
                         <button id="category" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="1">外部菜单</button>
@@ -130,7 +130,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group col-6">
+                <div class="form-group form-group-dropdown col-sm-6">
                     <label class="control-label" for="target">目标</label>
                     <div class="dropup">
                         <button id="target" class="btn btn-info dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="_self">本窗口</button>
@@ -142,7 +142,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group col-6">
+                <div class="form-group form-group-dropdown col-sm-6">
                     <label class="control-label" for="isRes">菜单类型</label>
                     <div class="dropup">
                         <button id="isRes" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="0">菜单</button>
@@ -152,7 +152,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group col-6">
+                <div class="form-group form-group-dropdown col-sm-6">
                     <label class="control-label" for="app">所属应用</label>
                     <div class="dropup">
                         <button id="app" class="btn btn-info dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="0">未设置</button>
diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css
index 37bd6a76..ba531cf5 100644
--- a/Bootstrap.Admin/wwwroot/css/theme.css
+++ b/Bootstrap.Admin/wwwroot/css/theme.css
@@ -321,3 +321,17 @@ input.pending {
     .datetimepicker table tr td span {
         white-space: nowrap;
     }
+
+.form-inline .form-group-dropdown {
+    display: flex;
+    flex-wrap: nowrap;
+}
+
+    .form-inline .form-group-dropdown .control-label {
+        padding: 6px 0;
+        margin: 0 10px 0 0;
+    }
+
+    .form-inline .form-group-dropdown .dropdown, .form-inline .form-group-dropdown .dropup {
+        display: inline-block;
+    }