Permalink
Browse files

Merge pull request #8 from alphagov/upgrade-bootstrap-storyid-32078597

Upgraded to Bootstrap 2.0.4 - reviewed by Jamie
  • Loading branch information...
2 parents 6e31580 + dc635b1 commit 6ebb6e9616fc2180fd205979c4021d4053f9a7d4 @partiallyblind partiallyblind committed Jul 17, 2012
View
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.0.3
+ * bootstrap-transition.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@@ -59,7 +59,7 @@
})
}(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.0.3
+ * bootstrap-alert.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -148,7 +148,7 @@
})
}(window.jQuery);/* ============================================================
- * bootstrap-button.js v2.0.3
+ * bootstrap-button.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -243,7 +243,7 @@
})
}(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.0.3
+ * bootstrap-carousel.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -411,7 +411,7 @@
})
}(window.jQuery);/* =============================================================
- * bootstrap-collapse.js v2.0.3
+ * bootstrap-collapse.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -567,7 +567,7 @@
})
}(window.jQuery);/* ============================================================
- * bootstrap-dropdown.js v2.0.3
+ * bootstrap-dropdown.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -666,7 +666,7 @@
})
}(window.jQuery);/* =========================================================
- * bootstrap-modal.js v2.0.3
+ * bootstrap-modal.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -883,7 +883,7 @@
})
}(window.jQuery);/* ===========================================================
- * bootstrap-tooltip.js v2.0.3
+ * bootstrap-tooltip.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -968,9 +968,9 @@
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+ if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
- clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
@@ -1156,8 +1156,9 @@
, delay: 0
}
-}(window.jQuery);/* ===========================================================
- * bootstrap-popover.js v2.0.3
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-popover.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@@ -1254,7 +1255,7 @@
})
}(window.jQuery);/* =============================================================
- * bootstrap-scrollspy.js v2.0.3
+ * bootstrap-scrollspy.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1404,7 +1405,7 @@
})
}(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.0.3
+ * bootstrap-tab.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
@@ -1538,7 +1539,7 @@
})
}(window.jQuery);/* =============================================================
- * bootstrap-typeahead.js v2.0.3
+ * bootstrap-typeahead.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -12,6 +12,7 @@ body {
background-image: url("/assets/header-crown.png");
background-position: 0 0.25em;
background-repeat: no-repeat;
+ color: #fff;
font-family: "GillSans", "Gill Sans", "Helvetica Neue", Helvetica, sans-serif;
margin-left: 0;
padding-left: 2em;

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -3,7 +3,7 @@
<head>
<title><%= yield :page_title %> | GOV.UK Panopticon</title>
<%= csrf_meta_tags %>
- <%= stylesheet_link_tag 'bootstrap.min.css', 'bootstrap-responsive.min.css', 'application.css' %>
+ <%= stylesheet_link_tag 'bootstrap.min.css', 'application.css' %>
<%= yield :extra_headers %>
</head>

0 comments on commit 6ebb6e9

Please sign in to comment.