From 6d5b5065176a9e46ce71ec5fc16ae4a079e9e636 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Dec 2011 17:38:05 -0800 Subject: [PATCH 01/13] minor cleanups --- Makefile | 11 ++++++----- js/bootstrap-collapse.js | 4 ++-- js/bootstrap-transition.js | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e5c083ae6f..1f38338f80 100644 --- a/Makefile +++ b/Makefile @@ -22,15 +22,16 @@ build: uglify: @@if test ! -z ${UGLIFY_JS}; then \ mkdir -p js/min; \ - uglifyjs -o js/min/bootstrap-accordion.js js/bootstrap-accordion.js;\ - uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alerts.js;\ - uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-buttons.js;\ + uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alert.js;\ + uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-button.js;\ + uglifyjs -o js/min/bootstrap-carousel.js js/bootstrap-carousel.js;\ + uglifyjs -o js/min/bootstrap-collapse.js js/bootstrap-collapse.js;\ uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\ uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\ uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\ uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\ - uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tabs.js;\ - uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transitions.js;\ + uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tab.js;\ + uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transition.js;\ uglifyjs -o js/min/bootstrap-twipsy.js js/bootstrap-twipsy.js;\ else \ echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \ diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 313c0abcab..9301c7309d 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -17,7 +17,7 @@ * limitations under the License. * ============================================================ */ -(function( $ ){ +!function( $ ){ "use strict" @@ -132,4 +132,4 @@ }) }) -})( window.jQuery ) \ No newline at end of file +}( window.jQuery ) \ No newline at end of file diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 25f8b111f1..29fa1bdebc 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -19,6 +19,8 @@ $(function () { + "use strict" + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) * ======================================================= */ From efacac0d6c812abffa8a84a48fa760f5f56c92f0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Dec 2011 18:42:43 -0800 Subject: [PATCH 02/13] clean up all the js across all the doc pages --- bootstrap.css | 2 +- docs/assets/js/application.js | 88 ++++++++++++++++++-------------- docs/base-css.html | 19 +------ docs/components.html | 89 +++++++++++++++----------------- docs/index.html | 37 ++------------ docs/javascript.html | 95 ++++++++++++++++------------------- docs/less.html | 20 +------- docs/scaffolding.html | 74 +++++++++------------------ docs/upgrading.html | 39 -------------- 9 files changed, 165 insertions(+), 298 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 612fe24bc7..6515b12b5f 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Dec 21 13:29:41 PST 2011 + * Date: Wed Dec 21 18:41:55 PST 2011 */ html, body { margin: 0; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index dd759bf8b2..c653233e6b 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -1,52 +1,64 @@ $(function(){ + // NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT + // IT'S ALL JUST JUNK FOR OUR DOCS! + // ++++++++++++++++++++++++++++++++++++++++++ + + // make code pretty + prettyPrint && prettyPrint() + // table sort example - // ================== - - $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) - + if ($.fn.tableSorter) { + $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + } // add on logic - // ============ - - $('.add-on :checkbox').click(function () { - if ($(this).attr('checked')) { - $(this).parents('.add-on').addClass('active') - } else { - $(this).parents('.add-on').removeClass('active') - } + $('.add-on :checkbox').on('click', function () { + var $this = $(this) + , method = $this.attr('checked') ? 'addClass' : 'removeClass' + $(this).parents('.add-on')[method]('active') }) - // Disable certain links in docs - // ============================= - // Please do not carry these styles over to your projects, it's merely here to prevent button clicks form taking you away from your spot on page + // Please do not carry these styles over to your projects + // it's merely here to prevent button clicks form taking you + // away from your spot on page!! - $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function (e) { + $('[href^=#]').click(function (e) { e.preventDefault() }) // Copy code blocks in docs - $(".copy-code").focus(function () { - var el = this; - // push select to event loop for chrome :{o - setTimeout(function () { $(el).select(); }, 1); - }); - - - // POSITION STATIC TWIPSIES - // ======================== - - $(window).on('load resize', function () { - $(".twipsies a").each(function () { - $(this) - .twipsy({ - live: false - , placement: $(this).attr('title') - , trigger: 'manual' - , offset: 2 - }) - .twipsy('show') - }) + $(".copy-code").on('focus', function () { + var el = this + setTimeout(function () { $(el).select() }, 0) }) -}); + + if ($.fn.twipsy) { + + // position static twipsies for components page + if ($(".twipsies a").length) { + $(window).on('load resize', function () { + $(".twipsies a").each(function () { + $(this) + .twipsy({ + placement: $(this).attr('title') + , trigger: 'manual' + }) + .twipsy('show') + }) + }) + } + + // add tipsies to grid for scaffolding + if ($('#grid-system').length) { + + $('#grid-system').twipsy({ + selector: '.show-grid > div' + , title: function () { return $(this).width() + 'px' } + }) + + } + } + +}) \ No newline at end of file diff --git a/docs/base-css.html b/docs/base-css.html index 2098974027..6173a4de6e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1110,25 +1110,10 @@ - - - - - + + - - - - diff --git a/docs/components.html b/docs/components.html index 56e71b0f7f..4d2c608230 100644 --- a/docs/components.html +++ b/docs/components.html @@ -208,7 +208,7 @@

Navigation

Fixed navbar

-
+
Project Name @@ -218,7 +218,7 @@
  • Link
  • Link
  • - Dropdown + Dropdown
    • Secondary link
    • Something else here
      • @@ -233,7 +233,7 @@
      • - Dropdown + Dropdown
        • Secondary link
        • Something else here
          • @@ -279,8 +279,8 @@
        • Messages
        • Settings
        • Contact
          • -
        • - Dropdown +
        • + Dropdown
          • Secondary link
          • Something else here
            • @@ -302,11 +302,11 @@

            As mentioned above, you can bring your tabs to life with a simple plugin. Here we have integrated all four variations of the tabs—default (top), right, bottom, left—with example tab areas.

            -
              -
            • Section 1
              • -
            • Section 2
              • -
            • Section 3
              • -
            • Section 4
              • +
              @@ -327,21 +327,21 @@
              -
                -
              • Section 1
                • -
              • Section 2
                • -
              • Section 3
                • +
                -
                +

                Section 1

                Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                -
                +

                Section 2

                Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                -
                +

                Section 3

                Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                @@ -350,21 +350,21 @@
                -
                  -
                • Section 1
                  • -
                • Section 2
                  • -
                • Section 3
                  • +
                  -
                  +

                  Section 1

                  Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                  -
                  +

                  Section 2

                  Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                  -
                  +

                  Section 3

                  Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                  @@ -375,24 +375,24 @@
                  -
                  +

                  Oh hai #1!

                  -
                  +

                  Oh hai #2!

                  -
                  +

                  Oh hai #3!

                  -
                  +

                  Oh hai #4!

                  -
                  @@ -733,25 +733,16 @@ Lorem ipsum dolar sit amet illo error ipsum verita - + + - - - - - - + + - + + + diff --git a/docs/index.html b/docs/index.html index 55a75b1bf6..81d7df41e6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -97,10 +97,10 @@
                • ·
                • - +
                @@ -233,35 +233,6 @@ - - - - - - - - - - - - - + - + \ No newline at end of file diff --git a/docs/javascript.html b/docs/javascript.html index acde34d46a..aed64d30ad 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -23,49 +23,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -839,16 +796,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) { - @@ -1040,5 +987,47 @@ $('#myCollapsible').on('hidden', function () {

                Icons from Glyphicons Free, licensed under CC BY 3.0.

                + + + + + + + + + + + + + + + + + + + diff --git a/docs/less.html b/docs/less.html index 52de8b6aac..13dfee282d 100644 --- a/docs/less.html +++ b/docs/less.html @@ -466,25 +466,9 @@ - - - - - + + - - - - - diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7431ae58b3..311a6954c9 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -64,34 +64,34 @@

                Default 940px grid

                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                -
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                +
                1
                -
                4
                -
                4
                -
                4
                +
                4
                +
                4
                +
                4
                -
                4
                -
                8
                +
                4
                +
                8
                -
                6
                -
                6
                +
                6
                +
                6
                -
                12
                +
                12
                @@ -358,7 +358,6 @@ -
                @@ -371,36 +370,11 @@ - - - - - - - + + - - - + - - + \ No newline at end of file diff --git a/docs/upgrading.html b/docs/upgrading.html index cd0ca8e22d..4dedb37d88 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -99,23 +99,7 @@
              • Added button bar options
              -
            • -
                -
              • -
              -
            - - - - - - -
            - - - - - - - - - - - - - - - From 5de1e39a8fba831faa170f46e868068fa069dd0e Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Thu, 22 Dec 2011 16:41:26 +1100 Subject: [PATCH 03/13] From #822 --- js/bootstrap-alert.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 90961cdd39..1ce8f01bff 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -39,6 +39,8 @@ , selector = $this.attr('data-target') || $this.attr('href') , $parent = $(selector) + $parent.trigger('close') + e && e.preventDefault() $parent.length || ($parent = $this.hasClass('alert-message') ? $this : $this.parent()) @@ -47,6 +49,8 @@ function removeElement() { $parent.remove() + + $parent.trigger('closed') } $.support.transition && $parent.hasClass('fade') ? From 2ebc0ad2ef13c4eb9ab2e7b57ff6ca661687ca4e Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Thu, 22 Dec 2011 16:47:42 +1100 Subject: [PATCH 04/13] Update docs to show available events on alert --- docs/javascript.html | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/javascript.html b/docs/javascript.html index bf27dd7f17..0bdcdc8ed5 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -750,6 +750,30 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

            .alert('close')

            Closes an alert.

            $(".alert-message").alert('close')
            +

            Events

            +

            Bootstrap's alert class exposes a few events for hooking into alert functionality.

            + + + + + + + + + + + + + + + + + +
            EventDescription
            closeThis event fires immediately when the close instance method is called.
            closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
            +
            +$('#my-alert').bind('closed', function () {
+  // do something ...
+})

            Demo

            × From 87ac818253a26bcf09fa55f78ae3f55759c54e64 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:10:32 -0800 Subject: [PATCH 05/13] change above below to top bottom and add "inside" placement option --- bootstrap.css | 18 +++++++++--------- bootstrap.min.css | 16 ++++++++-------- docs/javascript.html | 4 ++-- js/README.md | 2 +- js/bootstrap-twipsy.js | 29 +++++++++++++---------------- lib/mixins.less | 4 ++-- lib/popovers.less | 16 ++++++++-------- lib/twipsy.less | 18 +++++++++--------- 8 files changed, 52 insertions(+), 55 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6515b12b5f..ee80000c2b 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Dec 21 18:41:55 PST 2011 + * Date: Thu Dec 22 19:09:49 PST 2011 */ html, body { margin: 0; @@ -2366,19 +2366,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.8; opacity: 0.8; } -.twipsy.above { +.twipsy.top { margin-top: -2px; } .twipsy.right { margin-left: 2px; } -.twipsy.below { +.twipsy.bottom { margin-top: 2px; } .twipsy.left { margin-left: -2px; } -.twipsy.above .twipsy-arrow { +.twipsy.top .twipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -2394,7 +2394,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-bottom: 5px solid transparent; border-left: 5px solid #000000; } -.twipsy.below .twipsy-arrow { +.twipsy.bottom .twipsy-arrow { top: 0; left: 50%; margin-left: -5px; @@ -2434,19 +2434,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: none; padding: 5px; } -.popover.above { +.popover.top { margin-top: -5px; } .popover.right { margin-left: 5px; } -.popover.below { +.popover.bottom { margin-top: 5px; } .popover.left { margin-left: -5px; } -.popover.above .arrow { +.popover.top .arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -2462,7 +2462,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-bottom: 5px solid transparent; border-right: 5px solid #000000; } -.popover.below .arrow { +.popover.bottom .arrow { top: 0; left: 50%; margin-left: -5px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 4e4a1270ac..3f48b135eb 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -312,23 +312,23 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;} .twipsy{position:absolute;z-index:1000;display:block;visibility:visible;padding:5px;font-size:11px;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}.twipsy.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} -.twipsy.above{margin-top:-2px;} +.twipsy.top{margin-top:-2px;} .twipsy.right{margin-left:2px;} -.twipsy.below{margin-top:2px;} +.twipsy.bottom{margin-top:2px;} .twipsy.left{margin-left:-2px;} -.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.twipsy.top .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.twipsy.bottom .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .twipsy-inner{max-width:200px;padding:3px 8px;color:white;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .twipsy-arrow{position:absolute;width:0;height:0;} -.popover{position:absolute;top:0;left:0;z-index:1000;display:none;padding:5px;}.popover.above{margin-top:-5px;} +.popover{position:absolute;top:0;left:0;z-index:1000;display:none;padding:5px;}.popover.top{margin-top:-5px;} .popover.right{margin-left:5px;} -.popover.below{margin-top:5px;} +.popover.bottom{margin-top:5px;} .popover.left{margin-left:-5px;} -.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} .popover .inner{padding:3px;width:280px;overflow:hidden;background-color:#000000;background-color:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} diff --git a/docs/javascript.html b/docs/javascript.html index aed64d30ad..c9bb425a41 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -544,8 +544,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) { placement string - 'above' - how to position the tooltip - above | below | left | right + 'top' + how to position the tooltip - top | bottom | left | right selector diff --git a/js/README.md b/js/README.md index 0d8d163a28..2f8e1716f5 100644 --- a/js/README.md +++ b/js/README.md @@ -49,7 +49,7 @@ examples: backdrop: true keyboard: false - placement: 'above' + placement: 'top' --- diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 018edb97e5..21cf7d20b1 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -99,6 +99,7 @@ , show: function () { var $tip + , inside , pos , actualWidth , actualHeight @@ -113,12 +114,18 @@ $tip.addClass('fade') } + placement = typeof this.options.placement == 'function' ? + thing.call(this, $tip[0], this.$element[0]) : + this.options.placement + + inside = /in/.test(placement) + $tip .remove() .css({ top: 0, left: 0, display: 'block' }) - .prependTo(document.body) + .prependTo(inside ? this.$element : document.body) - pos = $.extend({}, this.$element.offset(), { + pos = $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { width: this.$element[0].offsetWidth , height: this.$element[0].offsetHeight }) @@ -126,13 +133,11 @@ actualWidth = $tip[0].offsetWidth actualHeight = $tip[0].offsetHeight - placement = maybeCall(this.options.placement, this, [ $tip[0], this.$element[0] ]) - - switch (placement) { - case 'below': + switch (inside ? placement.split(' ')[1] : placement) { + case 'bottom': tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} break - case 'above': + case 'top': tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} break case 'left': @@ -226,14 +231,6 @@ } - /* TWIPSY PRIVATE METHODS - * ====================== */ - - function maybeCall ( thing, ctx, args ) { - return typeof thing == 'function' ? thing.apply(ctx, args) : thing - } - - /* TWIPSY PLUGIN DEFINITION * ======================== */ @@ -253,7 +250,7 @@ animation: true , delay: 0 , selector: false - , placement: 'above' + , placement: 'top' , trigger: 'hover' , title: '' , template: '
            ' diff --git a/lib/mixins.less b/lib/mixins.less index 0effdfa37a..41cf8890d1 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -283,7 +283,7 @@ // Popover arrows // For tipsies and popovers #popoverArrow { - .above(@arrowWidth: 5px) { + .top(@arrowWidth: 5px) { bottom: 0; left: 50%; margin-left: -@arrowWidth; @@ -299,7 +299,7 @@ border-bottom: @arrowWidth solid transparent; border-left: @arrowWidth solid @black; } - .below(@arrowWidth: 5px) { + .bottom(@arrowWidth: 5px) { top: 0; left: 50%; margin-left: -@arrowWidth; diff --git a/lib/popovers.less b/lib/popovers.less index ff875eaffb..5ecde09233 100644 --- a/lib/popovers.less +++ b/lib/popovers.less @@ -8,14 +8,14 @@ z-index: 1000; display: none; padding: 5px; - &.above { margin-top: -5px; } - &.right { margin-left: 5px; } - &.below { margin-top: 5px; } - &.left { margin-left: -5px; } - &.above .arrow { #popoverArrow > .above(); } - &.right .arrow { #popoverArrow > .right(); } - &.below .arrow { #popoverArrow > .below(); } - &.left .arrow { #popoverArrow > .left(); } + &.top { margin-top: -5px; } + &.right { margin-left: 5px; } + &.bottom { margin-top: 5px; } + &.left { margin-left: -5px; } + &.top .arrow { #popoverArrow > .top(); } + &.right .arrow { #popoverArrow > .right(); } + &.bottom .arrow { #popoverArrow > .bottom(); } + &.left .arrow { #popoverArrow > .left(); } .arrow { position: absolute; width: 0; diff --git a/lib/twipsy.less b/lib/twipsy.less index 05f121a5dd..abd0599f4e 100644 --- a/lib/twipsy.less +++ b/lib/twipsy.less @@ -9,15 +9,15 @@ padding: 5px; font-size: 11px; .opacity(0); - &.in { .opacity(80); } - &.above { margin-top: -2px; } - &.right { margin-left: 2px; } - &.below { margin-top: 2px; } - &.left { margin-left: -2px; } - &.above .twipsy-arrow { #popoverArrow > .above(); } - &.left .twipsy-arrow { #popoverArrow > .left(); } - &.below .twipsy-arrow { #popoverArrow > .below(); } - &.right .twipsy-arrow { #popoverArrow > .right(); } + &.in { .opacity(80); } + &.top { margin-top: -2px; } + &.right { margin-left: 2px; } + &.bottom { margin-top: 2px; } + &.left { margin-left: -2px; } + &.top .twipsy-arrow { #popoverArrow > .top(); } + &.left .twipsy-arrow { #popoverArrow > .left(); } + &.bottom .twipsy-arrow { #popoverArrow > .bottom(); } + &.right .twipsy-arrow { #popoverArrow > .right(); } } .twipsy-inner { max-width: 200px; From 3396fc0542a5fbbed658a95f931472fc24feee56 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:17:41 -0800 Subject: [PATCH 06/13] check for prettyprint on window --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index c8e796a398..eae84b138f 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -17,7 +17,7 @@ $(function(){ // ================== // make code pretty - prettyPrint && prettyPrint() + window.prettyPrint && prettyPrint() // table sort example if ($.fn.tableSorter) { From 49fb910b11baef4ccfe9270479e8b9bf9e5e7731 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:25:29 -0800 Subject: [PATCH 07/13] more js cleanup after gnarly merge --- docs/base-css.html | 1 - docs/components.html | 28 ++++++++++++---------------- docs/scaffolding.html | 1 + 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 34e844df30..dad42381de 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1180,7 +1180,6 @@ Form states - diff --git a/docs/components.html b/docs/components.html index 26a657cb59..5b4e788f11 100644 --- a/docs/components.html +++ b/docs/components.html @@ -22,18 +22,6 @@ - - - - - - - - - - - - @@ -768,7 +756,7 @@

            -Lorem ipsum dolar sit amet illo error ipsum veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. Voluptasdicta eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt sed dicta quae accusantium fugit voluptas nemo voluptas voluptatem rem quae aut veritatis quasi quae. +Lorem ipsum dolar sit amet illo error ipsum veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. Voluptasdicta eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt sed dicta quae accusantium fugit voluptas nemo voluptas voluptatem rem quae aut veritatis quasi quae.

            @@ -811,9 +799,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita
            - - -
    • + + + + + + + + + + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dc35bd5775..0a46252ddb 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -375,5 +375,6 @@ + From ea2346197075a30f0200665fcd2836b217f33fb3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:28:58 -0800 Subject: [PATCH 08/13] fix unit test for twipsy --- js/tests/unit/bootstrap-twipsy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js index 7a88ab2f13..6623fc026e 100644 --- a/js/tests/unit/bootstrap-twipsy.js +++ b/js/tests/unit/bootstrap-twipsy.js @@ -30,10 +30,10 @@ $(function () { $.support.transition = false var twipsy = $('') .appendTo('#qunit-fixture') - .twipsy({placement: 'below'}) + .twipsy({placement: 'bottom'}) .twipsy('show') - ok($(".twipsy").hasClass('fade below in'), 'has correct classes applied') + ok($(".twipsy").hasClass('fade bottom in'), 'has correct classes applied') twipsy.twipsy('hide') }) From 3aba68f832e3406fcd6687ba4687cd339ae3b42d Mon Sep 17 00:00:00 2001 From: Purwandi Date: Fri, 23 Dec 2011 21:39:29 +0700 Subject: [PATCH 09/13] Fix id tabs on docs component --- docs/components.html | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/components.html b/docs/components.html index 5b4e788f11..c6a349ff49 100644 --- a/docs/components.html +++ b/docs/components.html @@ -358,20 +358,20 @@
    -
    +

    Section 1

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 2

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 3

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    @@ -381,20 +381,20 @@
    -
    +

    Section 1

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 2

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 3

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    @@ -405,24 +405,24 @@
    -
    +

    Oh hai #1!

    -
    +

    Oh hai #2!

    -
    +

    Oh hai #3!

    -
    +

    Oh hai #4!

    From 1a295491b275cf55187c913db311e807eda5e989 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 22:15:04 -0800 Subject: [PATCH 10/13] update docs for placement --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/javascript.html b/docs/javascript.html index e339004323..7c92ef06a1 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -635,7 +635,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { placement string 'right' - how to position the popover - above | below | left | right + how to position the popover - top | bottom | left | right selector From 076370f3f9076b177a1f9c8ba9f536faa1a58957 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 22:31:39 -0800 Subject: [PATCH 11/13] fix for linux --- Makefile | 3 +-- bootstrap.css | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1f38338f80..3d24eb1c52 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ VERSION=2.0.0 -DATE=$(shell DATE) BOOTSTRAP = ./bootstrap.css BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less @@ -9,7 +8,7 @@ WATCHR ?= `which watchr` build: @@if test ! -z ${LESS_COMPESSOR}; then \ - sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ + sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \ rm -f ${BOOTSTRAP_LESS}.tmp; \ diff --git a/bootstrap.css b/bootstrap.css index eb7b656783..333d6f04c0 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. -<<<<<<< HEAD - * Date: Thu Dec 22 19:09:49 PST 2011 -======= - * Date: Wed Dec 21 18:38:56 CST 2011 ->>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c + * Date: Sat Dec 24 22:30:43 PST 2011 */ html, body { margin: 0; From 823d89dbb23511b7ee929ddbd62661be751429d6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 22:56:01 -0800 Subject: [PATCH 12/13] move position of twipsy into getPosition so it can easily be extended for svg use --- js/bootstrap-twipsy.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 21cf7d20b1..2651e38226 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -125,10 +125,7 @@ .css({ top: 0, left: 0, display: 'block' }) .prependTo(inside ? this.$element : document.body) - pos = $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) + pos = this.getPosition(inside) actualWidth = $tip[0].offsetWidth actualHeight = $tip[0].offsetHeight @@ -187,6 +184,13 @@ return this.getTitle() } + , getPosition: function (inside) { + return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { + width: this.$element[0].offsetWidth + , height: this.$element[0].offsetHeight + }) + } + , getTitle: function () { var title , $e = this.$element From 12868933b9141ff9c63277efe36665cc7a8815df Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 23:06:16 -0800 Subject: [PATCH 13/13] clean up dead elements in firefox (which is droping transitionEnd events :( --- js/bootstrap-twipsy.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 2651e38226..a176f09088 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -164,13 +164,20 @@ $tip.removeClass('in') - function removeElement () { - $tip.remove() + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).remove() + }, 500) + + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.remove() + }) } $.support.transition && this.$tip.hasClass('fade') ? - $tip.on($.support.transition.end, removeElement) : - removeElement() + removeWithAnimation() : + $tip.remove() } , fixTitle: function () {