diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-19 12:52:57 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-19 12:52:57 +0400 |
| commit | 61b2e6632af7db5c08311729a4b7062d9ed77760 (patch) | |
| tree | 1aceb986013d6207d36d545c2f3d10057939c152 /assets | |
| parent | 0d539a9aebea3ac9c332346b1233419935943412 (diff) | |
rake convert
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/javascripts/bootstrap.js | 10 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 10 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_progress-bars.scss | 2 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 2 |
4 files changed, 5 insertions, 19 deletions
diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index 9375499..e7db313 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -1780,7 +1780,7 @@ var parentDim = this.getPosition($parent) placement = placement == 'bottom' && pos.top + pos.height + actualHeight - parentDim.scroll > parentDim.height ? 'top' : - placement == 'top' && pos.top - parentDim.scroll - actualHeight < 0 ? 'bottom' : + placement == 'top' && pos.top - parentDim.scroll - actualHeight < parentDim.top ? 'bottom' : placement == 'right' && pos.right + actualWidth > parentDim.width ? 'left' : placement == 'left' && pos.left - actualWidth < parentDim.left ? 'right' : placement @@ -1995,14 +1995,6 @@ return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) } - Tooltip.prototype.validate = function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - Tooltip.prototype.enable = function () { this.enabled = true } diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index 614f414..9932c0b 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -192,7 +192,7 @@ var parentDim = this.getPosition($parent) placement = placement == 'bottom' && pos.top + pos.height + actualHeight - parentDim.scroll > parentDim.height ? 'top' : - placement == 'top' && pos.top - parentDim.scroll - actualHeight < 0 ? 'bottom' : + placement == 'top' && pos.top - parentDim.scroll - actualHeight < parentDim.top ? 'bottom' : placement == 'right' && pos.right + actualWidth > parentDim.width ? 'left' : placement == 'left' && pos.left - actualWidth < parentDim.left ? 'right' : placement @@ -407,14 +407,6 @@ return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) } - Tooltip.prototype.validate = function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - Tooltip.prototype.enable = function () { this.enabled = true } diff --git a/assets/stylesheets/bootstrap/_progress-bars.scss b/assets/stylesheets/bootstrap/_progress-bars.scss index a1ce084..09ddfd3 100644 --- a/assets/stylesheets/bootstrap/_progress-bars.scss +++ b/assets/stylesheets/bootstrap/_progress-bars.scss @@ -29,7 +29,7 @@ height: $line-height-computed; margin-bottom: $line-height-computed; background-color: $progress-bg; - border-radius: $border-radius-base; + border-radius: $progress-border-radius; @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); } diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 1c09f22..d2e0d4a 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -642,6 +642,8 @@ $alert-danger-border: $state-danger-border !default; $progress-bg: #f5f5f5 !default; //** Progress bar text color $progress-bar-color: #fff !default; +//** Variable for setting rounded corners on progress bar. +$progress-border-radius: $border-radius-base !default; //** Default progress bar color $progress-bar-bg: $brand-primary !default; |