pusher-chameleon 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89eb1c555932c7bb562e706156080e1d10b74d03
-  data.tar.gz: c7d4059c992b55504249277bd7454358ffb4d977
+  metadata.gz: 17854956fbb26884b5f003e61acf64530a732791
+  data.tar.gz: 1a9f6f900e891506192ac2def8f913bd6ef8b7e8
 SHA512:
-  metadata.gz: b8aa62d956fe327c4d69272b638cc349bacffe83e19d72c6a897b4ca32167acc381c381c1141002b60a8964ab419f55d283f4ab4c5b91aa74d362df30f001c54
-  data.tar.gz: e7f602e88ab4c900d9fee04f553ccbabc052c538dfbb8eed062736814a1d370186ec81a95a90a7127badc29329d896f775e65ebfa5da96a13d3ad581aba46393
+  metadata.gz: 99daac5953834ab58e94d5f895bf408d2733c120027ecb8d89fb3b148c09f8d6c90680f1f4ee7fc4552a0e81fa513cb6fb73e50525b321724e64466846410221
+  data.tar.gz: 032c1d68c58b09646bbaac84bd65604d5219e36715804e95d8e61ebaae7f4bdb0d9845c376df6d27e1c79a4b180f9ac488d5c4715b4d505b8a17cb867737e3d3

data/README.md

@@ -1,6 +1,5 @@
 ![Pusher Chameleon logo](https://raw.githubusercontent.com/pusher/chameleon/master/logo.png)
 
-
 # Pusher Chameleon
 
 [![npm version](https://badge.fury.io/js/pusher-chameleon.svg)](https://badge.fury.io/js/pusher-chameleon) [![Gem Version](https://badge.fury.io/rb/pusher-chameleon.svg)](https://badge.fury.io/rb/pusher-chameleon)
@@ -11,7 +10,7 @@ Chameleon is a library of front-end assets that can be used across Pusher. The g
 
 Chameleon can currently be imported as both a node module, and a ruby gem. Then, import the base chameleon stylesheet in to your project. This includes all of the functions, variables, and mixins that are required:
 
-```sass
+```scss
 // For a node project
 @import "~pusher-chameleon/stylesheets/chameleon.scss";
 
@@ -21,13 +20,12 @@ Chameleon can currently be imported as both a node module, and a ruby gem. Then,
 
 You can pick and choose which components you require, so these will need to be explicitly included:
 
-```sass
+```scss
 @include CHAMELEON-grid;
 @include CHAMELEON-typography;
 ...
 ```
 
-
 ## Publishing a new version
 
 Follow these steps to publish a new version of Chameleon:
@@ -38,6 +36,9 @@ Follow these steps to publish a new version of Chameleon:
 
 This rake task will publish a new version of Chameleon to the npm registry, push to RubyGems, and build a new version of the docs.
 
+## Fonts
+Our fonts are hosted on a CDN (see [global.scss](stylesheets/_global.scss)). If you're adding Chameleon in to a new project that sits on a new domain, then this will need to be added to the CORS config in the AWS S3 bucket.
+
 ## Documentation
 
 [Read the Docs](https://pusher.github.io/chameleon)

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pusher-chameleon",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A collection of front-end patterns used across Pusher.",
   "repository": "https://github.com/pusher/chameleon",
   "keywords": [

data/stylesheets/_global.scss

@@ -75,7 +75,7 @@ $global-font-size: 100% !default;
 $global-font-smoothing: false !default;
 
 $font-family-primary: 'pusher-realtime-text', Helmet, Freesans, sans-serif !default;
-$font-family-secondary: 'proxima-nova', Helmet, Freesans, sans-serif !default;
+$font-family-secondary: 'pusher-proxima-nova', Helmet, Freesans, sans-serif !default;
 $font-family-monospace: Menlo, Consolas, Monaco, 'Andale Mono', monospace !default;
 
 $syntax-highlighting-style: 'light' !default;

data/stylesheets/typography/_import_proxima.scss

@@ -0,0 +1,57 @@
+@font-face {
+  font-family: 'pusher-proxima-nova';
+  font-weight: 700;
+  src: url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-bold.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-bold.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-bold.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'pusher-proxima-nova';
+  font-weight: 600;
+  src: url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-semibold.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-semibold.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-semibold.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'pusher-proxima-nova';
+  font-weight: 500;
+  src: url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-medium.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-medium.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-medium.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'pusher-proxima-nova';
+  font-weight: 400;
+  font-style: italic;
+  src: url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-regular-italic.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-regular-italic.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-regular-italic.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'pusher-proxima-nova';
+  font-weight: 400;
+  src: url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-regular.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-regular.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-regular.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'pusher-proxima-nova';
+  font-weight: 300;
+  src: url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-light.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-light.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-light.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'pusher-proxima-nova';
+  font-weight: 300;
+  font-style: italic;
+  src: url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-light-italic.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-light-italic.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/proxima-nova/proxima-nova-light-italic.ttf') format('truetype');
+}

data/stylesheets/typography/_import_realtime.scss

@@ -0,0 +1,44 @@
+// Realtime Text Light
+@font-face {
+  font-family: 'pusher-realtime-text';
+  font-weight: 300;
+  src: url('#{$cdn-font-url}/fonts/realtime-text/light.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/realtime-text/light.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/realtime-text/light.ttf') format('truetype');
+}
+
+// Realtime Text Regular
+@font-face {
+  font-family: 'pusher-realtime-text';
+  font-weight: 400;
+  src: url('#{$cdn-font-url}/fonts/realtime-text/regular.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/realtime-text/regular.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/realtime-text/regular.ttf') format('truetype');
+}
+
+// Realtime Text Semibold
+@font-face {
+  font-family: 'pusher-realtime-text';
+  font-weight: 500;
+  src: url('#{$cdn-font-url}/fonts/realtime-text/semibold.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/realtime-text/semibold.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/realtime-text/semibold.ttf') format('truetype');
+}
+
+// Realtime Text Bold
+@font-face {
+  font-family: 'pusher-realtime-text';
+  font-weight: 600;
+  src: url('#{$cdn-font-url}/fonts/realtime-text/bold.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/realtime-text/bold.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/realtime-text/bold.ttf') format('truetype');
+}
+
+// Realtime Text Black
+@font-face {
+  font-family: 'pusher-realtime-text';
+  font-weight: 700;
+  src: url('#{$cdn-font-url}/fonts/realtime-text/black.woff2') format('woff2'),
+       url('#{$cdn-font-url}/fonts/realtime-text/black.woff') format('woff'),
+       url('#{$cdn-font-url}/fonts/realtime-text/black.ttf') format('truetype');
+}

data/stylesheets/typography/_titles.scss

@@ -45,7 +45,6 @@
   }
 
   .title--delta {
-    @extend %font-family-secondary;
     font-size: rem-calc(18px);
     font-weight: 400;
     line-height: 1.4em;
@@ -53,7 +52,6 @@
   }
 
   .title--epsilon {
-    @extend %font-family-primary;
     font-size: rem-calc(16px);
     font-weight: 500;
     line-height: 1.1em;

data/stylesheets/typography/_typography.scss

@@ -1,4 +1,5 @@
-@import 'import';
+@import 'import_realtime';
+@import 'import_proxima';
 @import 'base';
 @import 'titles';
 @import 'helpers';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-chameleon
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alex Pate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -158,7 +158,8 @@ files:
 - stylesheets/grid/_size.scss
 - stylesheets/typography/_base.scss
 - stylesheets/typography/_helpers.scss
-- stylesheets/typography/_import.scss
+- stylesheets/typography/_import_proxima.scss
+- stylesheets/typography/_import_realtime.scss
 - stylesheets/typography/_syntax_highlighting.scss
 - stylesheets/typography/_syntax_highlighting_dark.scss
 - stylesheets/typography/_syntax_highlighting_light.scss

data/stylesheets/typography/_import.scss

@@ -1,54 +0,0 @@
-// Realtime Text Light
-@font-face {
-  font-family: 'pusher-realtime-text';
-  font-weight: 300;
-  src: url('#{$cdn-font-url}/fonts/realtime_text_light.eot');
-  src: url('#{$cdn-font-url}/fonts/realtime_text_light.woff2') format('woff2'),
-       url('#{$cdn-font-url}/fonts/realtime_text_light.woff') format('woff'),
-       url('#{$cdn-font-url}/fonts/realtime_text_light.ttf') format('truetype'),
-       url('#{$cdn-font-url}/fonts/realtime_text_light.eot?#iefix') format('embedded-opentype');
-}
-
-// Realtime Text Regular
-@font-face {
-  font-family: 'pusher-realtime-text';
-  font-weight: 400;
-  src: url('#{$cdn-font-url}/fonts/realtime_text_regular.eot');
-  src: url('#{$cdn-font-url}/fonts/realtime_text_regular.woff2') format('woff2'),
-       url('#{$cdn-font-url}/fonts/realtime_text_regular.woff') format('woff'),
-       url('#{$cdn-font-url}/fonts/realtime_text_regular.ttf') format('truetype'),
-       url('#{$cdn-font-url}/fonts/realtime_text_regular.eot?#iefix') format('embedded-opentype');
-}
-
-// Realtime Text Semibold
-@font-face {
-  font-family: 'pusher-realtime-text';
-  font-weight: 500;
-  src: url('#{$cdn-font-url}/fonts/realtime_text_semibold.eot');
-  src: url('#{$cdn-font-url}/fonts/realtime_text_semibold.woff2') format('woff2'),
-       url('#{$cdn-font-url}/fonts/realtime_text_semibold.woff') format('woff'),
-       url('#{$cdn-font-url}/fonts/realtime_text_semibold.ttf') format('truetype'),
-       url('#{$cdn-font-url}/fonts/realtime_text_semibold.eot?#iefix') format('embedded-opentype');
-}
-
-// Realtime Text Bold
-@font-face {
-  font-family: 'pusher-realtime-text';
-  font-weight: 600;
-  src: url('#{$cdn-font-url}/fonts/realtime_text_bold.eot');
-  src: url('#{$cdn-font-url}/fonts/realtime_text_bold.woff2') format('woff2'),
-       url('#{$cdn-font-url}/fonts/realtime_text_bold.woff') format('woff'),
-       url('#{$cdn-font-url}/fonts/realtime_text_bold.ttf') format('truetype'),
-       url('#{$cdn-font-url}/fonts/realtime_text_bold.eot?#iefix') format('embedded-opentype');
-}
-
-// Realtime Text Black
-@font-face {
-  font-family: 'pusher-realtime-text';
-  font-weight: 700;
-  src: url('#{$cdn-font-url}/fonts/realtime_text_black.eot');
-  src: url('#{$cdn-font-url}/fonts/realtime_text_black.woff2') format('woff2'),
-       url('#{$cdn-font-url}/fonts/realtime_text_black.woff') format('woff'),
-       url('#{$cdn-font-url}/fonts/realtime_text_black.ttf') format('truetype'),
-       url('#{$cdn-font-url}/fonts/realtime_text_black.eot?#iefix') format('embedded-opentype');
-}