aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-10-04 00:48:31 -0700
committerMark Otto <[email protected]>2011-10-04 00:48:31 -0700
commitcde17c94919ef26093145e5412c6d425d3199d9f (patch)
tree1fd724794b82e1e270405b9109e353d5df1da893
parent96dd7a2903aa5213ddb364b385660e26396dc670 (diff)
downloadbootstrap-cde17c94919ef26093145e5412c6d425d3199d9f.tar.xz
bootstrap-cde17c94919ef26093145e5412c6d425d3199d9f.zip
adding placeholder font-face mixin which doesn't work yet
-rw-r--r--bootstrap.css2
-rw-r--r--lib/mixins.less14
2 files changed, 15 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 75928c749..2b0e88c86 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 c43f16632..47eb1a1c3 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;