bootstrap-sass 3.0.0.0.rc → 3.0.0.0.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: aafebd3e6a2ed9f1ee3cdb4ab1a426484735e7af
4
- data.tar.gz: 54c98b77cc87298118101f5f323cf9772511097b
3
+ metadata.gz: 93676c1bf46bfa5bce33e5eba8688ee29d7c36af
4
+ data.tar.gz: 449d12d46a1c19dda4ce40c15fb1717532e02b7a
5
5
  SHA512:
6
- metadata.gz: 72f10b7ae37034721741b38985095bbbf481d3d992beb077ac843815dae2a7d483a39d97770c87f074edf76b129482ae6bd5f5ffb20fec97d4f6d6c66f949d7e
7
- data.tar.gz: 4a3cdebd4dbba31327b25ecec5b42e2cf2de2de46f9fa00adb6d098855de7588067c948c8d6d3defb3be08ac2b533e75a8bb72b48e7a68204f7c720fd058513d
6
+ metadata.gz: 257a9a36182808b5a0ea768637ee095f90c3e0b801a4b6629151601ab60cf561e05f241be570bc2b322812e2a0a1bfa25a3e29912fb79528d2272139db976735
7
+ data.tar.gz: 0f55a9b1cdbfc3f79768d98b447e4cf0f65b922dfe7a8a3470fc2da9e0ec5d62cb083f448a176c0408a9a54a6a19f58032caf127bbc21800b59cb4ea866cb534
@@ -5,7 +5,6 @@ rvm:
5
5
  - jruby
6
6
  - rbx-19mode
7
7
  gemfile:
8
- - test/gemfiles/sass_3_3.gemfile
9
8
  - test/gemfiles/sass_3_2.gemfile
10
9
  - test/gemfiles/sass_head.gemfile
11
10
  matrix:
@@ -1,8 +1,10 @@
1
1
  # Changelog
2
2
 
3
3
  ## 3.0.0.0
4
+
5
+ * Fully automated (lots of string juggling) LESS -> Sass conversion. - *Gleb Mazovetskiy*
4
6
  * Ported rake task from vwall/compass-twitter-bootstrap to convert Bootstrap upstream - *Peter Gumeson*
5
- * Moved javascripts from `bootstrap-component.js` to `bootstrap/component.js` - *Peter Gumeson*
7
+ * Moved javascripts to us `bootstrap-component.js` to `bootstrap/component.js` - *Peter Gumeson*
6
8
 
7
9
  ## 2.3.2.2
8
10
 
@@ -1,4 +1,4 @@
1
1
  module Bootstrap
2
- VERSION = '3.0.0.0.rc'
2
+ VERSION = '3.0.0.0.rc2'
3
3
  BOOTSTRAP_SHA = 'e8a1df5f060bf7e6631554648e0abde150aedbe4'
4
4
  end
@@ -1,6 +1,3 @@
1
1
  <% require 'bootstrap-sass/version' %>
2
2
  // Override Bootstrap variables here (defaults copied from bootstrap-sass version <%= Bootstrap::VERSION %>):
3
- <%=
4
- scss = File.read('vendor/assets/stylesheets/bootstrap/_variables.scss')
5
- scss.gsub(/^(?=\$)/, '//').gsub(/ !default/, '')
6
- %>
3
+ <%= File.read(@template[:options][:bs_variables_path]).gsub(/^(?=\$)/, '//').gsub(/ !default/, '') %>
@@ -4,7 +4,9 @@ description 'Bootstrap for Sass'
4
4
  stylesheet 'styles.scss'
5
5
 
6
6
  # SCSS:
7
- stylesheet '_variables.scss.erb', to: '_variables.scss', erb: true
7
+ bs_stylesheets = "../../vendor/assets/stylesheets/bootstrap"
8
+ stylesheet '_variables.scss.erb', to: '_variables.scss', erb: true,
9
+ bs_variables_path: File.expand_path("#{bs_stylesheets}/_variables.scss", File.dirname(__FILE__))
8
10
 
9
11
  # JS:
10
12
  bs_javascripts = "../../vendor/assets/javascripts/bootstrap"
@@ -1,5 +1,6 @@
1
1
  source "https://rubygems.org"
2
2
 
3
3
  gem 'sass', github: 'nex3/sass'
4
+ gem 'compass', '~> 0.12.2'
4
5
 
5
6
  gemspec path: '../../'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.0.rc
4
+ version: 3.0.0.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas McDonald
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-10-23 00:00:00.000000000 Z
11
+ date: 2013-10-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: compass
@@ -201,7 +201,6 @@ files:
201
201
  - test/dummy/public/500.html
202
202
  - test/dummy/public/favicon.ico
203
203
  - test/gemfiles/sass_3_2.gemfile
204
- - test/gemfiles/sass_3_3.gemfile
205
204
  - test/gemfiles/sass_head.gemfile
206
205
  - test/pages_test.rb
207
206
  - test/support/integration_test.rb
@@ -284,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
284
283
  version: 1.3.1
285
284
  requirements: []
286
285
  rubyforge_project:
287
- rubygems_version: 2.0.3
286
+ rubygems_version: 2.1.0
288
287
  signing_key:
289
288
  specification_version: 4
290
289
  summary: Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass
@@ -330,7 +329,6 @@ test_files:
330
329
  - test/dummy/public/500.html
331
330
  - test/dummy/public/favicon.ico
332
331
  - test/gemfiles/sass_3_2.gemfile
333
- - test/gemfiles/sass_3_3.gemfile
334
332
  - test/gemfiles/sass_head.gemfile
335
333
  - test/pages_test.rb
336
334
  - test/support/integration_test.rb
@@ -1,6 +0,0 @@
1
- source "https://rubygems.org"
2
-
3
- gem 'sass', '~> 3.3.0.rc.1'
4
- gem 'compass', '~> 0.13.alpha.7'
5
-
6
- gemspec path: '../../'