Skip to content

Commit

Permalink
Merge pull request #201 from cferdinandi/development
Browse files Browse the repository at this point in the history
v5.6.0
  • Loading branch information
cferdinandi committed Feb 1, 2015
2 parents cea8fb3 + 7afe573 commit 696e642
Show file tree
Hide file tree
Showing 16 changed files with 79 additions and 149 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ Kraken is free to use under the [MIT License](http://gomakethings.com/mit/).

Kraken uses [semantic versioning](http://semver.org/).

* v5.6.0 - January 31, 2014
* Remove opacity `filter` from `a:hover img` property. IE9+ support `opacity` so it's been deprecated.
* Changed the `display` property on `.list-inline > li` from `inline-block` to `inline`.
* v5.5.0 - January 7, 2014
* Removed `:visited` and `:active` link styling to prevent specificity issues.
* v5.4.0 - January 7, 2014
Expand Down
66 changes: 0 additions & 66 deletions _config.scss

This file was deleted.

65 changes: 31 additions & 34 deletions dist/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Kraken v5.4.0
* Kraken v5.6.0
* A lightweight front-end boilerplate, by Chris Ferdinandi.
* http://github.com/cferdinandi/kraken
*
Expand Down Expand Up @@ -411,22 +411,20 @@ p {
* Hyperlink styling
*/
/* line 33, ../components/_typography.scss */
a,
a:visited {
a {
color: #0088cc;
text-decoration: none;
word-wrap: break-word;
}

/* line 40, ../components/_typography.scss */
/* line 39, ../components/_typography.scss */
a:hover,
a:focus,
a:active {
a:focus {
color: #005580;
text-decoration: underline;
}

/* line 47, ../components/_typography.scss */
/* line 45, ../components/_typography.scss */
a img {
border: none;
background: none;
Expand All @@ -436,39 +434,38 @@ a img {
* Prevents border/background on linked image hover.
* Adds slight opacity.
*/
/* line 56, ../components/_typography.scss */
/* line 54, ../components/_typography.scss */
a:hover img {
border: none;
background: none;
opacity: 0.8;
filter: alpha(opacity=80);
}

/**
* List styling
*/
/* line 68, ../components/_typography.scss */
/* line 65, ../components/_typography.scss */
ul,
ol,
dl {
margin-bottom: 1.5625em;
margin-left: 2em;
}

/* line 75, ../components/_typography.scss */
/* line 72, ../components/_typography.scss */
ul ul,
ul ol,
ol ol,
ol ul {
margin-bottom: 0;
}

/* line 82, ../components/_typography.scss */
/* line 79, ../components/_typography.scss */
dl {
margin-left: 0;
}

/* line 86, ../components/_typography.scss */
/* line 83, ../components/_typography.scss */
dt {
font-weight: bold;
}
Expand All @@ -477,7 +474,7 @@ dt {
* Removes list styling.
* For semantic reasons, should only be used on unordered lists.
*/
/* line 94, ../components/_typography.scss */
/* line 91, ../components/_typography.scss */
.list-unstyled {
margin-left: 0;
list-style: none;
Expand All @@ -486,17 +483,17 @@ dt {
/**
* Display lists on a single line.
*/
/* line 103, ../components/_typography.scss */
/* line 100, ../components/_typography.scss */
.list-inline {
list-style: none;
margin-left: -0.5em;
margin-right: -0.5em;
padding: 0;
}

/* line 110, ../components/_typography.scss */
/* line 107, ../components/_typography.scss */
.list-inline > li {
display: inline-block;
display: inline;
margin-left: 0.5em;
margin-right: 0.5em;
}
Expand All @@ -505,7 +502,7 @@ dt {
* Heading styling for h1 through h6 elements.
* Heading class lets you use one heading type for semantics, but style it as another heading type.
*/
/* line 122, ../components/_typography.scss */
/* line 119, ../components/_typography.scss */
h1, h2, h3, h4, h5, h6 {
line-height: 1.2;
font-weight: normal;
Expand All @@ -514,39 +511,39 @@ h1, h2, h3, h4, h5, h6 {
word-wrap: break-word;
}

/* line 130, ../components/_typography.scss */
/* line 127, ../components/_typography.scss */
h1,
.h1 {
font-size: 1.5em;
padding-top: .5em;
}
@media (min-width: 40em) {
/* line 130, ../components/_typography.scss */
/* line 127, ../components/_typography.scss */
h1,
.h1 {
font-size: 1.75em;
}
}

/* line 140, ../components/_typography.scss */
/* line 137, ../components/_typography.scss */
h2,
.h2 {
font-size: 1.3125em;
}

/* line 145, ../components/_typography.scss */
/* line 142, ../components/_typography.scss */
h3,
.h3 {
font-size: 1.1875em;
}

/* line 150, ../components/_typography.scss */
/* line 147, ../components/_typography.scss */
h4, h5, h6,
.h4, .h5, .h6 {
font-size: 1em;
}

/* line 155, ../components/_typography.scss */
/* line 152, ../components/_typography.scss */
h4,
.h4 {
text-transform: uppercase;
Expand All @@ -555,25 +552,25 @@ h4,
/**
* Lines, Quotes and Emphasis
*/
/* line 165, ../components/_typography.scss */
/* line 162, ../components/_typography.scss */
hr {
margin: 2em auto;
border: 0;
border-top: 0.0725em solid #e5e5e5;
border-bottom: 0 solid #ffffff;
}

/* line 172, ../components/_typography.scss */
/* line 169, ../components/_typography.scss */
strong {
font-weight: bold;
}

/* line 176, ../components/_typography.scss */
/* line 173, ../components/_typography.scss */
em {
font-style: italic;
}

/* line 180, ../components/_typography.scss */
/* line 177, ../components/_typography.scss */
sub,
sup {
position: relative;
Expand All @@ -584,20 +581,20 @@ sup {
margin-left: 0.25em;
}

/* line 190, ../components/_typography.scss */
/* line 187, ../components/_typography.scss */
sup {
top: -0.5em;
}

/* line 194, ../components/_typography.scss */
/* line 191, ../components/_typography.scss */
sub {
bottom: -0.25em;
}

/**
* Highlighting colors
*/
/* line 201, ../components/_typography.scss */
/* line 198, ../components/_typography.scss */
::-moz-selection {
color: #ffffff;
background: #0088cc;
Expand All @@ -610,20 +607,20 @@ sub {
/**
* Blockquotes
*/
/* line 210, ../components/_typography.scss */
/* line 207, ../components/_typography.scss */
blockquote {
border-left: 0.25em solid #e5e5e5;
margin-bottom: 1.5625em;
padding-left: 1.5625em;
padding-right: 1.5625em;
}

/* line 217, ../components/_typography.scss */
/* line 214, ../components/_typography.scss */
blockquote, q {
quotes: none;
}

/* line 221, ../components/_typography.scss */
/* line 218, ../components/_typography.scss */
blockquote:before,
blockquote:after,
q:before,
Expand Down
4 changes: 2 additions & 2 deletions dist/css/main.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/detects.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Kraken v5.4.0
* Kraken v5.6.0
* A lightweight front-end boilerplate, by Chris Ferdinandi.
* http://github.com/cferdinandi/kraken
*
Expand Down
2 changes: 1 addition & 1 deletion dist/js/detects.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Kraken v5.4.0
* Kraken v5.6.0
* A lightweight front-end boilerplate, by Chris Ferdinandi.
* http://github.com/cferdinandi/kraken
*
Expand Down
2 changes: 1 addition & 1 deletion dist/js/main.min.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/** Kraken v5.4.0, by Chris Ferdinandi | http://github.com/cferdinandi/kraken | Licensed under MIT: http://gomakethings.com/mit/ */
/** Kraken v5.6.0, by Chris Ferdinandi | http://github.com/cferdinandi/kraken | Licensed under MIT: http://gomakethings.com/mit/ */

0 comments on commit 696e642

Please sign in to comment.