From a55860ff13b23629fcad41a83c7712e984df373f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=B1or=20Rolando?= Date: Sat, 2 Nov 2013 14:55:06 +0100 Subject: [PATCH] Remove references to bootstrap collapse and bootstrap responsive. Those may have been obsoleted in Bootstrap 3.x. --- app/assets/javascripts/application.js | 3 +-- app/assets/stylesheets/bootstrap_and_overrides.css.scss | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4a44f6d..79b69e7 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,5 +1,4 @@ //= require jquery //= require jquery_ujs //= require bootstrap -//= require bootstrap-collapse -//= require_tree . +// //= require_tree . diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.scss b/app/assets/stylesheets/bootstrap_and_overrides.css.scss index b906e71..67e7104 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.scss +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.scss @@ -22,4 +22,5 @@ $navbarLinkColor: $orangeText; @import "bootstrap"; body { padding-top: 50px; } -@import "bootstrap-responsive"; +// TODO Has this been obsoleted in Bootstrap 3? +// @import "bootstrap-responsive";