contour 2.6.0.beta2 → 2.6.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d44025def303c6df4d4e275fa63e98739334c0
-  data.tar.gz: 4a1487b5f2562c6f0f7def1796a0a3500cbd9731
+  metadata.gz: b5f5503ea5751cd282ecc3265ce24c5482eee1f8
+  data.tar.gz: 31aa59f1d59142cabac39556139e58860d8ef2d5
 SHA512:
-  metadata.gz: 9a1dfa5ebd05c7d899d304b9f3ebaa1a8ec8cd4b1625fc9d3c2f31a0c4781da1374a523c76f5cbe7eae2d6e65532e0d0a3625fc83e2b9003c0755ba7517d2956
-  data.tar.gz: 8de697ec73ad5cff0338163a0b79b37217f23a6e95b67fdd88f5ee19a5569ad99d6f6424188050473c75d1fe19f20d7cfa95b009178248a585cb3344a8d79222
+  metadata.gz: 9fa6be4b12ff3ae660c2da30c923d0646e6290501ec18a9fec9c850bc4513cee5a540b6eb1f1997044ca1d3b602720b3edc13e164a32a00a089f0203626ece6a
+  data.tar.gz: fc66dac1acc698eda5cf2dc70e32f4ce1f770224cd64b6358e32ff7f8d02e158f4cb2eb5b7162d8fb9582ea4cc292740c1c9d6e67ad22a9d37fe584d7cfd3c07

data/app/assets/stylesheets/contour.scss

@@ -7,3 +7,4 @@
 @import 'jquery-ui-1.10.0.custom';
 @import 'datepicker';
 @import 'contour/about';
+@import 'glyphicon-overrides';

data/app/assets/stylesheets/glyphicon-overrides.scss.erb

@@ -0,0 +1,13 @@
+@font-face {
+  font-family: 'Glyphicons Halflings Contour';
+  src:url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.eot').split('glyphicons-halflings-regular').last %>');
+
+  src:url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.eot').split('glyphicons-halflings-regular').last %>?#iefix') format('embedded-opentype'),
+      url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.woff').split('glyphicons-halflings-regular').last %>') format('woff'),
+      url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.ttf').split('glyphicons-halflings-regular').last %>') format('truetype'),
+      url('bootstrap/glyphicons-halflings-regular<%= asset_path('bootstrap/glyphicons-halflings-regular.svg').split('glyphicons-halflings-regular').last %>#glyphicons_halflingsregular') format('svg');
+}
+
+.glyphicon {
+  font-family: 'Glyphicons Halflings Contour';
+}

data/lib/contour/fixes.rb

@@ -1,6 +1,7 @@
 require 'contour/fixes/devise.rb'
 require 'contour/fixes/omniauth.rb'
 require 'contour/fixes/rack.rb'
+require 'contour/fixes/sass-rails.rb'
 
 module Contour
   module Fixes

data/lib/contour/fixes/sass-rails.rb

@@ -0,0 +1,8 @@
+require 'sass/rails'
+
+class Sass::Rails::Importer
+  def sass_file? filename
+    filename = filename.to_s
+    SASS_EXTENSIONS.keys.any?{|ext| filename.match /#{ext}$/}
+  end
+end

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 6
     TINY = 0
-    BUILD = "beta2" # nil, "pre", "rc", "rc2"
+    BUILD = "beta3" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.6.0.beta2
+  version: 2.6.0.beta3
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,6 +213,7 @@ files:
 - app/assets/stylesheets/contour.scss
 - app/assets/stylesheets/contour/about.scss
 - app/assets/stylesheets/datepicker.scss
+- app/assets/stylesheets/glyphicon-overrides.scss.erb
 - app/assets/stylesheets/jquery-ui-1.10.0.custom.scss
 - app/assets/stylesheets/typeahead.js-bootstrap.scss
 - app/controllers/contour/authentications_controller.rb
@@ -274,6 +275,7 @@ files:
 - lib/contour/fixes/devise.rb
 - lib/contour/fixes/omniauth.rb
 - lib/contour/fixes/rack.rb
+- lib/contour/fixes/sass-rails.rb
 - lib/contour/version.rb
 - lib/generators/contour/install/install_generator.rb
 - lib/generators/contour/install/templates/README