github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-22 20:57:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.2-j3-wip' of https://github.com/mmoussa/bootstrap into 2.2.2-j4-wip

Browse Source 
Conflicts:
	less/iconic.less
This commit is contained in:
Arnold Daniels
2012-12-27 17:56:48 +01:00
parent 830a7f8f56 37a27ef5db
commit 239c76c746
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
less/iconic.less
View File

@@ -5,14 +5,14 @@
@font-face {
font-family: IconicStroke;
font-weight: normal;
src: url('../font/iconic_stroke.eot');
src: local('IconicStroke'), url('iconic_stroke.eot?#iefix') format('../font/embedded-opentype'), url('../font/iconic_stroke.woff') format('woff'), url('../font/iconic_stroke.ttf') format('truetype'), url('iconic_stroke.svg#iconic') format('svg'), url('../font/iconic_stroke.otf') format('opentype');
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');
}
@font-face {
font-family: IconicFill;
font-weight: normal;
src: url('../font/iconic_fill.eot');
src: local('IconicFill'), url('../font/iconic_fill.eot?#iefix') format('embedded-opentype'), url('../font/iconic_fill.woff') format('woff'), url('../font/iconic_fill.ttf') format('truetype'), url('iconic_fill.svg#iconic') format('svg'), url('../font/iconic_fill.otf') format('opentype');
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');
}
// Icons

1
less/variables.less
View File

@@ -153,6 +153,7 @@
// -------------------------
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
@iconicFontPath: "../font";
// Input placeholder text color