From 4b8deec047ffd0d9f3963a3aa4da30faf250beed Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Wed, 10 Dec 2014 16:19:12 +0100 Subject: [PATCH] Remove twitter-bootstrap-rails gem --- Gemfile | 2 -- Gemfile.lock | 6 ----- app/assets/javascripts/application.js | 1 - app/assets/javascripts/bootstrap.js.coffee | 3 --- .../stylesheets/bootstrap_and_overrides.css | 7 ------ config/locales/en.bootstrap.yml | 23 ------------------- 6 files changed, 42 deletions(-) delete mode 100644 app/assets/javascripts/bootstrap.js.coffee delete mode 100644 app/assets/stylesheets/bootstrap_and_overrides.css delete mode 100644 config/locales/en.bootstrap.yml diff --git a/Gemfile b/Gemfile index bfaffad..54edc1b 100644 --- a/Gemfile +++ b/Gemfile @@ -23,8 +23,6 @@ gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc -gem 'twitter-bootstrap-rails' - gem 'will_paginate', '~> 3.0.6' gem 'will_paginate-bootstrap' diff --git a/Gemfile.lock b/Gemfile.lock index 4676a3b..e5af27d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,11 +97,6 @@ GEM tilt (1.4.1) turbolinks (2.5.2) coffee-rails - twitter-bootstrap-rails (3.2.0) - actionpack (~> 4.1) - execjs (~> 2.2) - rails (~> 4.1) - railties (~> 4.1) tzinfo (1.2.2) thread_safe (~> 0.1) tzinfo-data (1.2014.10) @@ -125,7 +120,6 @@ DEPENDENCIES sdoc (~> 0.4.0) sqlite3 turbolinks - twitter-bootstrap-rails tzinfo-data uglifier (>= 1.3.0) will_paginate (~> 3.0.6) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3885622..d6925fa 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,6 +12,5 @@ // //= require jquery //= require jquery_ujs -//= require twitter/bootstrap //= require turbolinks //= require_tree . diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap.js.coffee deleted file mode 100644 index 9440679..0000000 --- a/app/assets/javascripts/bootstrap.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -jQuery -> - $("a[rel~=popover], .has-popover").popover() - $("a[rel~=tooltip], .has-tooltip").tooltip() diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css b/app/assets/stylesheets/bootstrap_and_overrides.css deleted file mode 100644 index 131fcfd..0000000 --- a/app/assets/stylesheets/bootstrap_and_overrides.css +++ /dev/null @@ -1,7 +0,0 @@ -/* - =require twitter-bootstrap-static/bootstrap - - Use Font Awesome icons (default) - To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites" - =require twitter-bootstrap-static/fontawesome - */ \ No newline at end of file diff --git a/config/locales/en.bootstrap.yml b/config/locales/en.bootstrap.yml deleted file mode 100644 index 8d75119..0000000 --- a/config/locales/en.bootstrap.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - breadcrumbs: - application: - root: "Index" - pages: - pages: "Pages" - helpers: - actions: "Actions" - links: - back: "Back" - cancel: "Cancel" - confirm: "Are you sure?" - destroy: "Delete" - new: "New" - edit: "Edit" - titles: - edit: "Edit %{model}" - save: "Save %{model}" - new: "New %{model}" - delete: "Delete %{model}"