mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-09 07:06:36 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2012-01-25 12:43:31 -08:00
parent 2b2c72b9aa 04f84997c1
commit 1c66779857
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap.css vendored
View File

@@ -6,7 +6,11 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
<<<<<<< HEAD
* Date: Wed Jan 25 12:03:47 PST 2012 * Date: Wed Jan 25 12:03:47 PST 2012
=======
* Date: Wed Jan 25 11:49:21 PST 2012
>>>>>>> 04f84997c18f2f132c8173f728f72b6b7aef52d1
*/ */
article, article,
aside, aside,

1
js/bootstrap-carousel.js vendored
View File

@@ -147,6 +147,7 @@
, $target = $($this.attr('data-target') || $this.attr('href')) , $target = $($this.attr('data-target') || $this.attr('href'))
, options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
$target.carousel(options) $target.carousel(options)
e.preventDefault()
}) })
}) })