From c6e361b7a567a20a10b41c3243d800dc22a9ba16 Mon Sep 17 00:00:00 2001 From: Nikolas Wise Date: Thu, 28 Aug 2014 13:56:50 -0700 Subject: [PATCH 1/5] internalize @font-face declarations, remove need fro html script or link tags for typefaces --- .../calcite-web/type/_type-import.scss | 176 ++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 lib/stylesheets/calcite-web/type/_type-import.scss diff --git a/lib/stylesheets/calcite-web/type/_type-import.scss b/lib/stylesheets/calcite-web/type/_type-import.scss new file mode 100644 index 000000000..eb78e1a63 --- /dev/null +++ b/lib/stylesheets/calcite-web/type/_type-import.scss @@ -0,0 +1,176 @@ +@import url(http://fast.fonts.net/t/1.css?apiType=css&projectid=9431e9a5-7a6d-4b5f-82be-4d935972de5a); + +// ┌───────────┐ +// │ Headers │ +// └───────────┘ + +@font-face { + font-family:"Avenir Next W01_n3"; + src:url("http://fast.fonts.net/dv2/2/0ecef829-586e-426d-a633-4c8a8c926769.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"Avenir Next W01"; + src:url("http://fast.fonts.net/dv2/2/0ecef829-586e-426d-a633-4c8a8c926769.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:300;font-style:normal; +} + +@font-face { + font-family:"Avenir Next W01"; + src:url("http://fast.fonts.net/dv2/2/0ecef829-586e-426d-a633-4c8a8c926769.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/f401df6f-54eb-406c-b46a-90b9451c598d.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/276fe25e-e430-4376-b33c-705dd77b3dba.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/869dc33b-3685-4d74-a51c-82b435579093.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#869dc33b-3685-4d74-a51c-82b435579093") format("svg"); + font-weight:300;font-style:normal; +} + +@font-face { + font-family:"Avenir Next W01_n4"; + src:url("http://fast.fonts.net/dv2/2/e9167238-3b3f-4813-a04a-a384394eed42.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"Avenir Next W01"; + src:url("http://fast.fonts.net/dv2/2/e9167238-3b3f-4813-a04a-a384394eed42.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:400;font-style:normal; +} + +@font-face { + font-family:"Avenir Next W01"; + src:url("http://fast.fonts.net/dv2/2/e9167238-3b3f-4813-a04a-a384394eed42.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/1e9892c0-6927-4412-9874-1b82801ba47a.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/46cf1067-688d-4aab-b0f7-bd942af6efd8.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/52a192b1-bea5-4b48-879f-107f009b666f.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#52a192b1-bea5-4b48-879f-107f009b666f") format("svg"); + font-weight:400;font-style:normal; +} + +@font-face { + font-family:"Avenir Next W01_n7"; + src:url("http://fast.fonts.net/dv2/2/12d643f2-3899-49d5-a85b-ff430f5fad15.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"Avenir Next W01"; + src:url("http://fast.fonts.net/dv2/2/12d643f2-3899-49d5-a85b-ff430f5fad15.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:700;font-style:normal; +} + +@font-face { + font-family:"Avenir Next W01"; + src:url("http://fast.fonts.net/dv2/2/12d643f2-3899-49d5-a85b-ff430f5fad15.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/91b50bbb-9aa1-4d54-9159-ec6f19d14a7c.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/a0f4c2f9-8a42-4786-ad00-fce42b57b148.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/99affa9a-a5e9-4559-bd07-20cf0071852d.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#99affa9a-a5e9-4559-bd07-20cf0071852d") format("svg"); + font-weight:700;font-style:normal; +} + +// ┌───────────┐ +// │ Body │ +// └───────────┘ + +@font-face { + font-family:"Frutiger W01_n4"; + src:url("http://fast.fonts.net/dv2/2/af97a512-f55a-4f61-b2ce-659c883930fc.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"Frutiger W01"; + src:url("http://fast.fonts.net/dv2/2/af97a512-f55a-4f61-b2ce-659c883930fc.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:400;font-style:normal; +} + +@font-face { + font-family:"Frutiger W01"; + src:url("http://fast.fonts.net/dv2/2/af97a512-f55a-4f61-b2ce-659c883930fc.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/3fbbd6b1-cfa7-4ff0-97ea-af1b2c489f15.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/076311f8-a01b-4389-a5eb-334a62e62d45.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/c59a36ab-4ef8-4ee1-a2f8-48aa79d4f877.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#c59a36ab-4ef8-4ee1-a2f8-48aa79d4f877") format("svg"); + font-weight:400;font-style:normal; +} + +@font-face { + font-family:"Frutiger W01_i4"; + src:url("http://fast.fonts.net/dv2/2/fcbab1a3-9659-4b39-8479-cc1f50d18f55.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"Frutiger W01"; + src:url("http://fast.fonts.net/dv2/2/fcbab1a3-9659-4b39-8479-cc1f50d18f55.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:400;font-style:italic; +} + +@font-face { + font-family:"Frutiger W01"; + src:url("http://fast.fonts.net/dv2/2/fcbab1a3-9659-4b39-8479-cc1f50d18f55.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/e2ade8a9-bd48-45e7-95e6-9dc917ba4f74.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/19fe9614-8825-4e7d-b8c3-230d2561e0e2.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/c2f8e3aa-1c1a-49ee-9ec7-30f61a5e96d3.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#c2f8e3aa-1c1a-49ee-9ec7-30f61a5e96d3") format("svg"); + font-weight:400;font-style:italic; +} + +@font-face { + font-family:"Frutiger W01_n7"; + src:url("http://fast.fonts.net/dv2/2/fbd7c0fb-f004-4e83-81d2-1d400413a873.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"Frutiger W01"; + src:url("http://fast.fonts.net/dv2/2/fbd7c0fb-f004-4e83-81d2-1d400413a873.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:700;font-style:normal; +} + +@font-face { + font-family:"Frutiger W01"; + src:url("http://fast.fonts.net/dv2/2/fbd7c0fb-f004-4e83-81d2-1d400413a873.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/9aa32a81-1124-4c43-b3db-15bfb1f7aed2.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/6faffbf4-f8e8-4817-b24b-a390e166be7e.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/fc09de64-de25-425e-90dc-a0cae29b02c4.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#fc09de64-de25-425e-90dc-a0cae29b02c4") format("svg"); + font-weight:700;font-style:normal; +} + +// ┌───────────┐ +// │ Secondary │ +// └───────────┘ + +@font-face { + font-family:"ITC Charter W01_R4"; + src:url("http://fast.fonts.net/dv2/2/bd4a6c95-033c-41f0-9510-2de2be19ebc6.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"ITC Charter W01"; + src:url("http://fast.fonts.net/dv2/2/bd4a6c95-033c-41f0-9510-2de2be19ebc6.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:400;font-style:Regular; +} + +@font-face { + font-family:"ITC Charter W01"; + src:url("http://fast.fonts.net/dv2/2/bd4a6c95-033c-41f0-9510-2de2be19ebc6.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/fcf607e0-9726-46de-99a0-3d80440fcad0.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/3a077c2d-60d8-4c1e-947f-64cd5c57b382.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/da20fd94-cdae-454e-a5d9-e1790eeaf24b.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#da20fd94-cdae-454e-a5d9-e1790eeaf24b") format("svg"); + font-weight:400;font-style:Regular; +} + +@font-face { + font-family:"ITC Charter W01_I4"; + src:url("http://fast.fonts.net/dv2/2/ba84e803-3903-4d83-bec4-16b23ae8ad1d.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"ITC Charter W01"; + src:url("http://fast.fonts.net/dv2/2/ba84e803-3903-4d83-bec4-16b23ae8ad1d.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:400;font-style:Italic; +} + +@font-face { + font-family:"ITC Charter W01"; + src:url("http://fast.fonts.net/dv2/2/ba84e803-3903-4d83-bec4-16b23ae8ad1d.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/c17e88a4-2bac-4c58-8aea-2345de107ef7.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/67daed65-8aec-4c77-9664-ca53f35c3734.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/c46a8071-15d2-4934-89bc-7e0db806414d.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#c46a8071-15d2-4934-89bc-7e0db806414d") format("svg"); + font-weight:400;font-style:Italic; +} + +@font-face { + font-family:"ITC Charter W01_B7"; + src:url("http://fast.fonts.net/dv2/2/65803b4f-d9d0-4ddb-a9a5-9ab6ee15827e.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); +} + +@font-face { + font-family:"ITC Charter W01"; + src:url("http://fast.fonts.net/dv2/2/65803b4f-d9d0-4ddb-a9a5-9ab6ee15827e.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("eot"); + font-weight:700;font-style:Bold; +} + +@font-face { + font-family:"ITC Charter W01"; + src:url("http://fast.fonts.net/dv2/2/65803b4f-d9d0-4ddb-a9a5-9ab6ee15827e.eot?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a"); + src:url("http://fast.fonts.net/dv2/3/10deb463-297b-4976-8a13-f9a98d7ea6de.woff?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("woff"),url("http://fast.fonts.net/dv2/1/143c464c-244f-4c8e-a5f2-c28f78f092fc.ttf?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a") format("truetype"),url("http://fast.fonts.net/dv2/11/2214883f-2c66-4e68-9fc8-3641bd9200ca.svg?d44f19a684109620e484147ea690e818ee8d0f94c8efc5f31894b34456dd6eba45b7199fe6a76b3f16243440c93c58e473c2b02ad5244cba2c4f7ba3b91d2e05b3bce074c230ba&projectId=9431e9a5-7a6d-4b5f-82be-4d935972de5a#2214883f-2c66-4e68-9fc8-3641bd9200ca") format("svg"); + font-weight:700;font-style:Bold; +} + From 162c40a7af0604eab830aa2c19302a10f6ed06b6 Mon Sep 17 00:00:00 2001 From: Nikolas Wise Date: Thu, 28 Aug 2014 13:57:40 -0700 Subject: [PATCH 2/5] add calacite web type family declarations to config --- lib/stylesheets/calcite-web/base/_config.scss | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/stylesheets/calcite-web/base/_config.scss b/lib/stylesheets/calcite-web/base/_config.scss index e32029101..bc6bdc94b 100644 --- a/lib/stylesheets/calcite-web/base/_config.scss +++ b/lib/stylesheets/calcite-web/base/_config.scss @@ -74,21 +74,17 @@ $baseline: 1.5rem !default; $indent: 1em !default; // Font Families -$header-family: 'Avenir Next W01', 'Avenir Next', 'Avenir', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif !default; -$body-family: 'Frutiger W01', "Lucida Grande", "Segoe UI", "Arial", sans-serif !default; -$secondary-family: 'Kepler W08 Caption', Georgia, serif !default; -$code-family: "Consolas", "Andale Mono", "Lucida Console", "Monaco", "Courier New", Courier, monospace !default; - - // Header Weights $header-tracking: 0 !default; -$header-family: 'Helvetica Neue', +$header-family: 'Avenir Next W01', + 'Avenir Next', + 'Avenir', + 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif !default; -$header-thin: false !default; $header-thin: false !default; $header-light: 300, 400 !default; $header-regular: 400, 600 !default; @@ -99,12 +95,12 @@ $header-black: false !default; // Body Weights $body-tracking: 30 !default; -$body-family: "Lucida Grande", +$body-family: 'Frutiger W01', + "Lucida Grande", "Segoe UI", "Arial", sans-serif !default; -$body-thin: false !default; $body-thin: false !default; $body-light: false !default; $body-regular: 400, 700 !default; @@ -115,10 +111,10 @@ $body-black: false !default; // Secondary Weights $secondary-tracking: 10 !default; -$secondary-family: Georgia, +$secondary-family: 'ITC Charter W01', + Georgia, serif !default; -$secondary-thin: false !default; $secondary-thin: false !default; $secondary-light: false !default; $secondary-regular: 400, 700 !default; @@ -137,7 +133,6 @@ $code-family: "Consolas", Courier, monospace !default; -$code-thin: false !default; $code-thin: false !default; $code-light: false !default; $code-regular: 400, 400 !default; From d2c43a9264521d26f45c52e0f80eeb0b83f4cb64 Mon Sep 17 00:00:00 2001 From: Nikolas Wise Date: Thu, 28 Aug 2014 13:58:13 -0700 Subject: [PATCH 3/5] && not working properly, temp using nested @ifs --- lib/stylesheets/calcite-web/type/_type-styles.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/stylesheets/calcite-web/type/_type-styles.scss b/lib/stylesheets/calcite-web/type/_type-styles.scss index 1ee490b82..787b61fee 100644 --- a/lib/stylesheets/calcite-web/type/_type-styles.scss +++ b/lib/stylesheets/calcite-web/type/_type-styles.scss @@ -1,7 +1,8 @@ // ┌────────────────┐ // │ Default Styles │ // └────────────────┘ -@if $include-type == true && $include-type-defaults == true { +@if $include-type == true { +@if $include-type-defaults == true { html { font-size: 18px; } @@ -122,4 +123,5 @@ mark { padding: 0 0.1em 0.1em; } +} } \ No newline at end of file From 8bf64237655eaf8543e5e3c3131542f95e5a9cdd Mon Sep 17 00:00:00 2001 From: Nikolas Wise Date: Thu, 28 Aug 2014 13:58:49 -0700 Subject: [PATCH 4/5] typecabinet importing all the things --- lib/stylesheets/calcite-web/type/type-cabinet.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/stylesheets/calcite-web/type/type-cabinet.scss b/lib/stylesheets/calcite-web/type/type-cabinet.scss index bacd3776c..b85434078 100644 --- a/lib/stylesheets/calcite-web/type/type-cabinet.scss +++ b/lib/stylesheets/calcite-web/type/type-cabinet.scss @@ -6,6 +6,7 @@ // //Styleguide 1.x +@import 'type-import'; @import 'type-unicode-variables'; @import 'typesetting-mixins'; @import 'type-faces'; From 664b68bac99ad4522cbecf41107ec2919c473536 Mon Sep 17 00:00:00 2001 From: Nikolas Wise Date: Thu, 28 Aug 2014 14:03:23 -0700 Subject: [PATCH 5/5] fix that conditional, and not && --- lib/stylesheets/calcite-web/type/_type-styles.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/stylesheets/calcite-web/type/_type-styles.scss b/lib/stylesheets/calcite-web/type/_type-styles.scss index 787b61fee..4ea61976f 100644 --- a/lib/stylesheets/calcite-web/type/_type-styles.scss +++ b/lib/stylesheets/calcite-web/type/_type-styles.scss @@ -1,8 +1,7 @@ // ┌────────────────┐ // │ Default Styles │ // └────────────────┘ -@if $include-type == true { -@if $include-type-defaults == true { +@if $include-type == true and $include-type-defaults == true { html { font-size: 18px; } @@ -124,4 +123,3 @@ padding: 0 0.1em 0.1em; } } -} \ No newline at end of file