Switched to Bootstrap 2.2.1. Fixed pallets-eco#107

doc/changelog.rst

@@ -10,9 +10,9 @@ General:
 * Model form scaffolding is now customizable in model views
 * Inline model forms are much more customizable now
 * List view type-based formatters
-* Database ``NULL`` will be displayed as empty string by default in list view. Use type-based formatter if you want to display something else.
-* Use `Select2 <http://ivaynberg.github.com/select2/>`_ instead of Chosen
-* List view formatting callbacks. See example `here <https://gist.github.com/3714266>`_.
+* Database ``NULL`` will be displayed in list view as empty string by default. Use type-based formatter if you want to show something else.
+* Use `Select2`_ instead of Chosen
+* List view formatting callbacks. See `example <https://gist.github.com/3714266>`_.
 * ``_template_args`` property is now available in all views
 * ``on_model_change`` and ``on_model_delete`` callbacks
 * Model backends now support ``list_display_pk`` property

flask_admin/static/bootstrap/css/bootstrap-responsive.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.1.1
+ * Bootstrap Responsive v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -215,6 +215,9 @@
  .row-fluid [class*="span"]:first-child {
  margin-left: 0;
  }
+ .row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.564102564102564%;
+ }
  .row-fluid .span12 {
  width: 100%;
  *width: 99.94680851063829%;
@@ -562,6 +565,9 @@
  .row-fluid [class*="span"]:first-child {
  margin-left: 0;
  }
+ .row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.7624309392265194%;
+ }
  .row-fluid .span12 {
  width: 100%;
  *width: 99.94680851063829%;
@@ -814,6 +820,7 @@
  margin-left: 0;
  }
  [class*="span"],
+ .uneditable-input[class*="span"],
  .row-fluid [class*="span"] {
  display: block;
  float: none;
@@ -830,6 +837,9 @@
  -moz-box-sizing: border-box;
  box-sizing: border-box;
  }
+ .row-fluid [class*="offset"]:first-child {
+ margin-left: 0;
+ }
  .input-large,
  .input-xlarge,
  .input-xxlarge,
@@ -862,8 +872,11 @@
  width: auto;
  margin: 0;
  }
+ .modal.fade {
+ top: -100px;
+ }
  .modal.fade.in {
- top: auto;
+ top: 20px;
  }
 }
 
@@ -895,6 +908,16 @@
  padding-right: 10px;
  padding-left: 10px;
  }
+ .media .pull-left,
+ .media .pull-right {
+ display: block;
+ float: none;
+ margin-bottom: 10px;
+ }
+ .media-object {
+ margin-right: 0;
+ margin-left: 0;
+ }
  .modal {
  top: 10px;
  right: 10px;
@@ -979,6 +1002,10 @@
  .nav-collapse .dropdown-menu a:hover {
  background-color: #f2f2f2;
  }
+ .navbar-inverse .nav-collapse .nav > li > a,
+ .navbar-inverse .nav-collapse .dropdown-menu a {
+ color: #999999;
+ }
  .navbar-inverse .nav-collapse .nav > li > a:hover,
  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
  background-color: #111111;
@@ -991,7 +1018,7 @@
  position: static;
  top: auto;
  left: auto;
- display: block;
+ display: none;
  float: none;
  max-width: none;
  padding: 0;
@@ -1005,6 +1032,9 @@
  -moz-box-shadow: none;
  box-shadow: none;
  }
+ .nav-collapse .open > .dropdown-menu {
+ display: block;
+ }
  .nav-collapse .dropdown-menu:before,
  .nav-collapse .dropdown-menu:after {
  display: none;