-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
moved font-awesome into the main.less/css file
- Loading branch information
Spencer Alger
committed
Feb 27, 2014
1 parent
4ca6b67
commit db91c15
Showing
4 changed files
with
1,393 additions
and
659 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,54 @@ | ||
| // Core variables and mixins | ||
| @import "../../bower_components/bootstrap/less/variables.less"; | ||
|
|
||
| @icon-font-path: "../../bower_components/bootstrap/fonts/"; | ||
| @bs-less-dir: "../../bower_components/bootstrap/less"; | ||
|
|
||
| @import "../../bower_components/bootstrap/less/mixins.less"; | ||
| // Core variables and mixins | ||
| @import "@{bs-less-dir}/variables.less"; | ||
| @import "@{bs-less-dir}/mixins.less"; | ||
|
|
||
| // Reset | ||
| @import "../../bower_components/bootstrap/less/normalize.less"; | ||
| @import "../../bower_components/bootstrap/less/print.less"; | ||
| @import "@{bs-less-dir}/normalize.less"; | ||
| @import "@{bs-less-dir}/print.less"; | ||
|
|
||
| // Core CSS | ||
| @import "../../bower_components/bootstrap/less/scaffolding.less"; | ||
| @import "../../bower_components/bootstrap/less/type.less"; | ||
| @import "../../bower_components/bootstrap/less/code.less"; | ||
| @import "../../bower_components/bootstrap/less/grid.less"; | ||
| @import "../../bower_components/bootstrap/less/tables.less"; | ||
| @import "../../bower_components/bootstrap/less/forms.less"; | ||
| @import "../../bower_components/bootstrap/less/buttons.less"; | ||
| @import "@{bs-less-dir}/scaffolding.less"; | ||
| @import "@{bs-less-dir}/type.less"; | ||
| @import "@{bs-less-dir}/code.less"; | ||
| @import "@{bs-less-dir}/grid.less"; | ||
| @import "@{bs-less-dir}/tables.less"; | ||
| @import "@{bs-less-dir}/forms.less"; | ||
| @import "@{bs-less-dir}/buttons.less"; | ||
|
|
||
| // Components | ||
| @import "../../bower_components/bootstrap/less/component-animations.less"; | ||
| @import "../../bower_components/bootstrap/less/glyphicons.less"; | ||
| @import "../../bower_components/bootstrap/less/dropdowns.less"; | ||
| @import "../../bower_components/bootstrap/less/button-groups.less"; | ||
| @import "../../bower_components/bootstrap/less/input-groups.less"; | ||
| @import "../../bower_components/bootstrap/less/navs.less"; | ||
| @import "../../bower_components/bootstrap/less/navbar.less"; | ||
| @import "../../bower_components/bootstrap/less/breadcrumbs.less"; | ||
| @import "../../bower_components/bootstrap/less/pagination.less"; | ||
| @import "../../bower_components/bootstrap/less/pager.less"; | ||
| @import "../../bower_components/bootstrap/less/labels.less"; | ||
| @import "../../bower_components/bootstrap/less/badges.less"; | ||
| @import "../../bower_components/bootstrap/less/jumbotron.less"; | ||
| @import "../../bower_components/bootstrap/less/thumbnails.less"; | ||
| @import "../../bower_components/bootstrap/less/alerts.less"; | ||
| @import "../../bower_components/bootstrap/less/progress-bars.less"; | ||
| @import "../../bower_components/bootstrap/less/media.less"; | ||
| @import "../../bower_components/bootstrap/less/list-group.less"; | ||
| @import "../../bower_components/bootstrap/less/panels.less"; | ||
| @import "../../bower_components/bootstrap/less/wells.less"; | ||
| @import "../../bower_components/bootstrap/less/close.less"; | ||
| @import "@{bs-less-dir}/component-animations.less"; | ||
| // @import "@{bs-less-dir}/glyphicons.less"; | ||
| @import "@{bs-less-dir}/dropdowns.less"; | ||
| @import "@{bs-less-dir}/button-groups.less"; | ||
| @import "@{bs-less-dir}/input-groups.less"; | ||
| @import "@{bs-less-dir}/navs.less"; | ||
| @import "@{bs-less-dir}/navbar.less"; | ||
| @import "@{bs-less-dir}/breadcrumbs.less"; | ||
| @import "@{bs-less-dir}/pagination.less"; | ||
| @import "@{bs-less-dir}/pager.less"; | ||
| @import "@{bs-less-dir}/labels.less"; | ||
| @import "@{bs-less-dir}/badges.less"; | ||
| @import "@{bs-less-dir}/jumbotron.less"; | ||
| @import "@{bs-less-dir}/thumbnails.less"; | ||
| @import "@{bs-less-dir}/alerts.less"; | ||
| @import "@{bs-less-dir}/progress-bars.less"; | ||
| @import "@{bs-less-dir}/media.less"; | ||
| @import "@{bs-less-dir}/list-group.less"; | ||
| @import "@{bs-less-dir}/panels.less"; | ||
| @import "@{bs-less-dir}/wells.less"; | ||
| @import "@{bs-less-dir}/close.less"; | ||
|
|
||
| // Components w/ JavaScript | ||
| @import "../../bower_components/bootstrap/less/modals.less"; | ||
| @import "../../bower_components/bootstrap/less/tooltip.less"; | ||
| @import "../../bower_components/bootstrap/less/popovers.less"; | ||
| @import "../../bower_components/bootstrap/less/carousel.less"; | ||
| @import "@{bs-less-dir}/modals.less"; | ||
| @import "@{bs-less-dir}/tooltip.less"; | ||
| @import "@{bs-less-dir}/popovers.less"; | ||
| @import "@{bs-less-dir}/carousel.less"; | ||
|
|
||
| // Utility classes | ||
| @import "../../bower_components/bootstrap/less/utilities.less"; | ||
| @import "../../bower_components/bootstrap/less/responsive-utilities.less"; | ||
| @import "@{bs-less-dir}/utilities.less"; | ||
| @import "@{bs-less-dir}/responsive-utilities.less"; | ||
|
|
||
| // automatically include the theme file | ||
| @import "../../bower_components/bootstrap/less/theme.less"; | ||
| @import "@{bs-less-dir}/theme.less"; |
Oops, something went wrong.