Merge branch '2.2.2-j4-wip' of github.com:jasny/bootstrap into 2.2.2-j4-wip

This commit is contained in:
Arnold Daniels
2013-01-27 22:38:07 -08:00

View File

@@ -6,13 +6,13 @@
font-family: IconicStroke;
font-weight: normal;
src: url(~'@{iconicFontPath}/iconic_stroke.eot');
src: local('IconicStroke'), url('iconic_stroke.eot?#iefix') format(~'@{iconicFontPath}/embedded-opentype'), url(~'@{iconicFontPath}/iconic_stroke.woff') format('woff'), url(~'@{iconicFontPath}/iconic_stroke.ttf') format('truetype'), url('iconic_stroke.svg#iconic') format('svg'), url(~'@{iconicFontPath}/iconic_stroke.otf') format('opentype');
src: local('IconicStroke'), url(~'@{iconicFontPath}/iconic_stroke.eot?#iefix') format('embedded-opentype'), url(~'@{iconicFontPath}/iconic_stroke.woff') format('woff'), url(~'@{iconicFontPath}/iconic_stroke.ttf') format('truetype'), url(~'@{iconicFontPath}/iconic_stroke.svg#iconic') format('svg'), url(~'@{iconicFontPath}/iconic_stroke.otf') format('opentype');
}
@font-face {
font-family: IconicFill;
font-weight: normal;
src: url(~'@{iconicFontPath}/iconic_fill.eot');
src: local('IconicFill'), url(~'@{iconicFontPath}/iconic_fill.eot?#iefix') format('embedded-opentype'), url(~'@{iconicFontPath}/iconic_fill.woff') format('woff'), url(~'@{iconicFontPath}/iconic_fill.ttf') format('truetype'), url('iconic_fill.svg#iconic') format('svg'), url(~'@{iconicFontPath}/iconic_fill.otf') format('opentype');
src: local('IconicFill'), url(~'@{iconicFontPath}/iconic_fill.eot?#iefix') format('embedded-opentype'), url(~'@{iconicFontPath}/iconic_fill.woff') format('woff'), url(~'@{iconicFontPath}/iconic_fill.ttf') format('truetype'), url(~'@{iconicFontPath}/iconic_fill.svg#iconic') format('svg'), url(~'@{iconicFontPath}/iconic_fill.otf') format('opentype');
}
// Icons