Merge pull request #740 from pawl/fixbs2gap

Fix gap between actions and model-list (in bs2), fix form-horizontal styling

flask_admin/static/admin/css/bootstrap2/admin.css

@@ -40,6 +40,15 @@ table.filters {
     border-spacing: 4px;
 }
 
+table.filters:not(:empty) {
+    margin: 12px 0px 20px 0px;
+}
+
+table.filters tr td {
+    padding-right: 5px;
+    padding-bottom: 3px;
+}
+
 .filters input
 {
     margin-bottom: 0;
@@ -94,13 +103,13 @@ table.filters {
 }
 
 /* Forms */
-.form-horizontal .control-label {
+.admin-form .control-label {
     width: 100px;
     text-align: left;
     margin-left: 4px;
 }
 
-.form-horizontal .controls {
+.admin-form .controls {
     margin-left: 110px;
 }
 
@@ -112,3 +121,20 @@ table.filters {
 .list-checkbox-column {
     width: 14px;
 }
+
+/* Fix gap between actions and table */
+.model-list  {
+    position: relative;
+    margin-top: -1px;
+    z-index: 999;
+}
+
+.actions-nav  {
+margin-bottom: 0;
+margin-left: 4px;
+margin-right: 4px;
+}
+
+#filter_form  {
+    margin-bottom: 0;
+}
\ No newline at end of file

flask_admin/static/admin/css/bootstrap3/admin.css

@@ -17,6 +17,7 @@ form.icon button {
     line-height: normal;
 }
 
+/* fix delete icon color */
 a.icon, button span.glyphicon {
     text-decoration: none;
     margin-left: 10px;
@@ -56,10 +57,6 @@ table.filters tr td {
     padding-bottom: 3px;
 }
 
-table.flters tr td:nth-child(2){
-    width: 60%;
-}
-
 .filters a.remove-filter {
     margin-bottom: 0;
     display: block;
@@ -123,7 +120,7 @@ table.flters tr td:nth-child(2){
 }
 
 /* Forms */
-.form-horizontal {
+.admin-form {
     margin-top: 35px;
 }
 
@@ -178,3 +175,10 @@ ul.has-error {
 .list-checkbox-column {
     width: 14px;
 }
+
+/* fix overlapping border between actions and table */
+.model-list  {
+    position: relative;
+    margin-top: -1px;
+    z-index: 999;
+}
\ No newline at end of file

flask_admin/templates/bootstrap2/admin/lib.html

@@ -143,7 +143,7 @@
 {% endmacro %}
 
 {% macro form_tag(form=None) %}
-    <form action="" method="POST" class="form-horizontal" enctype="multipart/form-data">
+    <form action="" method="POST" class="admin-form form-horizontal" enctype="multipart/form-data">
       <fieldset>
         {{ caller() }}
       </fieldset>

flask_admin/templates/bootstrap2/admin/model/list.html

@@ -11,7 +11,7 @@
 
 {% block body %}
     {% block model_menu_bar %}
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs actions-nav">
         <li class="active">
             <a href="javascript:void(0)">{{ _gettext('List') }} ({{ count }})</a>
         </li>

flask_admin/templates/bootstrap3/admin/lib.html

@@ -138,7 +138,7 @@
 {% endmacro %}
 
 {% macro form_tag(form=None, action=None) %}
-    <form action="{{ action or '' }}" method="POST" role="form" class="form-horizontal" enctype="multipart/form-data">
+    <form action="{{ action or '' }}" method="POST" role="form" class="admin-form form-horizontal" enctype="multipart/form-data">
       {{ caller() }}
     </form>
 {% endmacro %}

flask_admin/templates/bootstrap3/admin/model/list.html

@@ -11,7 +11,7 @@
 
 {% block body %}
     {% block model_menu_bar %}
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs actions-nav">
         <li class="active">
             <a href="javascript:void(0)">{{ _gettext('List') }} ({{ count }})</a>
         </li>