diff --git a/Gemfile b/Gemfile index b4ff013a0..3c41ee688 100644 --- a/Gemfile +++ b/Gemfile @@ -57,9 +57,7 @@ group :assets do gem "less", '~>2.3.2' gem "less-rails", '~> 2.3.3' # CSS framework - gem "twitter-bootstrap-rails", - :git => 'https://github.com/seyhunak/twitter-bootstrap-rails.git', - :ref => '2c7c52' + gem "less-rails-bootstrap" gem 'uglifier', '>= 1.0.3' # JavaScript compressor diff --git a/Gemfile.lock b/Gemfile.lock index e2bd35b31..2921a230f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,17 +5,6 @@ GIT specs: geocoder (1.1.8) -GIT - remote: https://github.com/seyhunak/twitter-bootstrap-rails.git - revision: 2c7c527c354d9068ce49346d4fd8389328d32ce6 - ref: 2c7c52 - specs: - twitter-bootstrap-rails (2.2.7) - actionpack (>= 3.1) - execjs - rails (>= 3.1) - railties (>= 3.1) - PATH remote: vendor/gems/active_utils-1.0.5 specs: @@ -162,6 +151,8 @@ GEM less-rails (2.3.3) actionpack (>= 3.1) less (~> 2.3.1) + less-rails-bootstrap (3.0.2) + less-rails (~> 2.3.1) letter_opener (1.2.0) launchy (~> 2.2) libv8 (3.16.14.3) @@ -312,6 +303,7 @@ DEPENDENCIES leaflet-rails less (~> 2.3.2) less-rails (~> 2.3.3) + less-rails-bootstrap letter_opener libv8 (= 3.16.14.3) memcachier @@ -327,7 +319,6 @@ DEPENDENCIES rspec-rails (~> 2.12.1) sass-rails (~> 3.2.3) therubyracer (~> 0.12) - twitter-bootstrap-rails! uglifier (>= 1.0.3) unicorn webrat diff --git a/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less b/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less new file mode 100644 index 000000000..effdaefb6 --- /dev/null +++ b/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less @@ -0,0 +1,65 @@ +// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +// !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! +// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +/*! + * Bootstrap v3.0.0 + * + * Copyright 2013 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + */ + +// Core variables and mixins +@import "twitter/bootstrap/variables.less"; +@import "custom_bootstrap/variables.less"; // Modify this for custom colors, font-sizes, etc +@import "twitter/bootstrap/mixins.less"; +@import "custom_bootstrap/mixins.less"; // Modify this for custom mixins + +// Reset +@import "twitter/bootstrap/normalize.less"; +@import "twitter/bootstrap/print.less"; + +// Core CSS +@import "twitter/bootstrap/scaffolding.less"; +@import "twitter/bootstrap/type.less"; +@import "twitter/bootstrap/code.less"; +@import "twitter/bootstrap/grid.less"; +@import "twitter/bootstrap/tables.less"; +@import "twitter/bootstrap/forms.less"; +@import "twitter/bootstrap/buttons.less"; + +// Components +@import "twitter/bootstrap/component-animations.less"; +@import "twitter/bootstrap/glyphicons.less"; +@import "twitter/bootstrap/dropdowns.less"; +@import "twitter/bootstrap/button-groups.less"; +@import "twitter/bootstrap/input-groups.less"; +@import "twitter/bootstrap/navs.less"; +@import "twitter/bootstrap/navbar.less"; +@import "twitter/bootstrap/breadcrumbs.less"; +@import "twitter/bootstrap/pagination.less"; +@import "twitter/bootstrap/pager.less"; +@import "twitter/bootstrap/labels.less"; +@import "twitter/bootstrap/badges.less"; +@import "twitter/bootstrap/jumbotron.less"; +@import "twitter/bootstrap/thumbnails.less"; +@import "twitter/bootstrap/alerts.less"; +@import "twitter/bootstrap/progress-bars.less"; +@import "twitter/bootstrap/media.less"; +@import "twitter/bootstrap/list-group.less"; +@import "twitter/bootstrap/panels.less"; +@import "twitter/bootstrap/wells.less"; +@import "twitter/bootstrap/close.less"; + +// Components w/ JavaScript +@import "twitter/bootstrap/modals.less"; +@import "twitter/bootstrap/tooltip.less"; +@import "twitter/bootstrap/popovers.less"; +@import "twitter/bootstrap/carousel.less"; + +// Utility classes +@import "twitter/bootstrap/utilities.less"; +@import "twitter/bootstrap/responsive-utilities.less"; diff --git a/app/assets/stylesheets/custom_bootstrap/mixins.less b/app/assets/stylesheets/custom_bootstrap/mixins.less new file mode 100644 index 000000000..44c24bdb7 --- /dev/null +++ b/app/assets/stylesheets/custom_bootstrap/mixins.less @@ -0,0 +1 @@ +// Use this file to override Twitter Bootstrap mixins or define own mixins. diff --git a/app/assets/stylesheets/custom_bootstrap/variables.less b/app/assets/stylesheets/custom_bootstrap/variables.less new file mode 100644 index 000000000..8d9f63301 --- /dev/null +++ b/app/assets/stylesheets/custom_bootstrap/variables.less @@ -0,0 +1 @@ +// Use this file to override Twitter Bootstrap variables or define own variables.