ogatstyle 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bbb26742afa1b184c0a5e009ba41ba04b3d1f8b
-  data.tar.gz: f3abb5ad688b43e43e70abfccff2f51dd4053e57
+  metadata.gz: 40ad4ee678461727e28e5c41bfec0cfbba65f099
+  data.tar.gz: 2ad7b105941d11ddd5e1715e69d48003739f913d
 SHA512:
-  metadata.gz: 3a42536370f6464c880f4b899c19baa9d1c9575ef6f54806d7ef69aede591ff14c85ee34b258412fa0fef34f6fddb370cc3b33d23ff794f63032adec646a9b7d
-  data.tar.gz: 949aad907068e3d803624221ec2e91a94e6c93dec80190b5a721b7379007768be1a7bee8e8338049534f09ce92caaf1d99c9e283801609cc1af73dae9bb74eb7
+  metadata.gz: 065427ced681c3e16df861da723722a61c892dcb44eab3bb4afc7bb17db5b7e1aea67ac05c11736a762fce99556fb27900491537c470f5a5f305171d8d9c633b
+  data.tar.gz: d820d3d2623256fb26df6bc97a678cfcaed4bbe1cf429fd07163da0fa943a9ceaf782d1713ac0d21f9645c5ecba1a6e07e52a73e7558d178c6797168ce42f7b2

data/.gitattributes

@@ -0,0 +1 @@
+CHANGELOG.md merge=union

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
     - '**/Rakefile'
   Exclude:
     - 'bin/**/*'
+    - 'vendor/**/*'
 
 Metrics/LineLength:
   Max: 80

data/.travis.yml

@@ -1,14 +1,17 @@
+sudo: false
 language: ruby
+cache: bundler
 rvm:
 - 2.3.0
 - 2.0.0
 addons:
   code_climate:
-    repo_token: dbd5bb31c15378fc0f7fa9722aa2c822edcde33ec0172c2dfa055ab354981046
+    repo_token: eac2c829d8168c6288ac7bb498a86df0286608b43d17d5f80a765e3bfce689c7
 before_install: gem install bundler -v 1.13.6
 script:
 - bundle exec rubocop
-- bundle exec rspec
+- bundle exec rake
+- bundle exec codeclimate-test-reporter
 deploy:
   provider: rubygems
   api_key:

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## development
+# Change Log
+
+## v3.3.0 - 2016-12-16
+
+- [OS-25] Setup coverage reporting
+- [OS-32] Specify Gill Sans font-family with fallback rather than use webfont
+
+## v3.2.2 - 2016-11-16
+
+- [OS-31] Released ogatstyle through rubygems
 
 ## v3.2.1 - 2016-10-3
 

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ogatstyle.gemspec
 gemspec
+
+gem 'rake', '~> 11.2'
+gem 'rspec', '~> 3.2'
+gem 'rubocop', '~> 0.45'
+
+group :test do
+  gem 'codeclimate-test-reporter', '~> 1.0', require: false
+end

data/README.md

@@ -1,6 +1,8 @@
 # OGAT Style
 
-[![Code Climate](https://codeclimate.com/github/Outwood/ogat-style/badges/gpa.svg)](https://codeclimate.com/github/Outwood/ogat-style)
+[![Code Climate](https://codeclimate.com/github/Outwood/ogatstyle/badges/gpa.svg)](https://codeclimate.com/github/Outwood/ogatstyle)
+[![Build Status](https://travis-ci.org/Outwood/ogatstyle.svg?branch=master)](https://travis-ci.org/Outwood/ogatstyle)
+[![Test Coverage](https://codeclimate.com/github/Outwood/ogatstyle/badges/coverage.svg)](https://codeclimate.com/github/Outwood/ogatstyle/coverage)
 
 Base style assets for Outwood websites
 
@@ -26,8 +28,6 @@ Or install it yourself as:
 
 ```scss
 @import "ogatstyle";
-// Optional imports
-@import "ogatstyle/gill_sans";
 ```
 
 ### Full-width web app varient
@@ -35,7 +35,6 @@ Or install it yourself as:
 ```scss
 @import "ogatstyle_app";
 // Optional imports
-@import "ogatstyle/gill_sans";
 @import "ogatstyle/apps/purple";
 ```
 

data/app/assets/stylesheets/ogatstyle/_type.scss

@@ -1,16 +1,19 @@
 p.lead {
-  font-family: GillSansLightItalic, "Helvetica Neue", Arial, sans-serif;
+  font-family: $ogat-font-family;
   font-style: italic;
+  font-weight: lighter;
 }
 
 address strong {
-  font-family: GillSansBold, "Helvetica Neue", Arial, sans-serif;
+  font-family: $ogat-font-family;
   font-size: 115%;
+  font-weight: bold;
 }
 
 blockquote {
-  font-family: GillSansLightItalic, "Helvetica Neue", Arial, sans-serif;
+  font-family: $ogat-font-family;
   font-style: italic;
+  font-weight: lighter;
 
   small,
   cite {
@@ -20,8 +23,9 @@ blockquote {
 }
 
 .alert > strong {
-  font-family: GillSansBold, "Helvetica Neue", Arial, sans-serif;
+  font-family: $ogat-font-family;
   font-size: 115%;
+  font-weight: bold;
 }
 
 .page-header {

data/app/assets/stylesheets/ogatstyle/_variables.scss

@@ -12,3 +12,7 @@ $ogat-gold: #B09C78 !default;
 // for shades: mix with black
 
 $ogat-purple-alt: mix($ogat-purple, white, 60%) !default;
+
+
+// Brand font
+$ogat-font-family: "Gill Sans", "Gill Sans MT", Calibri, Sans-Serif !default;

data/app/assets/stylesheets/ogatstyle/apps/_bootstrap_overrides.scss

@@ -16,10 +16,3 @@
 td.actions {
   text-align: right;
 }
-
-// Adjust heading line-height in media items to account for GillSansBold
-.media-body {
-  h4 {
-    line-height: 1.3;
-  }
-}

data/app/assets/stylesheets/ogatstyle/apps/_bootstrap_variables.scss

@@ -10,4 +10,4 @@ $navbar-inverse-brand-color:        #fff;
 $navbar-inverse-brand-hover-color:  #efefef;
 $navbar-inverse-brand-hover-bg:     $ogat-purple-alt;
 
-$headings-font-family: GillSansBold, "Helvetica Neue", Arial, sans-serif;
+$headings-font-family: $ogat-font-family;

data/app/assets/stylesheets/ogatstyle/apps/_navbar.scss

@@ -10,7 +10,8 @@
 
 .navbar-app-title {
   @extend .navbar-brand;
-  font-family: GillSansLight;
+  font-family: $ogat-font-family;
+  font-weight: lighter;
   margin-left: 0;
   padding: 10px 15px 10px 5px;
   text-transform: uppercase;

data/app/assets/stylesheets/ogatstyle/sites/_base_style.scss

@@ -1,13 +1,13 @@
 .container.container-constrained {
-	max-width: 1200px;
-	margin-left: auto;
-	margin-right: auto;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 1200px;
 }
 
 .grid-row {
-	margin-bottom: 1em;
+  margin-bottom: 1em;
 }
 
 .container-main {
-	padding-bottom: 1em;
+  padding-bottom: 1em;
 }

data/app/assets/stylesheets/ogatstyle/sites/_bootstrap_overrides.scss

@@ -44,13 +44,6 @@ html, body {
   height: 100%;
 }
 
-// Adjust heading line-height in media items to account for GillSansBold
-.media-body {
-  h4 {
-    line-height: 1.3;
-  }
-}
-
 // Fix button text shadow in OGATstyle
 .btn-primary {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);

data/app/assets/stylesheets/ogatstyle/sites/_bootstrap_variables.scss

@@ -1,3 +1,3 @@
 $brand-primary: $ogat-purple;
 
-$headings-font-family: GillSansBold, "Helvetica Neue", Arial, sans-serif;
+$headings-font-family: $ogat-font-family;

data/app/assets/stylesheets/ogatstyle.scss

@@ -1,6 +1,5 @@
 @import "ogatstyle/variables";
 @import "ogatstyle/sites/bootstrap_variables";
-@import "ogatstyle/base_fonts";
 @import "bootstrap-sprockets";
 @import "bootstrap";
 @import "bootstrap/theme";

data/app/assets/stylesheets/ogatstyle_app.scss

@@ -1,6 +1,5 @@
 @import "ogatstyle/variables";
 @import "ogatstyle/apps/bootstrap_variables";
-@import "ogatstyle/base_fonts";
 @import "bootstrap-sprockets";
 @import "bootstrap";
 

data/lib/ogatstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ogatstyle
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.3.0'.freeze
 end

data/ogatstyle.gemspec

@@ -7,12 +7,13 @@ require 'ogatstyle/version'
 Gem::Specification.new do |spec|
   spec.name          = 'ogatstyle'
   spec.version       = Ogatstyle::VERSION
+  spec.required_ruby_version = '>= 2.0.0'
   spec.authors       = ['Elliot Bowes', 'Tom Crouch']
   spec.email         = ['e.bowes@outwood.com']
 
   spec.summary       = 'OGAT Style Gem'
   spec.description   = 'Provides SCSS stylesheets and assets for the OGAT Style.'
-  spec.homepage      = 'https://github.com/Outwood/ogat-style'
+  spec.homepage      = 'https://github.com/Outwood/ogatstyle'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -21,10 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 11.2'
-  spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.45'
-  spec.add_development_dependency 'activesupport', '< 5.0'
+  spec.add_development_dependency 'activesupport', '>= 4.0', '< 5.0'
   spec.add_dependency 'rails', '>= 4.1'
   spec.add_dependency 'sass-rails', '>= 3.2'
   spec.add_dependency 'bootstrap-sass', '~> 3.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ogatstyle
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Elliot Bowes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,52 +25,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.45'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -78,6 +39,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -162,6 +126,7 @@ files:
 - ".csslintrc"
 - ".eslintignore"
 - ".eslintrc"
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -171,12 +136,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/fonts/GillSans.woff
-- app/assets/fonts/GillSansBold.woff
-- app/assets/fonts/GillSansLight.eot
-- app/assets/fonts/GillSansLight.ttf
-- app/assets/fonts/GillSansLight.woff
-- app/assets/fonts/GillSansLightItalic.woff
 - app/assets/images/fileicon/archive.png
 - app/assets/images/fileicon/css.png
 - app/assets/images/fileicon/default.png
@@ -201,8 +160,6 @@ files:
 - app/assets/images/ogatstyle/swirl-white-nav.png
 - app/assets/images/ogatstyle/swirl-white-nav2x.png
 - app/assets/stylesheets/ogatstyle.scss
-- app/assets/stylesheets/ogatstyle/_base_fonts.scss
-- app/assets/stylesheets/ogatstyle/_gill_sans.scss
 - app/assets/stylesheets/ogatstyle/_social.scss
 - app/assets/stylesheets/ogatstyle/_tables.scss
 - app/assets/stylesheets/ogatstyle/_type.scss
@@ -224,7 +181,7 @@ files:
 - lib/ogatstyle/fileicon/mapping.rb
 - lib/ogatstyle/version.rb
 - ogatstyle.gemspec
-homepage: https://github.com/Outwood/ogat-style
+homepage: https://github.com/Outwood/ogatstyle
 licenses:
 - MIT
 metadata: {}
@@ -236,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/assets/stylesheets/ogatstyle/_base_fonts.scss

@@ -1,23 +0,0 @@
-@font-face {
-  font-family: 'GillSansLightItalic';
-  src: font-url('GillSansLightItalic.woff') format('woff');
-  font-weight: normal;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: 'GillSansBold';
-  src: font-url('GillSansBold.woff') format('woff');
-  font-weight: bold;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'GillSansLight';
-  src: font-url('GillSansLight.eot');
-  src: font-url('GillSansLight.eot?#iefix') format("embedded-opentype"),
-       font-url('GillSansLight.woff') format("woff"),
-       font-url('GillSansLight.ttf') format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}

data/app/assets/stylesheets/ogatstyle/_gill_sans.scss

@@ -1,6 +0,0 @@
-@font-face {
-  font-family: 'GillSans';
-  src: font-url('GillSans.woff') format("woff");
-  font-weight: normal;
-  font-style: normal;
-}