diff static/bootstrap/less/bootstrap.less @ 88:a5a3d454eac9

Updated Bootstrap.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 05 Apr 2013 08:08:12 -0700
parents 3c8e07af93c7
children d29e2f337b00
line wrap: on
line diff
--- a/static/bootstrap/less/bootstrap.less	Wed Apr 03 23:59:07 2013 -0700
+++ b/static/bootstrap/less/bootstrap.less	Fri Apr 05 08:08:12 2013 -0700
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.2.2
+ * Bootstrap v2.3.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -8,14 +8,14 @@
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
  */
 
+// Core variables and mixins
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "custom-variables.less";
+@import "mixins.less";
+
 // CSS Reset
 @import "reset.less";
 
-// Core variables and mixins
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "custom_variables.less"; // LOCAL MOD: Override default variables.
-@import "mixins.less";
-
 // Grid system and page structure
 @import "scaffolding.less";
 @import "grid.less";
@@ -28,8 +28,7 @@
 @import "tables.less";
 
 // Components: common
-//@import "sprites.less"; // LOCAL MOD: Don't use images for icons.
-@import "../../font-awesome/less/font-awesome.less"; // LOCAL MOD: Use FontAwesome for icons.
+@import "sprites.less";
 @import "dropdowns.less";
 @import "wells.less";
 @import "component-animations.less";