pusher-chameleon 1.2.1 → 1.3.0

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: aa118ae40db95a2ffa20b9e7eabbf8ca96425bf1
4
- data.tar.gz: f0d49ea0c9ea79c48820e32b25d940b1ed3185b4
3
+ metadata.gz: 08c01038d69c8b61962bcfee994afbd16c81c3ae
4
+ data.tar.gz: a83ccc6e741ca20c9577d75346d3e503b7885e56
5
5
  SHA512:
6
- metadata.gz: 7fd0f3fa29b3bd6fd196660c6cfaf5a0d363f63def879319e80b4c4b2556e726712ebaf3622e7a1810434a09dd5ad9bf126d49433222cf25666ff87dfa96856c
7
- data.tar.gz: bc06153c71638ea9b75dd89c40f8db8f54f59cf48497f1c87fd1413134aa3167b2aec3b9c7ea81810323e6ffa1c6e63a9db9b382a7f1fdbf56084b3acbb33c9e
6
+ metadata.gz: 97d56c4b1a59312e6d51ac7ed56d8298d73d04d6ec544b7316b2e8517f4253a266ca5c689399ca0a2033aeb52f6960ee825f2cdf64ec96afda668c75e85618dc
7
+ data.tar.gz: 1ec8abeb5e2053e279289b411a87fdbfd7b8ecd3beb559f8ed378b8b0542deae0806048a7262a884e58cbc1958e9ea14516996fe35c2e5dc358a4c5dc243192c
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- pusher-chameleon (1.2.1)
4
+ pusher-chameleon (0.5.5)
5
5
  sass (>= 3.2.0)
6
6
 
7
7
  GEM
@@ -20,4 +20,4 @@ DEPENDENCIES
20
20
  rake (= 0.9.2.2)
21
21
 
22
22
  BUNDLED WITH
23
- 1.13.6
23
+ 1.11.2
data/docs/Gemfile.lock CHANGED
@@ -67,6 +67,3 @@ DEPENDENCIES
67
67
  octopress-autoprefixer
68
68
  rouge
69
69
  typogruby
70
-
71
- BUNDLED WITH
72
- 1.11.2
@@ -9,7 +9,4 @@
9
9
  <link rel="stylesheet" href="{{ "css/main.css" | prepend: site.assets.baseurl }}">
10
10
  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
11
11
  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
12
-
13
- <script src="https://use.typekit.net/mpu7zkn.js"></script>
14
- <script>try{Typekit.load({ async: true });}catch(e){}</script>
15
12
  </head>
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pusher-chameleon",
3
- "version": "1.2.1",
3
+ "version": "1.3.0",
4
4
  "description": "A collection of front-end patterns used across Pusher.",
5
5
  "repository": "https://github.com/pusher/chameleon",
6
6
  "keywords": [
@@ -9,7 +9,7 @@
9
9
  "living",
10
10
  "styleguide"
11
11
  ],
12
- "author": "Alex Pate",
12
+ "author": "Pusherinos: https://github.com/pusher/chameleon/graphs/contributors",
13
13
  "license": "MIT",
14
14
  "files": [
15
15
  "README.md",
@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
7
7
  s.version = PusherChameleon::VERSION
8
8
  s.summary = 'Pusher Chameleon front-end asset library'
9
9
  s.description = 'Chameleon holds various front-end assets that are shared across our products'
10
- s.authors = ['Alex Pate']
11
- s.email = 'ap@pusher.com'
10
+ s.authors = ['Alex Pate', 'Craig Frost', 'Pusher']
11
+ s.email = 'alex@alexpate.uk'
12
12
  s.homepage = 'https://github.com/pusher/chameleon'
13
13
  s.license = 'MIT'
14
14
 
@@ -30,19 +30,15 @@
30
30
  p,
31
31
  ul li,
32
32
  ol li {
33
- @extend %font-family-secondary;
34
- font-size: rem-calc(16px);
35
- line-height: 1.4em;
36
- font-weight: 400;
33
+ @extend %p;
37
34
  }
38
35
 
39
- .p-boosted,
40
36
  .p-max {
41
- font-size: rem-calc(18px);
37
+ @extend %p-max;
42
38
  }
43
39
 
44
40
  .p-min {
45
- font-size: rem-calc(14px);
41
+ @extend %p-min;
46
42
  }
47
43
 
48
44
  strong {
@@ -57,4 +53,4 @@
57
53
  padding: 4px 4px;
58
54
  border-radius: 3px;
59
55
  }
60
- }
56
+ }
@@ -0,0 +1,76 @@
1
+ @mixin chameleon-typography-inheritance {
2
+ %h1 {
3
+ @extend %font-family-primary;
4
+ font-size: rem-calc(28px);
5
+ font-weight: 400;
6
+ letter-spacing: -1.4px;
7
+ line-height: 1.1em;
8
+
9
+ strong {
10
+ font-weight: 500;
11
+ }
12
+
13
+ @media #{$medium-up} {
14
+ font-size: rem-calc(34px);
15
+ }
16
+ }
17
+
18
+ %h2 {
19
+ @extend %font-family-primary;
20
+ color: $color-black;
21
+ font-size: rem-calc(24px);
22
+ font-weight: 400;
23
+ letter-spacing: -2px;
24
+ line-height: 1.25em;
25
+
26
+ @media #{$medium-up} {
27
+ font-size: rem-calc(28px);
28
+ }
29
+ }
30
+
31
+ %h3 {
32
+ @extend %font-family-primary;
33
+ font-size: rem-calc(22px);
34
+ font-weight: 400;
35
+ line-height: 1.15em;
36
+ }
37
+
38
+ %h4 {
39
+ @extend %font-family-secondary;
40
+ font-size: rem-calc(18px);
41
+ font-weight: 400;
42
+ line-height: 1.4em;
43
+ text-transform: none;
44
+ }
45
+
46
+ %h5 {
47
+ @extend %font-family-primary;
48
+ font-size: rem-calc(16px);
49
+ font-weight: 500;
50
+ line-height: 1.1em;
51
+ }
52
+
53
+ %h6 {
54
+ @extend %font-family-primary;
55
+ color: $color-black;
56
+ font-size: rem-calc(12px);
57
+ font-weight: 700;
58
+ line-height: 1.1em;
59
+ text-transform: uppercase;
60
+ }
61
+
62
+ %p {
63
+ @extend %font-family-secondary;
64
+ font-size: rem-calc(16px);
65
+ font-weight: 400;
66
+ line-height: 1.4em;
67
+ }
68
+
69
+ %p-min {
70
+ font-size: rem-calc(14px);
71
+ }
72
+
73
+ %p-max {
74
+ font-size: rem-calc(18px);
75
+ }
76
+ }
@@ -1,67 +1,25 @@
1
1
  @mixin chameleon-typography-titles {
2
- .title--alpha,
3
- .title--beta,
4
- .title--gamma,
5
- .title--epsilon,
6
- .title--zeta {
7
- @extend %font-family-primary;
8
- }
9
-
10
- .title--delta {
11
- @extend %font-family-secondary;
12
- }
13
-
14
2
  .title--alpha {
15
- font-size: rem-calc(28px);
16
- line-height: 1.1em;
17
- font-weight: 400;
18
- letter-spacing: -1.4px;
19
-
20
- strong {
21
- font-weight: 500;
22
- }
23
-
24
- @media #{$medium-up} {
25
- font-size: rem-calc(34px);
26
- }
3
+ @extend %h1;
27
4
  }
28
5
 
29
6
  .title--beta {
30
- font-size: rem-calc(24px);
31
- line-height: 1.25em;
32
- font-weight: 400;
33
- color: $color-black;
34
- letter-spacing: -2px;
35
-
36
- @media #{$medium-up} {
37
- font-size: rem-calc(28px);
38
- }
7
+ @extend %h2;
39
8
  }
40
9
 
41
10
  .title--gamma {
42
- font-size: rem-calc(22px);
43
- font-weight: 400;
44
- line-height: 1.15em;
11
+ @extend %h3;
45
12
  }
46
13
 
47
14
  .title--delta {
48
- font-size: rem-calc(18px);
49
- font-weight: 400;
50
- line-height: 1.4em;
51
- text-transform: none;
15
+ @extend %h4;
52
16
  }
53
17
 
54
18
  .title--epsilon {
55
- font-size: rem-calc(16px);
56
- font-weight: 500;
57
- line-height: 1.1em;
19
+ @extend %h5;
58
20
  }
59
21
 
60
22
  .title--zeta {
61
- text-transform: uppercase;
62
- font-size: rem-calc(12px);
63
- font-weight: 700;
64
- color: $color-black;
65
- line-height: 1.1em;
23
+ @extend %h6;
66
24
  }
67
- }
25
+ }
@@ -1,16 +1,18 @@
1
1
  @import 'import_realtime';
2
2
  @import 'import_proxima';
3
3
  @import 'base';
4
+ @import 'inheritance';
4
5
  @import 'titles';
5
6
  @import 'helpers';
6
7
  @import 'syntax_highlighting';
7
8
 
8
9
  @mixin CHAMELEON-typography {
9
10
  @include chameleon-typography-base;
11
+ @include chameleon-typography-inheritance;
10
12
  @include chameleon-typography-titles;
11
13
  @include chameleon-typography-helpers;
12
14
  }
13
15
 
14
16
  @mixin CHAMELEON-syntax-highlighting {
15
17
  @include chameleon-typography-syntax-highlighting;
16
- }
18
+ }
metadata CHANGED
@@ -1,14 +1,16 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pusher-chameleon
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alex Pate
8
+ - Craig Frost
9
+ - Pusher
8
10
  autorequire:
9
11
  bindir: bin
10
12
  cert_chain: []
11
- date: 2016-11-02 00:00:00.000000000 Z
13
+ date: 2016-12-13 00:00:00.000000000 Z
12
14
  dependencies:
13
15
  - !ruby/object:Gem::Dependency
14
16
  name: sass
@@ -53,7 +55,7 @@ dependencies:
53
55
  - !ruby/object:Gem::Version
54
56
  version: 0.9.2.2
55
57
  description: Chameleon holds various front-end assets that are shared across our products
56
- email: ap@pusher.com
58
+ email: alex@alexpate.uk
57
59
  executables: []
58
60
  extensions: []
59
61
  extra_rdoc_files: []
@@ -160,6 +162,7 @@ files:
160
162
  - stylesheets/typography/_helpers.scss
161
163
  - stylesheets/typography/_import_proxima.scss
162
164
  - stylesheets/typography/_import_realtime.scss
165
+ - stylesheets/typography/_inheritance.scss
163
166
  - stylesheets/typography/_syntax_highlighting.scss
164
167
  - stylesheets/typography/_syntax_highlighting_dark.scss
165
168
  - stylesheets/typography/_syntax_highlighting_light.scss
@@ -195,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
195
198
  version: '0'
196
199
  requirements: []
197
200
  rubyforge_project:
198
- rubygems_version: 2.6.8
201
+ rubygems_version: 2.4.8
199
202
  signing_key:
200
203
  specification_version: 4
201
204
  summary: Pusher Chameleon front-end asset library