Skip to content

Commit

Permalink
Merge pull request #384 from cwonrails/master
Browse files Browse the repository at this point in the history
Normalize 6.0.0 => 7.0.0
  • Loading branch information
johno committed May 19, 2017
2 parents a791b48 + 4d0247f commit 3b6be69
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 36 deletions.
57 changes: 33 additions & 24 deletions css/tachyons.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! TACHYONS v4.7.2 | http://tachyons.io */
/*! TACHYONS v4.7.3 | http://tachyons.io */
/*
*
* ________ ______
Expand All @@ -22,7 +22,7 @@
*
*/
/* External Library Includes */
/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */
/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
Expand All @@ -33,6 +33,10 @@
html { line-height: 1.15; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers (opinionated).
*/
body { margin: 0; }
/**
* Add the correct display in IE 9-.
*/
Expand Down Expand Up @@ -128,9 +132,10 @@ svg:not(:root) { overflow: hidden; }
/* Forms
========================================================================== */
/**
* Remove the margin in Firefox and Safari.
* 1. Change the font styles in all browsers (opinionated).
* 2. Remove the margin in Firefox and Safari.
*/
button, input, optgroup, select, textarea { margin: 0; }
button, input, optgroup, select, textarea { font-family: sans-serif; /* 1 */ font-size: 100%; /* 1 */ line-height: 1.15; /* 1 */ margin: 0; /* 2 */ }
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
Expand Down Expand Up @@ -158,6 +163,10 @@ button::-moz-focus-inner, [type="button"]::-moz-focus-inner,
*/
button:-moz-focusring, [type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring, [type="submit"]:-moz-focusring { outline: 1px dotted ButtonText; }
/**
* Correct the padding in Firefox.
*/
fieldset { padding: .35em .75em .625em; }
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
Expand Down Expand Up @@ -908,11 +917,11 @@ code, .code { font-family: Consolas, monaco, monospace; }
Docs: http://tachyons.io/docs/elements/links/
*/
.link { text-decoration: none; -webkit-transition: color .15s ease-in; transition: color .15s ease-in; }
.link:link, .link:visited { -webkit-transition: color .15s ease-in; transition: color .15s ease-in; }
.link:hover { -webkit-transition: color .15s ease-in; transition: color .15s ease-in; }
.link:active { -webkit-transition: color .15s ease-in; transition: color .15s ease-in; }
.link:focus { -webkit-transition: color .15s ease-in; transition: color .15s ease-in; outline: 1px dotted currentColor; }
.link { text-decoration: none; transition: color .15s ease-in; }
.link:link, .link:visited { transition: color .15s ease-in; }
.link:hover { transition: color .15s ease-in; }
.link:active { transition: color .15s ease-in; }
.link:focus { transition: color .15s ease-in; outline: 1px dotted currentColor; }
/*
LISTS
Expand Down Expand Up @@ -1867,16 +1876,16 @@ code, .code { font-family: Consolas, monaco, monospace; }
Dim element on hover by adding the dim class.
*/
.dim { opacity: 1; -webkit-transition: opacity .15s ease-in; transition: opacity .15s ease-in; }
.dim:hover, .dim:focus { opacity: .5; -webkit-transition: opacity .15s ease-in; transition: opacity .15s ease-in; }
.dim:active { opacity: .8; -webkit-transition: opacity .15s ease-out; transition: opacity .15s ease-out; }
.dim { opacity: 1; transition: opacity .15s ease-in; }
.dim:hover, .dim:focus { opacity: .5; transition: opacity .15s ease-in; }
.dim:active { opacity: .8; transition: opacity .15s ease-out; }
/*
Animate opacity to 100% on hover by adding the glow class.
*/
.glow { -webkit-transition: opacity .15s ease-in; transition: opacity .15s ease-in; }
.glow:hover, .glow:focus { opacity: 1; -webkit-transition: opacity .15s ease-in; transition: opacity .15s ease-in; }
.glow { transition: opacity .15s ease-in; }
.glow:hover, .glow:focus { opacity: 1; transition: opacity .15s ease-in; }
/*
Hide child & reveal on hover:
Expand All @@ -1891,15 +1900,15 @@ code, .code { font-family: Consolas, monaco, monospace; }
<div class="child"> Hidden until hover or focus </div>
</div>
*/
.hide-child .child { opacity: 0; -webkit-transition: opacity .15s ease-in; transition: opacity .15s ease-in; }
.hide-child:hover .child, .hide-child:focus .child, .hide-child:active .child { opacity: 1; -webkit-transition: opacity .15s ease-in; transition: opacity .15s ease-in; }
.hide-child .child { opacity: 0; transition: opacity .15s ease-in; }
.hide-child:hover .child, .hide-child:focus .child, .hide-child:active .child { opacity: 1; transition: opacity .15s ease-in; }
.underline-hover:hover, .underline-hover:focus { text-decoration: underline; }
/* Can combine this with overflow-hidden to make background images grow on hover
* even if you are using background-size: cover */
.grow { -moz-osx-font-smoothing: grayscale; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-transform: translateZ( 0 ); transform: translateZ( 0 ); -webkit-transition: -webkit-transform .25s ease-out; transition: -webkit-transform .25s ease-out; transition: transform .25s ease-out; transition: transform .25s ease-out, -webkit-transform .25s ease-out; }
.grow { -moz-osx-font-smoothing: grayscale; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-transform: translateZ( 0 ); transform: translateZ( 0 ); transition: -webkit-transform .25s ease-out; transition: transform .25s ease-out; transition: transform .25s ease-out, -webkit-transform .25s ease-out; }
.grow:hover, .grow:focus { -webkit-transform: scale( 1.05 ); transform: scale( 1.05 ); }
.grow:active { -webkit-transform: scale( .90 ); transform: scale( .90 ); }
.grow-large { -moz-osx-font-smoothing: grayscale; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-transform: translateZ( 0 ); transform: translateZ( 0 ); -webkit-transition: -webkit-transform .25s ease-in-out; transition: -webkit-transform .25s ease-in-out; transition: transform .25s ease-in-out; transition: transform .25s ease-in-out, -webkit-transform .25s ease-in-out; }
.grow-large { -moz-osx-font-smoothing: grayscale; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-transform: translateZ( 0 ); transform: translateZ( 0 ); transition: -webkit-transform .25s ease-in-out; transition: transform .25s ease-in-out; transition: transform .25s ease-in-out, -webkit-transform .25s ease-in-out; }
.grow-large:hover, .grow-large:focus { -webkit-transform: scale( 1.2 ); transform: scale( 1.2 ); }
.grow-large:active { -webkit-transform: scale( .95 ); transform: scale( .95 ); }
/* Add pointer on hover */
Expand All @@ -1910,12 +1919,12 @@ code, .code { font-family: Consolas, monaco, monospace; }
Performant box-shadow animation pattern from
http://tobiasahlin.com/blog/how-to-animate-box-shadow/
*/
.shadow-hover { cursor: pointer; position: relative; -webkit-transition: all .5s cubic-bezier( .165, .84, .44, 1 ); transition: all .5s cubic-bezier( .165, .84, .44, 1 ); }
.shadow-hover::after { content: ''; box-shadow: 0 0 16px 2px rgba( 0, 0, 0, .2 ); opacity: 0; position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: -1; -webkit-transition: opacity .5s cubic-bezier( .165, .84, .44, 1 ); transition: opacity .5s cubic-bezier( .165, .84, .44, 1 ); }
.shadow-hover { cursor: pointer; position: relative; transition: all .5s cubic-bezier( .165, .84, .44, 1 ); }
.shadow-hover::after { content: ''; box-shadow: 0 0 16px 2px rgba( 0, 0, 0, .2 ); opacity: 0; position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: -1; transition: opacity .5s cubic-bezier( .165, .84, .44, 1 ); }
.shadow-hover:hover::after, .shadow-hover:focus::after { opacity: 1; }
/* Combine with classes in skins and skins-pseudo for
* many different transition possibilities. */
.bg-animate, .bg-animate:hover, .bg-animate:focus { -webkit-transition: background-color .15s ease-in-out; transition: background-color .15s ease-in-out; }
.bg-animate, .bg-animate:hover, .bg-animate:focus { transition: background-color .15s ease-in-out; }
/*
Z-INDEX
Expand Down Expand Up @@ -1978,9 +1987,9 @@ code, .code { font-family: Consolas, monaco, monospace; }
.nested-copy-indent p+p { text-indent: 1em; margin-top: 0; margin-bottom: 0; }
.nested-copy-seperator p+p { margin-top: 1.5em; }
.nested-img img { width: 100%; max-width: 100%; display: block; }
.nested-links a { color: #357edd; -webkit-transition: color .15s ease-in; transition: color .15s ease-in; }
.nested-links a:hover { color: #96ccff; -webkit-transition: color .15s ease-in; transition: color .15s ease-in; }
.nested-links a:focus { color: #96ccff; -webkit-transition: color .15s ease-in; transition: color .15s ease-in; }
.nested-links a { color: #357edd; transition: color .15s ease-in; }
.nested-links a:hover { color: #96ccff; transition: color .15s ease-in; }
.nested-links a:focus { color: #96ccff; transition: color .15s ease-in; }
/*
STYLES
Expand Down
4 changes: 2 additions & 2 deletions css/tachyons.min.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tachyons",
"version": "4.7.2",
"version": "4.7.3",
"description": "Functional CSS for humans",
"author": "mrmrs",
"style": "css/tachyons.min.css",
Expand All @@ -23,10 +23,10 @@
"devDependencies": {
"copy-files": "^0.1.0",
"immutable-css-cli": "^1.1.1",
"normalize.css": "^6.0.0",
"tachyons-modules": "^1.1.8",
"tachyons-cli": "^1.0.10",
"watch": "^1.0.1"
"normalize.css": "^7.0.0",
"tachyons-modules": "^1.1.10",
"tachyons-cli": "^1.0.11",
"watch": "^1.0.2"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ If you want to check that a class hasn't been redefined or 'mutated' there is a
The tachyons docs located at http://tachyons.io are all open source and located at https://github.com/tachyons-css/tachyons-css.github.io

You can clone the docs and use them as a template for documenting your own design system / patterns / components.
While not everything is automated, the component library generation makes it extremely easy to
While not everything is automated, the component library generation makes it extremely easy to
generate and organize the documentation for components as demonstrated at http://tachyons.io/components


Expand Down
26 changes: 23 additions & 3 deletions src/_normalize.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */
/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */

/* Document
========================================================================== */
Expand All @@ -18,6 +18,14 @@ html {
/* Sections
========================================================================== */

/**
* Remove the margin in all browsers (opinionated).
*/

body {
margin: 0;
}

/**
* Add the correct display in IE 9-.
*/
Expand Down Expand Up @@ -225,15 +233,19 @@ svg:not(:root) {
========================================================================== */

/**
* Remove the margin in Firefox and Safari.
* 1. Change the font styles in all browsers (opinionated).
* 2. Remove the margin in Firefox and Safari.
*/

button,
input,
optgroup,
select,
textarea {
margin: 0;
font-family: sans-serif; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
}

/**
Expand Down Expand Up @@ -292,6 +304,14 @@ button:-moz-focusring,
outline: 1px dotted ButtonText;
}

/**
* Correct the padding in Firefox.
*/

fieldset {
padding: 0.35em 0.75em 0.625em;
}

/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
Expand Down
2 changes: 1 addition & 1 deletion src/tachyons.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! TACHYONS v4.6.1 | http://tachyons.io */
/*! TACHYONS v4.7.3 | http://tachyons.io */

/*
*
Expand Down

0 comments on commit 3b6be69

Please sign in to comment.