mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-29 23:09:05 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Browse Source 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
This commit is contained in:
Mark Otto
2015-05-27 15:49:55 -07:00
parent bd971c49b0 3fe894ba36
commit 663576a7ae
128 changed files with 24790 additions and 17469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/assets/js/src/application.js
View File

@@ -51,7 +51,7 @@
// Button state demo
$('#loading-example-btn').on('click', function () {
var btn = $(this)
var $btn = $(this)
btn.button('loading')
setTimeout(function () {
btn.button('reset')
@@ -60,11 +60,11 @@
// Modal relatedTarget demo
$('#exampleModal').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget) // Button that triggered the modal
var $button = $(event.relatedTarget) // Button that triggered the modal
var recipient = button.data('whatever') // Extract info from data-* attributes
// If necessary, you could initiate an AJAX request here (and then do the updating in a callback).
// Update the modal's content. We'll use jQuery here, but you could use a data binding library or other methods instead.
var modal = $(this)
var $modal = $(this)
modal.find('.modal-title').text('New message to ' + recipient)
modal.find('.modal-body input').val(recipient)
})
@@ -89,7 +89,7 @@
$(this).before(btnHtml)
})
var zeroClipboard = new ZeroClipboard($('.btn-clipboard'))
var htmlBridge = $('#global-zeroclipboard-html-bridge')
var $htmlBridge = $('#global-zeroclipboard-html-bridge')
// Handlers for ZeroClipboard
zeroClipboard.on('load', function () {
@@ -129,5 +129,7 @@
;(function () {
'use strict';
addAnchors('.bd-container > h1, .bd-container > h2, .bd-container > h3, .bd-container > h4, .bd-container > h5');
})();