From 3abc996da18850bfc6fbb333e2e6b528f7dcc294 Mon Sep 17 00:00:00 2001 From: Evan Coury Date: Wed, 17 Oct 2012 03:44:12 -0700 Subject: [PATCH] Update twitter bootstrap, jquery, html5.js to latest --- module/Application/view/layout/layout.phtml | 8 +- public/css/bootstrap-responsive.min.css | 12 +- public/css/bootstrap.min.css | 619 +-------------------------- public/js/bootstrap.min.js | 6 + public/js/html5.js | 7 +- public/js/jquery-1.7.2.min.js | 4 - public/js/jquery.min.js | 2 + 7 files changed, 34 insertions(+), 624 deletions(-) create mode 100644 public/js/bootstrap.min.js delete mode 100644 public/js/jquery-1.7.2.min.js create mode 100644 public/js/jquery.min.js diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index 18a4720..6efc267 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -15,10 +15,12 @@ headScript()->prependFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',)) - ->prependFile('//ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js') ?> + ->prependFile($this->basePath() . '/js/bootstrap.min.js') + ->prependFile($this->basePath() . '/js/jquery.min.js') ?> + -