Skip to content

Commit

Permalink
Merge pull request #3909 from JLLeitschuh/feature/add-bootstrap-elements
Browse files Browse the repository at this point in the history
Adds twitter bootstrap less files under a namespace
  • Loading branch information
c0bra committed Jul 27, 2015
2 parents 06e27df + d6f8357 commit 22c7300
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 1 deletion.
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
],
"author": "UI Grid Team",
"license": "MIT",
"dependencies": {
"bootstrap": "~3.3.5"
},
"devDependencies": {
"bower": "^1.3.8",
"canonical-path": "0.0.2",
Expand Down
78 changes: 78 additions & 0 deletions src/less/bootstrap/bootstrap.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*!
* Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

/****** NOTE: IMPORTANT INFORMATION ABOUT USING THIS FILE *********\
* If you are importing this file then use `@import (reference) '..../bootstrap'`
* ENSURE that you use the (refrerence)
* WHY? Because otherwise you will import the entire contents of less bootstrap
*
* How does this work?
* All of the bootstrap less elements are namespaced under `#ui-grid-twbs`
* This prevents the CSS generated using this file from conflicting with a project's
* import of bootstrap.
*
* XXX: Why are so many of these imports commented out?
* There are several issues with the `extend` function in less.
* Using extend, even within an import that only has a reference will import that
* css element. This causes bloat in the distributed css files.
* Related Issues:
* https://github.com/less/less.js/issues/1968
* https://github.com/less/less.js/issues/1851
*
* If you comment in one of these files you may get much more than css then you want.
* Only do this sparingly.
*/
#ui-grid-twbs {
// Core variables and mixins
@import (reference) "../../../node_modules/bootstrap/less/variables.less";
@import (reference) "../../../node_modules/bootstrap/less/mixins.less";

// Reset and dependencies
@import (reference) "../../../node_modules/bootstrap/less/normalize.less";
@import (reference) "../../../node_modules/bootstrap/less/print.less";
@import (reference) "../../../node_modules/bootstrap/less/glyphicons.less";

// Core CSS
@import (reference) "../../../node_modules/bootstrap/less/scaffolding.less";
@import (reference) "../../../node_modules/bootstrap/less/code.less";
@import (reference) "../../../node_modules/bootstrap/less/tables.less";
@import (reference) "../../../node_modules/bootstrap/less/forms.less";
@import (reference) "../../../node_modules/bootstrap/less/buttons.less";
//@import (reference) "../../../node_modules/bootstrap/less/type.less";
//@import (reference) "../../../node_modules/bootstrap/less/grid.less";

// Components
@import (reference) "../../../node_modules/bootstrap/less/component-animations.less";
@import (reference) "../../../node_modules/bootstrap/less/dropdowns.less";
@import (reference) "../../../node_modules/bootstrap/less/button-groups.less";
@import (reference) "../../../node_modules/bootstrap/less/input-groups.less";
@import (reference) "../../../node_modules/bootstrap/less/breadcrumbs.less";
@import (reference) "../../../node_modules/bootstrap/less/pagination.less";
@import (reference) "../../../node_modules/bootstrap/less/labels.less";
@import (reference) "../../../node_modules/bootstrap/less/badges.less";
@import (reference) "../../../node_modules/bootstrap/less/jumbotron.less";
@import (reference) "../../../node_modules/bootstrap/less/alerts.less";
@import (reference) "../../../node_modules/bootstrap/less/progress-bars.less";
@import (reference) "../../../node_modules/bootstrap/less/media.less";
@import (reference) "../../../node_modules/bootstrap/less/list-group.less";
@import (reference) "../../../node_modules/bootstrap/less/responsive-embed.less";
@import (reference) "../../../node_modules/bootstrap/less/wells.less";
@import (reference) "../../../node_modules/bootstrap/less/close.less";
//@import (reference) "../../../node_modules/bootstrap/less/navs.less";
//@import (reference) "../../../node_modules/bootstrap/less/navbar.less";
//@import (reference) "../../../node_modules/bootstrap/less/pager.less";
//@import (reference) "../../../node_modules/bootstrap/less/thumbnails.less";
//@import (reference) "../../../node_modules/bootstrap/less/panels.less";

// Components w/ JavaScript
@import (reference) "../../../node_modules/bootstrap/less/tooltip.less";
//@import (reference) "../../../node_modules/bootstrap/less/modals.less";
//@import (reference) "../../../node_modules/bootstrap/less/popovers.less";

// Utility classes
@import (reference) "../../../node_modules/bootstrap/less/utilities.less";
//@import (reference) "../../../node_modules/bootstrap/less/responsive-utilities.less";
}
2 changes: 1 addition & 1 deletion src/less/main.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

@import (once, reference) 'bootstrap/bootstrap';
@import 'grid';
@import 'header';
@import 'body';
Expand Down

0 comments on commit 22c7300

Please sign in to comment.