Permalink
Browse files

Matching CSS Port. Updates Changelog to Reflect.

  • Loading branch information...
grayghostvisuals committed Jul 12, 2014
1 parent a59501e commit 573ca262c0ac5936810b4570024b618da81e9154
Showing with 70 additions and 33 deletions.
  1. +13 −0 CHANGELOG.md
  2. +34 −16 css/typeplate.css
  3. +21 −15 scss/_typeplate.scss
  4. +2 −2 scss/_vars-typeplate.scss
View
@@ -1,3 +1,16 @@
+**Sass & CSS v2.0.0:**
+
+ date: 2014-07-12
+
+ changes:
+
+ - Issue 16: Namespacing. Helps to avoid collisions w/other libs and frameworks.
+ - Vendor Prefix Sass Loop for OpenType @mixins
+ - Updates CSS port to match Sass v2.0.0 port
+ - Removes Obsolete HTML Tags for Hyphens
+
+-------
+
**Sass & CSS v1.1.4:**
date: 2014-05-19
View
@@ -1,7 +1,7 @@
/*!
TYPEPLATE
URL ........... http://typeplate.com
-VERSION ....... 1.1.4
+VERSION ....... 2.0.0
Github ........ https://github.com/typeplate/bower
AUTHORS ....... Dennis Gaebel (@gryghostvisuals) & Zachary Kain (@zakkain)
LICENSE ....... Creative Commmons Attribution 3.0 (http://creativecommons.org/licenses/by/3.0)
@@ -64,6 +64,28 @@ LICENSE URL ... https://github.com/typeplate/bower/blob/master/license.txt
}
+/**
+ *
+ * =======================================================================
+ OpenType
+ * =======================================================================
+ */
+
+.font-feature--smcp {
+ -webkit-font-feature-settings: "smcp";
+ -moz-font-feature-settings: "smcp";
+ -ms-font-feature-settings: "smcp";
+ font-feature-settings: "smcp";
+}
+
+.font-feature--onum {
+ -webkit-font-feature-settings: 'onum';
+ -moz-font-feature-settings: 'onum';
+ -ms-font-feature-settings: 'onum';
+ font-feature-settings: 'onum';
+}
+
+
/**
*
* =======================================================================
@@ -77,7 +99,7 @@ LICENSE URL ... https://github.com/typeplate/bower/blob/master/license.txt
.drop-cap:first-letter {
float: left;
- margin: auto .25em auto auto;
+ margin: inherit;
padding: inherit;
font-size: 4em;
font-family: inherit;
@@ -109,7 +131,6 @@ body {
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
- -o-hyphens: auto;
hyphens: auto;
word-wrap: break-word;
color: #444444;
@@ -270,21 +291,15 @@ abbr,
acronym,
blockquote,
code,
-dir,
kbd,
-listing,
-plaintext,
q,
samp,
-tt,
-var,
-xmp {
+var {
/* Accepted values: [ none | manual | auto ] */ /* http://meyerweb.com/eric/thoughts/2012/12/17/where-to-avoid-css-hyphenation */
- -webkit-hyphens: none; /* Safari 5.1 thru 6, iOS 4.2 thru 6 */
- -moz-hyphens: none; /* Firefox 16 thru 20 */
- -ms-hyphens: none; /* IE10 */
- -o-hyphens: none; /* PRESTO...haha LOL */
- hyphens: none; /* W3C standard */
+ -webkit-hyphens: none;
+ -moz-hyphens: none;
+ -ms-hyphens: none;
+ hyphens: none;
}
@@ -298,7 +313,7 @@ xmp {
pre code {
word-wrap: normal;
white-space: -moz-pre-wrap;
- white-space: pre-wrap; /* http://css-tricks.com/almanac/properties/w/whitespace */
+ white-space: pre-wrap;
}
pre {
@@ -324,10 +339,13 @@ code {
*/
abbr {
+ -webkit-font-variant: small-caps;
+ -moz-font-variant: small-caps;
+ -ms-font-variant: small-caps;
font-variant: small-caps; /* https://developer.mozilla.org/en-US/docs/CSS/font-variant */
font-weight: 600;
text-transform: lowercase;
- color: #808080;
+ color: gray;
}
abbr[title]:hover {
View
@@ -20,7 +20,7 @@ LICENSE URL ... https://github.com/typeplate/bower/blob/master/license.txt
// -------------------------------------//
$typl8-serif-boolean: true !default; // can be redeclared from another stylesheet post @import "typeplate.scss"
-$typl8-custom-font-family: false !default; // ex.) $typl8-custom-font-family: "Custom-Font-Name", serif;
+$typl8-custom-font: false !default; // ex.) $typl8-custom-font: "Custom-Font-Name", serif;
$typl8-font-family: if($typl8-serif-boolean, serif, sans-serif) !default; // non-font-face stack
$typl8-font-weight: normal !default;
$typl8-line-height: 1.65 !default;
@@ -88,7 +88,7 @@ $typl8-zeta: 18 !default; // 18 = 18 × 1
// $Typescale-Unit
// -------------------------------------//
-$typl8-type-scale-unit-value: rem !default;
+$typl8-typescale-unit: rem !default;
// $Pull-Quotes
@@ -492,8 +492,6 @@ $typl8-dropcap-bg: transparent !default;
}
-
-
// $Wordwrap
// -------------------------------------//
@@ -523,13 +521,13 @@ $typl8-dropcap-bg: transparent !default;
// @extend %font-feature-smcp;
// }
-%font-feature-smcp {
+%font-feature--smcp {
@each $prefix in $typl8-prefixes {
#{$prefix}font-feature-settings: "smcp";
}
}
-%text-figures {
+%font-feature--onum {
@each $prefix in $typl8-prefixes {
#{$prefix}font-feature-settings: 'onum';
}
@@ -547,8 +545,8 @@ $typl8-dropcap-bg: transparent !default;
// -------------------------------------//
html {
- @if $typl8-custom-font-family {
- font: $typl8-font-weight #{$typl8-font-size + "%"}/#{$typl8-line-height} $typl8-custom-font-family, $typl8-font-family;
+ @if $typl8-custom-font {
+ font: $typl8-font-weight #{$typl8-font-size + "%"}/#{$typl8-line-height} $typl8-custom-font, $typl8-font-family;
} @else {
font: $typl8-font-weight #{$typl8-font-size + "%"}/#{$typl8-line-height} $typl8-font-family;
}
@@ -587,15 +585,23 @@ small {
// Multi-dimensional array, where:
// the first value is the name of the class.
// The second value is the variable for size.
-$sizes: tera $typl8-tera, giga $typl8-giga, mega $typl8-mega, alpha $typl8-alpha, beta $typl8-beta, gamma $typl8-gamma, delta $typl8-delta, epsilon $typl8-epsilon, zeta $typl8-zeta;
+$sizes: tera $typl8-tera,
+ giga $typl8-giga,
+ mega $typl8-mega,
+ alpha $typl8-alpha,
+ beta $typl8-beta,
+ gamma $typl8-gamma,
+ delta $typl8-delta,
+ epsilon $typl8-epsilon,
+ zeta $typl8-zeta;
// @notes:
// Sass loop to associate h1-h6 tags with their appropriate greek
// heading based on a modular scale. for each size in the scale,
// create a class name.
@each $size in $sizes {
.#{nth($size, 1)} {
- @include type-scale(nth($size, 2), $typl8-font-base, '#{$typl8-type-scale-unit-value}', $typl8-measure);
+ @include type-scale(nth($size, 2), $typl8-font-base, '#{$typl8-typescale-unit}', $typl8-measure);
}
}
@@ -664,13 +670,13 @@ var {
// $Codeblocks
// -------------------------------------//
-pre code {
- @extend %normal-wrap;
- @include white-space(pre-wrap);
-}
-
pre {
@include white-space(pre);
+
+ code {
+ @extend %normal-wrap;
+ @include white-space(pre-wrap);
+ }
}
code {
@@ -7,7 +7,7 @@
// -------------------------------------//
$typl8-serif-boolean: true; // can be redeclared from another stylesheet post @import "typeplate.scss"
-$typl8-custom-font-family: false; // ex.) $typl8-custom-font-family: "Custom-Font-Name", serif;
+$typl8-custom-font: false; // ex.) $typl8-custom-font: "Custom-Font-Name", serif;
$typl8-font-family: if($typl8-serif-boolean, serif, sans-serif); // non-font-face stack
$typl8-font-weight: normal;
$typl8-line-height: 1.65;
@@ -75,7 +75,7 @@ $typl8-zeta: 18; // 18 = 18 × 1
// $Typescale-Unit
// -------------------------------------//
-$typl8-type-scale-unit-value: rem;
+$typl8-typescale-unit: rem;
// $Pull-Quotes

0 comments on commit 573ca26

Please sign in to comment.