From cde17c94919ef26093145e5412c6d425d3199d9f Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 4 Oct 2011 00:48:31 -0700
Subject: [PATCH] adding placeholder font-face mixin which doesn't work yet
---
bootstrap.css | 2 +-
lib/mixins.less | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/bootstrap.css b/bootstrap.css
index 75928c7490..2b0e88c86d 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Tue Oct 4 00:16:55 PDT 2011
+ * Date: Tue Oct 4 00:48:20 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
diff --git a/lib/mixins.less b/lib/mixins.less
index c43f166328..47eb1a1c38 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -71,6 +71,20 @@
}
}
+// Font face generator
+.font-face(@fontFamily, @fileName, @style, @weight) {
+ @font-face {
+ font-family: @fontFamily;
+ font-style: @style;
+ font-weight: @weight;
+ src: url('@{fileName}.eot');
+ src: url('@{fileName}.eot?#iefix') format('embedded-opentype'),
+ url('@{fileName}.woff') format('woff'),
+ url('@{fileName}.ttf') format('truetype'),
+ url('@{fileName}.svg#@{fontFamily}') format('svg');
+ }
+}
+
// Grid System
.fixed-container() {
width: @siteWidth;
--
GitLab