kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

Merge branch '3' of github.com:intridea/bootstrap-sass into 3.0.0-wip

Browse source 
Conflicts:
	update-bootstrap.sh
	vendor/assets/javascripts/bootstrap.js
	vendor/assets/javascripts/bootstrap/carousel.js
	vendor/assets/javascripts/bootstrap/modal.js
	vendor/assets/javascripts/bootstrap/tooltip.js
	vendor/assets/stylesheets/bootstrap/_button-groups.scss
	vendor/assets/stylesheets/bootstrap/_carousel.scss
	vendor/assets/stylesheets/bootstrap/_close.scss
	vendor/assets/stylesheets/bootstrap/_component-animations.scss
	vendor/assets/stylesheets/bootstrap/_forms.scss
	vendor/assets/stylesheets/bootstrap/_glyphicons.scss
	vendor/assets/stylesheets/bootstrap/_grid.scss
	vendor/assets/stylesheets/bootstrap/_mixins.scss
	vendor/assets/stylesheets/bootstrap/_modals.scss
	vendor/assets/stylesheets/bootstrap/_navbar.scss
	vendor/assets/stylesheets/bootstrap/_pagination.scss
	vendor/assets/stylesheets/bootstrap/_variables.scss
This commit is contained in:
Peter Gumeson 2013-06-13 13:48:18 -07:00
commit 5ed433c31b
2 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vendor/assets/javascripts/bootstrap.js vendored
View file

@ -5,8 +5,9 @@
//= require bootstrap/collapse
//= require bootstrap/dropdown
//= require bootstrap/modal
//= require bootstrap/popover
//= require bootstrap/scrollspy
//= require bootstrap/tab
//= require bootstrap/tooltip
// Popover depends on tooltip and must be included after it:
//= require bootstrap/popover
//= require bootstrap/transition

78
vendor/assets/stylesheets/bootstrap/bootstrap.scss vendored
View file

@ -5,60 +5,60 @@
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
* Designed and built with all the love in the world by $mdo and $fat.
*/
// Core variables and mixins
@import "bootstrap/variables";
@import "bootstrap/mixins";
@import "variables";
@import "mixins";
// Reset
@import "bootstrap/normalize";
@import "bootstrap/print";
@import "normalize";
@import "print";
// Core CSS
@import "bootstrap/scaffolding";
@import "bootstrap/type";
@import "bootstrap/code";
@import "bootstrap/grid";
@import "scaffolding";
@import "type";
@import "code";
@import "grid";
@import "bootstrap/tables";
@import "bootstrap/forms";
@import "bootstrap/buttons";
@import "tables";
@import "forms";
@import "buttons";
// Components: common
@import "bootstrap/component-animations";
@import "bootstrap/glyphicons";
@import "bootstrap/dropdowns";
@import "bootstrap/list-group";
@import "bootstrap/panels";
@import "bootstrap/wells";
@import "bootstrap/close";
@import "component-animations";
@import "glyphicons";
@import "dropdowns";
@import "list-group";
@import "panels";
@import "wells";
@import "close";
// Components: Nav
@import "bootstrap/navs";
@import "bootstrap/navbar";
@import "bootstrap/button-groups";
@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
@import "bootstrap/pager";
@import "navs";
@import "navbar";
@import "button-groups";
@import "breadcrumbs";
@import "pagination";
@import "pager";
// Components: Popovers
@import "bootstrap/modals";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "modals";
@import "tooltip";
@import "popovers";
// Components: Misc
@import "bootstrap/alerts";
@import "bootstrap/thumbnails";
@import "bootstrap/media";
@import "bootstrap/labels";
@import "bootstrap/badges";
@import "bootstrap/progress-bars";
@import "bootstrap/accordion";
@import "bootstrap/carousel";
@import "bootstrap/jumbotron";
@import "alerts";
@import "thumbnails";
@import "media";
@import "labels";
@import "badges";
@import "progress-bars";
@import "accordion";
@import "carousel";
@import "jumbotron";
// Utility classes
@import "bootstrap/utilities"; // Has to be last to override when necessary
@import "bootstrap/responsive-utilities";
@import "utilities"; // Has to be last to override when necessary
@import "responsive-utilities";