[2332] Update Bootstrap to 2.0.3

ckan · May 1, 2012 · 3228ef7 · 3228ef7
1 parent 34eac71
commit 3228ef7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 639 deletions.
diff --git a/ckan/public/css/bootstrap.min.css b/ckan/public/css/bootstrap.min.css
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -238,6 +238,7 @@ tbody tr:nth-child(odd) td, tbody tr.odd td {
 img.gravatar {
   margin: 0 5px -5px 0;
   border-radius: 3px;
+  vertical-align: baseline;
 }
 
 .inline-icon {

diff --git a/ckan/public/img/glyphicons-halflings-white.png b/ckan/public/img/glyphicons-halflings-white.png
diff --git a/ckan/public/img/glyphicons-halflings.png b/ckan/public/img/glyphicons-halflings.png
diff --git a/ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js b/ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
diff --git a/ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js b/ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
@@ -228,7 +228,7 @@ <h3 class="widget-title">Meta</h3>
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.chosen/0.9.7/chosen.js')}"></script>
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.placeholder/jquery.placeholder.js')}"></script>
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js')}"></script>
 
   <!-- for application.js -->
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/underscore/1.1.6/underscore.js')}"></script>