Skip to content

Commit

Permalink
Merge pull request #210 from cferdinandi/development
Browse files Browse the repository at this point in the history
Removed icon font support
  • Loading branch information
cferdinandi committed Mar 7, 2015
2 parents 4d72ddf + a0d4a80 commit c1de149
Show file tree
Hide file tree
Showing 39 changed files with 52 additions and 470 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Kraken is free to use under the [MIT License](http://gomakethings.com/mit/).

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

* v6.0.0 - March 6, 2015
* Removed icon font support.
* v5.6.1 - March 6, 2015
* Fixed false positive from Opera Mini in SVG detection.
* v5.6.0 - January 31, 2014
Expand Down
2 changes: 1 addition & 1 deletion dist/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Kraken v5.6.1
* Kraken v6.0.0
* A lightweight front-end boilerplate, by Chris Ferdinandi.
* http://github.com/cferdinandi/kraken
*
Expand Down
2 changes: 1 addition & 1 deletion dist/css/main.min.css

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

96 changes: 1 addition & 95 deletions dist/js/detects.js
Original file line number Diff line number Diff line change
@@ -1,106 +1,12 @@
/**
* Kraken v5.6.1
* Kraken v6.0.0
* A lightweight front-end boilerplate, by Chris Ferdinandi.
* http://github.com/cferdinandi/kraken
*
* Free to use under the MIT License.
* http://gomakethings.com/mit/
*/

;(function (window, document, undefined) {

'use strict';

/**
* Test for @font-face support
* @return {Boolean} Returns true if supported
*/
var isFontFaceSupported = function () {

var doc = document,
head = doc.head || doc.getElementsByTagName( "head" )[ 0 ] || doc.documentElement,
style = doc.createElement( "style" ),
rule = "@font-face { font-family: 'webfont'; src: 'https://'; }",
supportFontFace = false,
blacklist = (function() {
var ua = win.navigator.userAgent.toLowerCase(),
wkvers = ua.match( /applewebkit\/([0-9]+)/gi ) && parseFloat( RegExp.$1 ),
webos = ua.match( /w(eb)?osbrowser/gi ),
wppre8 = ua.indexOf( "windows phone" ) > -1 && win.navigator.userAgent.match( /IEMobile\/([0-9])+/ ) && parseFloat( RegExp.$1 ) >= 9,
oldandroid = wkvers < 533 && ua.indexOf( "Android 2.1" ) > -1;

return webos || oldandroid || wppre8;
}()),
sheet;

style.type = "text/css";
head.insertBefore( style, head.firstChild );
sheet = style.sheet || style.styleSheet;

if ( !!sheet && !blacklist ) {
try {
sheet.insertRule( rule, 0 );
supportFontFace = sheet.cssRules[ 0 ].cssText && ( /webfont/i ).test( sheet.cssRules[ 0 ].cssText );
sheet.deleteRule( sheet.cssRules.length - 1 );
} catch( e ) { }
}

return supportFontFace;
};

/**
* Test for pseudo selector support
* @param {String} selector Selector to test
* @return {Boolean} Returns true if supported
*/
var selectorSupported = function (selector) {

var support,
sheet,
doc = document,
root = doc.documentElement,
head = root.getElementsByTagName('head')[0],

impl = doc.implementation || {
hasFeature: function() {
return false;
}
},

link = doc.createElement("style");
link.type = 'text/css';

(head || root).insertBefore(link, (head || root).firstChild);

sheet = link.sheet || link.styleSheet;

if (!(sheet && selector)) return false;

support = impl.hasFeature('CSS2', '') ?

function(selector) {
try {
sheet.insertRule(selector + '{ }', 0);
sheet.deleteRule(sheet.cssRules.length - 1);
} catch (e) {
return false;
}
return true;
} : function(selector) {
sheet.cssText = selector + ' { }';
return sheet.cssText.length !== 0 && !(/unknown/i).test(sheet.cssText) && sheet.cssText.indexOf(selector) === 0;
};

return support(selector);

};

// If @font-face and pseudo selectors are supported, add '.font-face' class to <html> element
if (isFontFaceSupported && selectorSupported(':before')) {
document.documentElement.className += (document.documentElement.className ? ' ' : '') + 'font-face';
}

})(window, document);
;(function (window, document, undefined) {

'use strict';
Expand Down
4 changes: 2 additions & 2 deletions 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.6.1
* Kraken v6.0.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.6.1, by Chris Ferdinandi | http://github.com/cferdinandi/kraken | Licensed under MIT: http://gomakethings.com/mit/ */
/** Kraken v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/kraken | Licensed under MIT: http://gomakethings.com/mit/ */
2 changes: 1 addition & 1 deletion docs/add-ons.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ <h1 class="text-center no-margin-bottom" id="getting-started">Getting Started</h
<li><a href="typography.html">Typography</a></li>
<li><a href="buttons.html">Buttons</a></li>
<li><a href="forms.html">Forms</a></li>
<li><a href="icons.html">SVG Sprites &amp; Icon Fonts</a></li>
<li><a href="icons.html">SVG Sprites</a></li>
<li><a href="overrides.html">Alignment, Spacing &amp; Visibility</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/browsers.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h1 class="text-center no-margin-bottom" id="getting-started">Getting Started</h
<li><a href="typography.html">Typography</a></li>
<li><a href="buttons.html">Buttons</a></li>
<li><a href="forms.html">Forms</a></li>
<li><a href="icons.html">SVG Sprites &amp; Icon Fonts</a></li>
<li><a href="icons.html">SVG Sprites</a></li>
<li><a href="overrides.html">Alignment, Spacing &amp; Visibility</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/built-with-kraken.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ <h1 class="text-center no-margin-bottom" id="getting-started">Getting Started</h
<li><a href="typography.html">Typography</a></li>
<li><a href="buttons.html">Buttons</a></li>
<li><a href="forms.html">Forms</a></li>
<li><a href="icons.html">SVG Sprites &amp; Icon Fonts</a></li>
<li><a href="icons.html">SVG Sprites</a></li>
<li><a href="overrides.html">Alignment, Spacing &amp; Visibility</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/buttons.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h1 class="text-center no-margin-bottom" id="getting-started">Getting Started</h
<li><a href="typography.html">Typography</a></li>
<li><a href="buttons.html">Buttons</a></li>
<li><a href="forms.html">Forms</a></li>
<li><a href="icons.html">SVG Sprites &amp; Icon Fonts</a></li>
<li><a href="icons.html">SVG Sprites</a></li>
<li><a href="overrides.html">Alignment, Spacing &amp; Visibility</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/dist/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Kraken v5.6.1
* Kraken v6.0.0
* A lightweight front-end boilerplate, by Chris Ferdinandi.
* http://github.com/cferdinandi/kraken
*
Expand Down

0 comments on commit c1de149

Please sign in to comment.