Skip to content

Commit

Permalink
Fixes twbs#6190: Add print utility classes
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Feb 6, 2013
1 parent 6a9cd51 commit 0fe9148
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 9 deletions.
13 changes: 13 additions & 0 deletions docs/assets/css/bootstrap-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,19 @@
}
}

.visible-print {
display: none !important;
}

@media print {
.visible-print {
display: inherit !important;
}
.hidden-print {
display: none !important;
}
}

@media (min-width: 1200px) {
.row {
margin-left: -30px;
Expand Down
6 changes: 3 additions & 3 deletions docs/assets/js/bootstrap-popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
, $e = this.$element
, o = this.options

content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
|| $e.attr('data-content')

return content
}
Expand Down Expand Up @@ -111,4 +111,4 @@
return this
}

}(window.jQuery);
}(window.jQuery);
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
}

, getOptions: function (options) {
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)

if (options.delay && typeof options.delay == 'number') {
options.delay = {
Expand Down
9 changes: 5 additions & 4 deletions docs/assets/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@
}

, getOptions: function (options) {
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)

if (options.delay && typeof options.delay == 'number') {
options.delay = {
Expand Down Expand Up @@ -1406,8 +1406,8 @@
, $e = this.$element
, o = this.options

content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
|| $e.attr('data-content')

return content
}
Expand Down Expand Up @@ -1459,7 +1459,8 @@
return this
}

}(window.jQuery);/* =============================================================
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap.min.js

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions less/responsive-utilities.less
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,12 @@
// Hide
.hidden-phone { display: none !important; }
}

// Print utilities
.visible-print { display: none !important; }
.hidden-print { }

@media print {
.visible-print { display: inherit !important; }
.hidden-print { display: none !important; }
}

0 comments on commit 0fe9148

Please sign in to comment.