From: Mark Otto Date: Wed, 6 Feb 2013 06:42:54 +0000 (-0800) Subject: Merge branch '2.3.0-wip' into 3.0.0-wip X-Git-Tag: v3.0.0-rc1~690 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=421f9f67c44d4b7c971b42808687ae7b71c99151;p=thirdparty%2Fbootstrap.git Merge branch '2.3.0-wip' into 3.0.0-wip Conflicts: docs/assets/css/bootstrap-responsive.css docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap.js docs/css.html docs/templates/pages/base-css.mustache js/bootstrap-popover.js less/mixins.less less/tooltip.less --- 421f9f67c44d4b7c971b42808687ae7b71c99151 diff --cc docs/assets/css/bootstrap.css index 8d6dcca997,b255056927..83b3c29c23 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -4648,58 -6156,3 +4651,71 @@@ a.counter:focus .affix { position: fixed; } + +@-ms-viewport { + width: device-width; +} + +.hidden { + display: none; + visibility: hidden; +} + +.visible-phone { + display: none !important; +} + +.visible-tablet { + display: none !important; +} + +.hidden-desktop { + display: none !important; +} + +.visible-desktop { + display: inherit !important; +} + +@media (min-width: 768px) and (max-width: 979px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important ; + } + .visible-tablet { + display: inherit !important; + } + .hidden-tablet { + display: none !important; + } +} + +@media (max-width: 767px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important; + } + .visible-phone { + display: inherit !important; + } + .hidden-phone { + display: none !important; + } +} ++ ++.visible-print { ++ display: none !important; ++} ++ ++@media print { ++ .visible-print { ++ display: inherit !important; ++ } ++ .hidden-print { ++ display: none !important; ++ } ++} diff --cc docs/assets/js/bootstrap.js index f0a03ee823,bd4979f135..16d8d66c28 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@@ -788,14 -789,15 +789,15 @@@ * =================================== */ $(document) - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - .on('click.dropdown.data-api touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + .on('click.dropdown.data-api', clearMenus) + .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('.dropdown-menu', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - }(window.jQuery);/* ========================================================= + }(window.jQuery); + /* ========================================================= - * bootstrap-modal.js v2.3.0 + * bootstrap-modal.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. diff --cc less/mixins.less index fa74b301d3,79d889219f..46241ab46b --- a/less/mixins.less +++ b/less/mixins.less @@@ -470,32 -572,131 +470,31 @@@ // The Grid #grid { - .core (@gridColumnWidth, @gridGutterWidth) { - - .spanX (@index) when (@index > 0) { - .span@{index} { .span(@index); } - .spanX(@index - 1); - } - .spanX (0) {} - - .offsetX (@index) when (@index > 0) { - .offset@{index} { .offset(@index); } - .offsetX(@index - 1); - } - .offsetX (0) {} - - .offset (@columns) { - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)); - } - - .span (@columns) { - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); - } - - .row { - margin-left: @gridGutterWidth * -1; - .clearfix(); - } - - [class*="span"] { - float: left; - min-height: 1px; // prevent collapsing columns - margin-left: @gridGutterWidth; - } - - // Set the container width, and override it for fixed navbars in media queries - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { .span(@gridColumns); } - - // generate .spanX and .offsetX - .spanX (@gridColumns); - .offsetX (@gridColumns); - - } - - .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) { + .core(@grid-column-width, @grid-gutter-width) { - .spanX(@index) when (@index > 0) { - (~".span@{index}") { .span(@index); } + .spanX (@index) when (@index > 0) { + .span@{index} { .span(@index); } .spanX(@index - 1); } - .spanX (0) {} + .spanX(0) {} - .offsetX(@index) when (@index > 0) { - (~".offset@{index}") { .offset(@index); } + .offsetX (@index) when (@index > 0) { + .offset@{index} { .offset(@index); } - .offset@{index}:first-child { .offsetFirstChild(@index); } .offsetX(@index - 1); } - .offsetX(0) {} + .offsetX (0) {} - .offset (@columns) { - margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2); - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%); - } - - .offsetFirstChild (@columns) { - margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth); - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); - } - - .span (@columns) { - width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); - *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%); - } - - .row-fluid { - width: 100%; - .clearfix(); - [class*="span"] { - .input-block-level(); - float: left; - margin-left: @fluidGridGutterWidth; - *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); - } - [class*="span"]:first-child { - margin-left: 0; - } - - // Space grid-sized controls properly if multiple per line - .controls-row [class*="span"] + [class*="span"] { - margin-left: @fluidGridGutterWidth; - } - - // generate .spanX and .offsetX - .spanX (@gridColumns); - .offsetX (@gridColumns); - } - - } - - .input(@gridColumnWidth, @gridGutterWidth) { - - .spanX (@index) when (@index > 0) { - input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); } - .spanX(@index - 1); + // Base styles + .offset(@columns) { + margin-left: percentage(@columns / @grid-columns); } - .spanX (0) {} - .span(@columns) { - width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14; - } - - input, - textarea, - .uneditable-input { - margin-left: 0; // override margin-left from core grid system - } - - // Space grid-sized controls properly if multiple per line - .controls-row [class*="span"] + [class*="span"] { - margin-left: @gridGutterWidth; + width: percentage(@columns / @grid-columns); } - // generate .spanX - .spanX (@gridColumns); + // Generate .spanX and .offsetX + .spanX(@grid-columns); + .offsetX(@grid-columns); } - } diff --cc less/tooltip.less index 65f5c7a820,83d5f2bd76..e262e3ba58 --- a/less/tooltip.less +++ b/less/tooltip.less @@@ -6,18 -6,17 +6,18 @@@ // Base class .tooltip { position: absolute; - z-index: @zindexTooltip; + z-index: @zindex-tooltip; display: block; visibility: visible; - padding: 5px; font-size: 11px; line-height: 1.4; .opacity(0); - &.in { .opacity(80); } ++ + &.in { .opacity(100); } - &.top { margin-top: -3px; } - &.right { margin-left: 3px; } - &.bottom { margin-top: 3px; } - &.left { margin-left: -3px; } + &.top { margin-top: -3px; padding: 5px 0; } + &.right { margin-left: 3px; padding: 0 5px; } + &.bottom { margin-top: 3px; padding: 5px 0; } + &.left { margin-left: -3px; padding: 0 5px; } } // Wrapper for the tooltip content