mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
Merge branch 'v4-dev' into v4-forms-cleanup
This commit is contained in:
Vendored
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Vendored
+8
-12
File diff suppressed because one or more lines are too long
@@ -36,6 +36,17 @@
|
||||
e.preventDefault()
|
||||
})
|
||||
|
||||
// Modal relatedTarget demo
|
||||
$('#exampleModal').on('show.bs.modal', function (event) {
|
||||
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)
|
||||
$modal.find('.modal-title').text('New message to ' + recipient)
|
||||
$modal.find('.modal-body input').val(recipient)
|
||||
})
|
||||
|
||||
// Insert copy to clipboard button before .highlight
|
||||
$('.highlight').each(function () {
|
||||
var btnHtml = '<div class="bd-clipboard"><span class="btn-clipboard" title="Copy to clipboard">Copy</span></div>'
|
||||
|
||||
Vendored
+4
-4
File diff suppressed because one or more lines are too long
+2
-2
File diff suppressed because one or more lines are too long
Vendored
+4
-3
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+4
-4
File diff suppressed because one or more lines are too long
Vendored
+1
-2
File diff suppressed because one or more lines are too long
@@ -303,12 +303,6 @@
|
||||
|
||||
// Helpers
|
||||
.bd-example > {
|
||||
.center-block:not(img) {
|
||||
max-width: 200px;
|
||||
padding: .5rem;
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
.bg-primary,
|
||||
.bg-success,
|
||||
.bg-info,
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
//
|
||||
|
||||
.bd-navbar {
|
||||
font-size: 87.5%; // 14px
|
||||
|
||||
.navbar-nav {
|
||||
.nav-link {
|
||||
color: $bd-graphite-light;
|
||||
@@ -17,7 +15,8 @@
|
||||
}
|
||||
|
||||
&.active {
|
||||
color: darken($gray-dark, 25%);
|
||||
font-weight: 500;
|
||||
color: darken($gray-dark, 15%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user