contour 2.6.0.beta5 → 2.6.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2dd47634c04aec42ba430f48d3d4bf80c6973a9
-  data.tar.gz: 6c5b937d678a7d3e0391d925deffda524f61f761
+  metadata.gz: 568eb4da177cbbd57474c7de7cbe060c1cb207d2
+  data.tar.gz: da21b97a0a1903b5ce0ba3b8087212c305ab8d12
 SHA512:
-  metadata.gz: 7360c24a7a29ed9ef8450a7f22d276a3e9e311fdf35de372a14d122fdb38f0892603efcb8a52fc8d5f74d657cafc73590cfa16de3ac117b10de530f9556f5983
-  data.tar.gz: 3ad556e4b79f311cb5792a6a4ae5f10ad39b7b1878bca439690ed7b54d23ba1ad6e718523e3efd1d1340218d2fc4633a17ea95981cae316b0787abcd344e053a
+  metadata.gz: 55c11cb41421a6191a2edf9df35e8c79553c93849232982a4a7ca0ea4583c94686f35ce8263a2f81fde8fd7dd2c668db374b87bdf0d4a65db25c1f44d674a5bd
+  data.tar.gz: d1240d14d461747018bd31099f765350b86305a94b58c19fd26b21db9538980edf588319e9d70885641f2ce782a89bd24b48454188420bd1aa6d8b2c2286ecbe

data/app/assets/stylesheets/contour.scss

@@ -9,3 +9,4 @@
 @import 'datepicker';
 @import 'contour/about';
 @import 'glyphicon-overrides';
+@import 'opensans';

data/app/assets/stylesheets/opensans.css.erb

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src:url('opensans/OpenSans-Light<%= asset_path('opensans/OpenSans-Light.ttf').split('OpenSans-Light').last %>') format('truetype');
+}
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src:url('opensans/OpenSans-Regular<%= asset_path('opensans/OpenSans-Regular.ttf').split('OpenSans-Regular').last %>') format('truetype');
+}
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src:url('opensans/OpenSans-Bold<%= asset_path('opensans/OpenSans-Bold.ttf').split('OpenSans-Bold').last %>') format('truetype');
+}

data/lib/contour/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.6.0.beta5
+  version: 2.6.0.beta6
 platform: ruby
 authors:
 - Remo Mueller
@@ -176,15 +176,8 @@ files:
 - Rakefile
 - app/assets/fonts/opensans/LICENSE.txt
 - app/assets/fonts/opensans/OpenSans-Bold.ttf
-- app/assets/fonts/opensans/OpenSans-BoldItalic.ttf
-- app/assets/fonts/opensans/OpenSans-ExtraBold.ttf
-- app/assets/fonts/opensans/OpenSans-ExtraBoldItalic.ttf
-- app/assets/fonts/opensans/OpenSans-Italic.ttf
 - app/assets/fonts/opensans/OpenSans-Light.ttf
-- app/assets/fonts/opensans/OpenSans-LightItalic.ttf
 - app/assets/fonts/opensans/OpenSans-Regular.ttf
-- app/assets/fonts/opensans/OpenSans-Semibold.ttf
-- app/assets/fonts/opensans/OpenSans-SemiboldItalic.ttf
 - app/assets/images/contour/cas_32.png
 - app/assets/images/contour/cas_64.png
 - app/assets/images/contour/facebook_32.png
@@ -227,6 +220,7 @@ files:
 - 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/opensans.css.erb
 - app/assets/stylesheets/typeahead.js-bootstrap.scss
 - app/controllers/contour/authentications_controller.rb
 - app/controllers/contour/confirmations_controller.rb