ogatstyle 3.3.0 → 3.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +6 -1
  3. data/.travis.yml +9 -3
  4. data/CHANGELOG.md +7 -0
  5. data/Gemfile +1 -1
  6. data/app/assets/stylesheets/ogatstyle.scss +1 -0
  7. data/app/assets/stylesheets/ogatstyle/_type.scss +1 -8
  8. data/app/assets/stylesheets/ogatstyle/_variables.scss +4 -5
  9. data/app/assets/stylesheets/ogatstyle/apps/_bootstrap_variables.scss +1 -0
  10. data/app/assets/stylesheets/ogatstyle/apps/_navbar.scss +1 -0
  11. data/app/assets/stylesheets/ogatstyle/apps/_purple.scss +5 -5
  12. data/app/assets/stylesheets/ogatstyle/sites/_bootstrap_overrides.scss +9 -6
  13. data/app/assets/stylesheets/ogatstyle/sites/_bootstrap_variables.scss +2 -0
  14. data/app/assets/stylesheets/ogatstyle/sites/_type.scss +26 -0
  15. data/gemfiles/2.0.0-Gemfile +13 -0
  16. data/lib/ogatstyle/version.rb +1 -1
  17. metadata +5 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 40ad4ee678461727e28e5c41bfec0cfbba65f099
4
- data.tar.gz: 2ad7b105941d11ddd5e1715e69d48003739f913d
3
+ metadata.gz: aa236adf9fba3ce31a38dd609220b1703943a619
4
+ data.tar.gz: 4fa168aff4d8a51e28cb54d422b3f212fedaf573
5
5
  SHA512:
6
- metadata.gz: 065427ced681c3e16df861da723722a61c892dcb44eab3bb4afc7bb17db5b7e1aea67ac05c11736a762fce99556fb27900491537c470f5a5f305171d8d9c633b
7
- data.tar.gz: d820d3d2623256fb26df6bc97a678cfcaed4bbe1cf429fd07163da0fa943a9ceaf782d1713ac0d21f9645c5ecba1a6e07e52a73e7558d178c6797168ce42f7b2
6
+ metadata.gz: cded624b5a3f552b00108ede3e509a2a131bd4ed4bb04c2643a768d761e6341b951392b7bc924a4ed0df99cfb5f4a35fc66fdecc2889b1c37e37dff2ff600f61
7
+ data.tar.gz: 2a417cbe804d2ebb326dcc3dde71ff06bfdbbe75b9c718271fa19064b052afe2caf3b9df94f2fe8c50513529cc33ab1e3664d36e953b72df181e10dd19bc0bd4
data/.rubocop.yml CHANGED
@@ -1,15 +1,20 @@
1
1
  AllCops:
2
- TargetRubyVersion: 2.0
2
+ TargetRubyVersion: 2.3
3
3
  Include:
4
4
  - '**/Rakefile'
5
5
  Exclude:
6
6
  - 'bin/**/*'
7
7
  - 'vendor/**/*'
8
+ - 'gemfiles/vendor/**/*'
8
9
 
9
10
  Metrics/LineLength:
10
11
  Max: 80
11
12
  Metrics/MethodLength:
12
13
  Max: 15
14
+ Metrics/BlockLength:
15
+ ExcludedMethods:
16
+ - describe
17
+ - context
13
18
  Style/AlignParameters:
14
19
  EnforcedStyle: with_fixed_indentation
15
20
  Style/MultilineMethodCallIndentation:
data/.travis.yml CHANGED
@@ -1,13 +1,19 @@
1
1
  sudo: false
2
+ dist: trusty
2
3
  language: ruby
3
4
  cache: bundler
4
5
  rvm:
5
- - 2.3.0
6
- - 2.0.0
6
+ - 2.3.3
7
+ matrix:
8
+ include:
9
+ - rvm: 2.0.0
10
+ gemfile: gemfiles/2.0.0-Gemfile
7
11
  addons:
8
12
  code_climate:
9
13
  repo_token: eac2c829d8168c6288ac7bb498a86df0286608b43d17d5f80a765e3bfce689c7
10
- before_install: gem install bundler -v 1.13.6
14
+ before_install:
15
+ - gem update --system 2.6.10
16
+ - gem install bundler -v 1.14.3
11
17
  script:
12
18
  - bundle exec rubocop
13
19
  - bundle exec rake
data/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Change Log
2
2
 
3
+ ## Upcoming
4
+
5
+ ## v3.3.1 - 2017-02-07
6
+
7
+ - [OS-34] Updated CI builds
8
+ - Improved consistency of heading fonts & weights across 'sites'
9
+
3
10
  ## v3.3.0 - 2016-12-16
4
11
 
5
12
  - [OS-25] Setup coverage reporting
data/Gemfile CHANGED
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
3
3
  # Specify your gem's dependencies in ogatstyle.gemspec
4
4
  gemspec
5
5
 
6
- gem 'rake', '~> 11.2'
6
+ gem 'rake', '~> 12.0'
7
7
  gem 'rspec', '~> 3.2'
8
8
  gem 'rubocop', '~> 0.45'
9
9
 
data/app/assets/stylesheets/ogatstyle.scss CHANGED
@@ -7,6 +7,7 @@
7
7
  @import "ogatstyle/social";
8
8
  @import "ogatstyle/visibility";
9
9
  @import "ogatstyle/type";
10
+ @import "ogatstyle/sites/type";
10
11
  @import "ogatstyle/tables";
11
12
  @import "ogatstyle/sites/base_style";
12
13
  @import "font-awesome-sprockets";
data/app/assets/stylesheets/ogatstyle/_type.scss CHANGED
@@ -4,12 +4,6 @@ p.lead {
4
4
  font-weight: lighter;
5
5
  }
6
6
 
7
- address strong {
8
- font-family: $ogat-font-family;
9
- font-size: 115%;
10
- font-weight: bold;
11
- }
12
-
13
7
  blockquote {
14
8
  font-family: $ogat-font-family;
15
9
  font-style: italic;
@@ -17,13 +11,12 @@ blockquote {
17
11
 
18
12
  small,
19
13
  cite {
20
- font-family: "Helvetica Neue", Arial, sans-serif;
14
+ font-family: "Helvetica Neue", Sans-Serif;
21
15
  font-style: normal;
22
16
  }
23
17
  }
24
18
 
25
19
  .alert > strong {
26
- font-family: $ogat-font-family;
27
20
  font-size: 115%;
28
21
  font-weight: bold;
29
22
  }
data/app/assets/stylesheets/ogatstyle/_variables.scss CHANGED
@@ -1,10 +1,10 @@
1
1
  // Official OGAT branding colors
2
2
 
3
- // #5B3393 / rgb(91,51,147)
4
- $ogat-purple: rgb(91,51,147) !default;
5
- // #AD99C9 / rgb(173,153,201)
3
+ // #5B3393 / rgb(91, 51, 147)
4
+ $ogat-purple: rgb(91, 51, 147) !default;
5
+ // #AD99C9 / rgb(173, 153, 201)
6
6
  $ogat-purple-secondary: mix($ogat-purple, white, 50%) !default;
7
- // #B09C78 / rgb(176,156,119)
7
+ // #B09C78 / rgb(176, 156, 119)
8
8
  $ogat-gold: #B09C78 !default;
9
9
 
10
10
  // Web colors: prefer tints and shades of brand colors
@@ -13,6 +13,5 @@ $ogat-gold: #B09C78 !default;
13
13
 
14
14
  $ogat-purple-alt: mix($ogat-purple, white, 60%) !default;
15
15
 
16
-
17
16
  // Brand font
18
17
  $ogat-font-family: "Gill Sans", "Gill Sans MT", Calibri, Sans-Serif !default;
data/app/assets/stylesheets/ogatstyle/apps/_bootstrap_variables.scss CHANGED
@@ -11,3 +11,4 @@ $navbar-inverse-brand-hover-color: #efefef;
11
11
  $navbar-inverse-brand-hover-bg: $ogat-purple-alt;
12
12
 
13
13
  $headings-font-family: $ogat-font-family;
14
+ $headings-font-weight: bold !default;
data/app/assets/stylesheets/ogatstyle/apps/_navbar.scss CHANGED
@@ -3,6 +3,7 @@
3
3
  margin-left: 0;
4
4
  }
5
5
  }
6
+
6
7
  .navbar-brand {
7
8
  line-height: inherit;
8
9
  padding: 7px;
data/app/assets/stylesheets/ogatstyle/apps/_purple.scss CHANGED
@@ -14,15 +14,15 @@ body.purple {
14
14
  }
15
15
 
16
16
  .panel-default {
17
- background-color: rgba($purple-panel-color, 0.7);
17
+ background-color: rgba($purple-panel-color, .7);
18
18
  border-color: $purple-gradient-color;
19
- -moz-box-shadow: 0px 1px 16px 0px rgba(0,0,0,0.6);
20
- -webkit-box-shadow: 0px 1px 16px 0px rgba(0,0,0,0.6);
21
- box-shadow: 0px 1px 16px 0px rgba(0,0,0,0.6);
19
+ -moz-box-shadow: 0px 1px 16px 0px rgba(0, 0, 0, .6);
20
+ -webkit-box-shadow: 0px 1px 16px 0px rgba(0, 0, 0,.6);
21
+ box-shadow: 0px 1px 16px 0px rgba(0, 0, 0, .6);
22
22
  color: $text-color;
23
23
 
24
24
  .panel-heading {
25
- background-color: rgba($purple-gradient-color, 0.15);
25
+ background-color: rgba($purple-gradient-color, .15);
26
26
  }
27
27
  }
28
28
  }
data/app/assets/stylesheets/ogatstyle/sites/_bootstrap_overrides.scss CHANGED
@@ -1,10 +1,16 @@
1
+ html,
2
+ body {
3
+ height: 100%;
4
+ }
5
+
1
6
  .footer {
2
7
  background-color: #f7f7f7;
3
8
  background-color: rgba(255, 255, 255, 0.65);
4
9
  padding: 30px;
5
10
  color: #999;
6
11
 
7
- .copyright, .legal {
12
+ .copyright,
13
+ .legal {
8
14
  font-size: 80%;
9
15
  }
10
16
  }
@@ -13,7 +19,7 @@
13
19
  text-indent: -9999px;
14
20
  margin-top: 20px;
15
21
  margin-bottom: 20px;
16
- }
22
+ }
17
23
 
18
24
  .container-fluid-main {
19
25
  margin-top: 10px;
@@ -25,6 +31,7 @@
25
31
  .container {
26
32
  padding: 0 30px 0;
27
33
  }
34
+
28
35
  .container-main {
29
36
  border: 1px solid #bbb;
30
37
 
@@ -40,10 +47,6 @@
40
47
  }
41
48
  }
42
49
 
43
- html, body {
44
- height: 100%;
45
- }
46
-
47
50
  // Fix button text shadow in OGATstyle
48
51
  .btn-primary {
49
52
  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
data/app/assets/stylesheets/ogatstyle/sites/_bootstrap_variables.scss CHANGED
@@ -1,3 +1,5 @@
1
1
  $brand-primary: $ogat-purple;
2
2
 
3
3
  $headings-font-family: $ogat-font-family;
4
+ // Gill Sans does not appear to support weight 500
5
+ $headings-font-weight: bold !default;
data/app/assets/stylesheets/ogatstyle/sites/_type.scss ADDED
@@ -0,0 +1,26 @@
1
+ h1,
2
+ h2,
3
+ .h1,
4
+ .h2 {
5
+ color: $ogat-purple;
6
+ font-weight: lighter;
7
+ }
8
+
9
+ h3,
10
+ .h3 {
11
+ color: $ogat-purple;
12
+ font-weight: normal;
13
+ }
14
+
15
+ .page-header {
16
+ background-color: $ogat-purple;
17
+ border: none;
18
+ color: #fff;
19
+ font-family: $ogat-font-family;
20
+ font-weight: normal;
21
+ padding: .25em .5em;
22
+
23
+ small {
24
+ color: mix($ogat-purple, white, 20%);
25
+ }
26
+ }
data/gemfiles/2.0.0-Gemfile ADDED
@@ -0,0 +1,13 @@
1
+ source 'https://rubygems.org'
2
+
3
+ # Specify your gem's dependencies in ogatstyle.gemspec
4
+ gemspec path: '..'
5
+
6
+ gem 'rake', '~> 12.0'
7
+ gem 'rspec', '~> 3.2'
8
+ gem 'rubocop', '~> 0.45'
9
+ gem 'nokogiri', '~> 1.6.8'
10
+
11
+ group :test do
12
+ gem 'codeclimate-test-reporter', '~> 1.0', require: false
13
+ end
data/lib/ogatstyle/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Ogatstyle
4
- VERSION = '3.3.0'.freeze
4
+ VERSION = '3.3.1'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ogatstyle
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.0
4
+ version: 3.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elliot Bowes
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2016-12-16 00:00:00.000000000 Z
12
+ date: 2017-02-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -172,10 +172,12 @@ files:
172
172
  - app/assets/stylesheets/ogatstyle/sites/_base_style.scss
173
173
  - app/assets/stylesheets/ogatstyle/sites/_bootstrap_overrides.scss
174
174
  - app/assets/stylesheets/ogatstyle/sites/_bootstrap_variables.scss
175
+ - app/assets/stylesheets/ogatstyle/sites/_type.scss
175
176
  - app/assets/stylesheets/ogatstyle_app.scss
176
177
  - bin/console
177
178
  - bin/setup
178
179
  - coffeelint.json
180
+ - gemfiles/2.0.0-Gemfile
179
181
  - lib/ogatstyle.rb
180
182
  - lib/ogatstyle/fileicon.rb
181
183
  - lib/ogatstyle/fileicon/mapping.rb
@@ -201,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
201
203
  version: '0'
202
204
  requirements: []
203
205
  rubyforge_project:
204
- rubygems_version: 2.4.5
206
+ rubygems_version: 2.4.8
205
207
  signing_key:
206
208
  specification_version: 4
207
209
  summary: OGAT Style Gem