diff --git a/Gemfile b/Gemfile index b803dd13..e21baa2c 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem 'rails', '3.2.11' group :assets do gem 'sass-rails', '~> 3.2.3' # gem 'coffee-rails', '~> 3.2.1' + gem 'bootstrap-sass' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer', :platforms => :ruby @@ -17,6 +18,21 @@ group :assets do gem 'uglifier', '>= 1.2.2' end +group :development, :test do + gem 'pry' + gem 'sqlite3' + gem 'thin' + gem 'rspec-rails', '2.11.0' +end + +group :production do + gem 'mysql2' +end + +group :test do + gem 'capybara', '1.1.2' +end + gem 'will_paginate' gem 'paperclip', '~> 3.0' gem 'jquery-rails' @@ -34,15 +50,4 @@ gem 'acts_as_commentable_with_threading' gem 'prawn' gem 'prawn_rails' gem 'gravtastic' -group :development, :test do - gem 'pry' - gem 'sqlite3' - gem 'thin' - gem 'rspec-rails', '2.11.0' -end -group :production do - gem 'mysql2' -end -group :test do - gem 'capybara', '1.1.2' -end + diff --git a/Gemfile.lock b/Gemfile.lock index cc8bbb5c..0387fdfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,8 @@ GEM awesome_nested_set (2.1.6) activerecord (>= 3.0.0) bcrypt-ruby (3.0.1) + bootstrap-sass (2.3.2.0) + sass (~> 3.2) builder (3.0.4) cancan (1.6.10) capybara (1.1.2) @@ -213,6 +215,7 @@ PLATFORMS DEPENDENCIES acts_as_commentable_with_threading bcrypt-ruby (~> 3.0.0) + bootstrap-sass cancan capybara (= 1.1.2) cocoon diff --git a/app/assets/images/img/glyphicons-halflings-white.png b/app/assets/images/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484a..00000000 Binary files a/app/assets/images/img/glyphicons-halflings-white.png and /dev/null differ diff --git a/app/assets/images/img/glyphicons-halflings.png b/app/assets/images/img/glyphicons-halflings.png deleted file mode 100644 index a9969993..00000000 Binary files a/app/assets/images/img/glyphicons-halflings.png and /dev/null differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b7d274aa..1ebf29ee 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,5 +17,5 @@ //= require jquery-ui-timepicker-addon //= require jquery.dataTables //= require cocoon -//= require bootstrap.min +//= require bootstrap //= require osem diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap.js.coffee deleted file mode 100644 index c9404a8e..00000000 --- a/app/assets/javascripts/bootstrap.js.coffee +++ /dev/null @@ -1,4 +0,0 @@ -jQuery -> - $("a[rel=popover]").popover() - $(".tooltip").tooltip() - $("a[rel=tooltip]").tooltip() \ No newline at end of file diff --git a/app/assets/javascripts/bootstrap.min.js b/app/assets/javascripts/bootstrap.min.js deleted file mode 100644 index e4679604..00000000 --- a/app/assets/javascripts/bootstrap.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/** -* Bootstrap.js by @fat & @mdo -* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-dropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-tooltip.js, bootstrap-popover.js, bootstrap-affix.js, bootstrap-alert.js, bootstrap-button.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.focus().trigger("shown")}):b.$element.focus().trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(a){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('