1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Refactor and restyle.

This commit is contained in:
Mark Otto 2014-02-11 00:04:53 -08:00 committed by XhmikosR
parent 250e021ff1
commit 7d1365ce1c
5 changed files with 68 additions and 1066 deletions

View file

@ -137,7 +137,7 @@ module.exports = function (grunt) {
}, },
src: [ src: [
'docs/assets/js/_vendor/holder.js', 'docs/assets/js/_vendor/holder.js',
'docs/assets/js/_vendor/zero-clipboard.js', 'docs/assets/js/_vendor/zero-clipboard.min.js',
'docs/assets/js/_src/application.js' 'docs/assets/js/_src/application.js'
], ],
dest: 'docs/assets/js/docs.min.js' dest: 'docs/assets/js/docs.min.js'

View file

@ -1133,13 +1133,9 @@ h1[id] {
font-size: inherit; font-size: inherit;
color: #333; /* Effectively the base text color */ color: #333; /* Effectively the base text color */
} }
.highlight pre .lineno { .highlight pre code:first-child {
display: inline-block; display: inline-block;
width: 22px; padding-right: 45px;
padding-right: 5px;
margin-right: 10px;
color: #bebec5;
text-align: right;
} }
@ -1467,35 +1463,37 @@ h1[id] {
box-shadow: 0 0 8px rgba(82,168,236,.6); box-shadow: 0 0 8px rgba(82,168,236,.6);
} }
/* /*
* ZeroClipboard styles * ZeroClipboard styles
*/ */
.zero-clipboard { .zero-clipboard {
position: relative; position: relative;
display: none;
} }
.btn-clipboard { .btn-clipboard {
position: absolute; position: absolute;
top: 0;
right: 0; right: 0;
z-index: 10; z-index: 10;
padding: 5px 10px; display: block;
padding: 5px 8px;
font-size: 12px;
color: #777;
cursor: pointer; cursor: pointer;
border-color: #e1e1e8; background-color: #fff;
border-bottom: 1px solid transparent; border: 1px solid #e1e1e8;
border-left: 1px solid transparent; border-radius: 0 4px 0 4px;
border-radius: 0 4px 0 0;
} }
.btn-clipboard-hover { .btn-clipboard-hover {
background-color: #e1e1e8; color: #fff;
background-color: #563d7c;
border-color: #563d7c;
} }
@media (max-width: 768px) { @media (min-width: 768px) {
.btn-clipboard.with-example { .zero-clipboard {
top: 10px; display: block;
border: 1px solid #e1e1e8;
border-radius: 0;
} }
} }

View file

@ -15,35 +15,25 @@
$(function () { $(function () {
// Insert copy to clipboard button before .highlight or .bs-example // Scrollspy
$('.highlight').each(function() {
var highlight = $(this)
var previous = highlight.prev()
var btnHtml = '<div class="zero-clipboard"><span class="glyphicon glyphicon-list-alt btn-clipboard"></span></div>'
if (previous.hasClass('bs-example')) {
previous.before(btnHtml.replace(/btn-clipboard/, 'btn-clipboard with-example'))
} else {
highlight.before(btnHtml)
}
})
var $window = $(window) var $window = $(window)
var $body = $(document.body) var $body = $(document.body)
$body.scrollspy({ $body.scrollspy({
target: '.bs-docs-sidebar' target: '.bs-docs-sidebar'
}) })
$window.on('load', function () { $window.on('load', function () {
$body.scrollspy('refresh') $body.scrollspy('refresh')
}) })
// Kill links
$('.bs-docs-container [href=#]').click(function (e) { $('.bs-docs-container [href=#]').click(function (e) {
e.preventDefault() e.preventDefault()
}) })
// back to top
// Sidenav affixing
setTimeout(function () { setTimeout(function () {
var $sideBar = $('.bs-docs-sidebar') var $sideBar = $('.bs-docs-sidebar')
@ -84,7 +74,7 @@
}) })
})(); })();
// tooltip demo // Tooltip and popover demos
$('.tooltip-demo').tooltip({ $('.tooltip-demo').tooltip({
selector: '[data-toggle="tooltip"]', selector: '[data-toggle="tooltip"]',
container: 'body' container: 'body'
@ -98,53 +88,68 @@
container: '.bs-docs-navbar .nav' container: '.bs-docs-navbar .nav'
}) })
// popover demo // Default popover demo
$('.bs-docs-popover').popover() $('.bs-docs-popover').popover()
// Popover dismiss on next click // Button state demo
$('.bs-docs-popover-dismiss').popover({ $('#loading-example-btn').click(function () {
trigger: 'focus' var btn = $(this)
btn.button('loading')
setTimeout(function () {
btn.button('reset')
}, 3000)
}) })
// button state demo
$('#loading-example-btn') // Config ZeroClipboard
.click(function () { ZeroClipboard.config({
var btn = $(this) moviePath: '/assets/flash/zero-clipboard.swf',
btn.button('loading') hoverClass: 'btn-clipboard-hover'
setTimeout(function () { })
btn.button('reset')
}, 3000) // Insert copy to clipboard button before .highlight or .bs-example
}) $('.highlight').each(function() {
var highlight = $(this)
var previous = highlight.prev()
var btnHtml = '<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>'
if (previous.hasClass('bs-example')) {
previous.before(btnHtml.replace(/btn-clipboard/, 'btn-clipboard with-example'))
} else {
highlight.before(btnHtml)
}
})
var zeroClipboard = new ZeroClipboard($('.btn-clipboard'))
var htmlBridge = $('#global-zeroclipboard-html-bridge')
// Handlers for ZeroClipboard // Handlers for ZeroClipboard
zeroClipboard.on('load', function(client) { zeroClipboard.on('load', function(client) {
htmlBridge htmlBridge
.data('placement', 'left') .data('placement', 'top')
.attr('title', 'copy to clipboard') .attr('title', 'Copy to clipboard')
.tooltip() .tooltip()
}) })
// Copy to clipboard // Copy to clipboard
zeroClipboard.on('dataRequested', function(client) { zeroClipboard.on('dataRequested', function(client) {
var highlight = $(this).parent().nextAll('.highlight').first() var highlight = $(this).parent().nextAll('.highlight').first()
client.setText(highlight.text()) client.setText(highlight.text())
}) })
// Notify copy success and reset tooltip title // Notify copy success and reset tooltip title
zeroClipboard.on('complete', function(client) { zeroClipboard.on('complete', function(client) {
htmlBridge htmlBridge
.attr('title', 'copied!') .attr('title', 'Copied!')
.tooltip('fixTitle') .tooltip('fixTitle')
.tooltip('show') .tooltip('show')
.attr('title', 'copy to clipboard') .attr('title', 'Copy')
.tooltip('fixTitle') .tooltip('fixTitle')
}) })
// Notify copy failure // Notify copy failure
zeroClipboard.on('noflash wrongflash', function(client) { zeroClipboard.on('noflash wrongflash', function(client) {
htmlBridge htmlBridge
.attr('title', 'flash not supported!') .attr('title', 'Flash required')
.tooltip('fixTitle') .tooltip('fixTitle')
.tooltip('show') .tooltip('show')
}) })

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long