diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-10-28 06:01:42 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-10-28 06:01:42 +0300 |
commit | fb65c6a1376d0075b19d29c1fe6e6d364e6b10c2 (patch) | |
tree | 31df6ac63542cfdf565a16f4dcf88179e6876a3f /assets | |
parent | 3d33a2266188389654ed6bbd418a19a3ad32fa70 (diff) |
rake convert
Diffstat (limited to 'assets')
-rw-r--r-- | assets/javascripts/bootstrap.js | 64 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/popover.js | 14 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/scrollspy.js | 16 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/tab.js | 17 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 17 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_button-groups.scss | 1 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_glyphicons.scss | 3 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_media.scss | 63 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_progress-bars.scss | 13 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_scaffolding.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_tables.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_theme.scss | 16 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 2 |
13 files changed, 133 insertions, 97 deletions
diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index f7a81ed..273a02d 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -1021,9 +1021,15 @@ $active .removeClass('active') .find('> .dropdown-menu > .active') - .removeClass('active') + .removeClass('active') + .end() + .find('[data-toggle="tab"]') + .attr('aria-expanded', false) - element.addClass('active') + element + .addClass('active') + .find('[data-toggle="tab"]') + .attr('aria-expanded', true) if (transition) { element[0].offsetWidth // reflow for transition @@ -1033,7 +1039,12 @@ } if (element.parent('.dropdown-menu')) { - element.closest('li.dropdown').addClass('active') + element + .closest('li.dropdown') + .addClass('active') + .end() + .find('[data-toggle="tab"]') + .attr('aria-expanded', true) } callback && callback() @@ -1214,7 +1225,6 @@ return ($href && $href.length && $href.is(':visible') - && $el.is(':visible') && [[$href[offsetMethod]().top + offsetBase, href]]) || null }) .sort(function (a, b) { return a[0] - b[0] }) @@ -1241,8 +1251,9 @@ return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) } - if (activeTarget && scrollTop <= offsets[0]) { - return activeTarget != (i = targets[0]) && this.activate(i) + if (activeTarget && scrollTop < offsets[0]) { + this.activeTarget = null + return this.clear() } for (i = offsets.length; i--;) { @@ -1256,9 +1267,7 @@ ScrollSpy.prototype.activate = function (target) { this.activeTarget = target - $(this.selector) - .parentsUntil(this.options.target, '.active') - .removeClass('active') + this.clear() var selector = this.selector + '[data-target="' + target + '"],' + @@ -1277,6 +1286,12 @@ active.trigger('activate.bs.scrollspy') } + ScrollSpy.prototype.clear = function () { + $(this.selector) + .parentsUntil(this.options.target, '.active') + .removeClass('active') + } + // SCROLLSPY PLUGIN DEFINITION // =========================== @@ -1810,8 +1825,11 @@ this.applyPlacement(calculatedOffset, placement) var complete = function () { + var prevHoverState = that.hoverState that.$element.trigger('shown.bs.' + that.type) that.hoverState = null + + if (prevHoverState == 'out') that.leave(that) } $.support.transition && this.$tip.hasClass('fade') ? @@ -2045,12 +2063,18 @@ function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + var selector = options && options.selector if (!data && option == 'destroy') return - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (selector) { + if (!data) $this.data('bs.tooltip', (data = {})) + if (!data[selector]) data[selector] = new Tooltip(this, options) + } else { + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + } if (typeof option == 'string') data[option]() }) } @@ -2159,12 +2183,18 @@ function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + var selector = options && options.selector if (!data && option == 'destroy') return - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (selector) { + if (!data) $this.data('bs.popover', (data = {})) + if (!data[selector]) data[selector] = new Popover(this, options) + } else { + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + } if (typeof option == 'string') data[option]() }) } diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js index 87b8d12..c69be71 100644 --- a/assets/javascripts/bootstrap/popover.js +++ b/assets/javascripts/bootstrap/popover.js @@ -86,12 +86,18 @@ function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + var selector = options && options.selector if (!data && option == 'destroy') return - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (selector) { + if (!data) $this.data('bs.popover', (data = {})) + if (!data[selector]) data[selector] = new Popover(this, options) + } else { + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + } if (typeof option == 'string') data[option]() }) } diff --git a/assets/javascripts/bootstrap/scrollspy.js b/assets/javascripts/bootstrap/scrollspy.js index 841df18..430b5d6 100644 --- a/assets/javascripts/bootstrap/scrollspy.js +++ b/assets/javascripts/bootstrap/scrollspy.js @@ -65,7 +65,6 @@ return ($href && $href.length && $href.is(':visible') - && $el.is(':visible') && [[$href[offsetMethod]().top + offsetBase, href]]) || null }) .sort(function (a, b) { return a[0] - b[0] }) @@ -92,8 +91,9 @@ return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) } - if (activeTarget && scrollTop <= offsets[0]) { - return activeTarget != (i = targets[0]) && this.activate(i) + if (activeTarget && scrollTop < offsets[0]) { + this.activeTarget = null + return this.clear() } for (i = offsets.length; i--;) { @@ -107,9 +107,7 @@ ScrollSpy.prototype.activate = function (target) { this.activeTarget = target - $(this.selector) - .parentsUntil(this.options.target, '.active') - .removeClass('active') + this.clear() var selector = this.selector + '[data-target="' + target + '"],' + @@ -128,6 +126,12 @@ active.trigger('activate.bs.scrollspy') } + ScrollSpy.prototype.clear = function () { + $(this.selector) + .parentsUntil(this.options.target, '.active') + .removeClass('active') + } + // SCROLLSPY PLUGIN DEFINITION // =========================== diff --git a/assets/javascripts/bootstrap/tab.js b/assets/javascripts/bootstrap/tab.js index c597d7a..dd307a4 100644 --- a/assets/javascripts/bootstrap/tab.js +++ b/assets/javascripts/bootstrap/tab.js @@ -71,9 +71,15 @@ $active .removeClass('active') .find('> .dropdown-menu > .active') - .removeClass('active') + .removeClass('active') + .end() + .find('[data-toggle="tab"]') + .attr('aria-expanded', false) - element.addClass('active') + element + .addClass('active') + .find('[data-toggle="tab"]') + .attr('aria-expanded', true) if (transition) { element[0].offsetWidth // reflow for transition @@ -83,7 +89,12 @@ } if (element.parent('.dropdown-menu')) { - element.closest('li.dropdown').addClass('active') + element + .closest('li.dropdown') + .addClass('active') + .end() + .find('[data-toggle="tab"]') + .attr('aria-expanded', true) } callback && callback() diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index 944586a..6af0e7d 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -207,8 +207,11 @@ this.applyPlacement(calculatedOffset, placement) var complete = function () { + var prevHoverState = that.hoverState that.$element.trigger('shown.bs.' + that.type) that.hoverState = null + + if (prevHoverState == 'out') that.leave(that) } $.support.transition && this.$tip.hasClass('fade') ? @@ -442,12 +445,18 @@ function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + var selector = options && options.selector if (!data && option == 'destroy') return - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (selector) { + if (!data) $this.data('bs.tooltip', (data = {})) + if (!data[selector]) data[selector] = new Tooltip(this, options) + } else { + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + } if (typeof option == 'string') data[option]() }) } diff --git a/assets/stylesheets/bootstrap/_button-groups.scss b/assets/stylesheets/bootstrap/_button-groups.scss index 2b62402..9bfa085 100644 --- a/assets/stylesheets/bootstrap/_button-groups.scss +++ b/assets/stylesheets/bootstrap/_button-groups.scss @@ -198,7 +198,6 @@ } - // Justified button groups // ---------------------- diff --git a/assets/stylesheets/bootstrap/_glyphicons.scss b/assets/stylesheets/bootstrap/_glyphicons.scss index c508835..5486eaa 100644 --- a/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/assets/stylesheets/bootstrap/_glyphicons.scss @@ -33,7 +33,8 @@ // Individual icons .glyphicon-asterisk { &:before { content: "\2a"; } } .glyphicon-plus { &:before { content: "\2b"; } } -.glyphicon-euro { &:before { content: "\20ac"; } } +.glyphicon-euro, +.glyphicon-eur { &:before { content: "\20ac"; } } .glyphicon-minus { &:before { content: "\2212"; } } .glyphicon-cloud { &:before { content: "\2601"; } } .glyphicon-envelope { &:before { content: "\2709"; } } diff --git a/assets/stylesheets/bootstrap/_media.scss b/assets/stylesheets/bootstrap/_media.scss index 5ad22cd..292e98d 100644 --- a/assets/stylesheets/bootstrap/_media.scss +++ b/assets/stylesheets/bootstrap/_media.scss @@ -1,54 +1,45 @@ -// Media objects -// Source: http://stubbornella.org/content/?p=497 -// -------------------------------------------------- +.media { + // Proper spacing between instances of .media + margin-top: 15px; + + &:first-child { + margin-top: 0; + } +} +.media-right, +.media > .pull-right { + padding-left: 10px; +} -// Common styles -// ------------------------- +.media-left, +.media > .pull-left { + padding-right: 10px; +} -// Clear the floats -.media, +.media-left, +.media-right, .media-body { - overflow: hidden; - zoom: 1; + display: table-cell; + vertical-align: top; } -// Proper spacing between instances of .media -.media, -.media .media { - margin-top: 15px; -} -.media:first-child { - margin-top: 0; +.media-middle { + vertical-align: middle; } -// For images and videos, set to block -.media-object { - display: block; +.media-bottom { + vertical-align: bottom; } // Reset margins on headings for tighter default spacing .media-heading { - margin: 0 0 5px; -} - - -// Media image alignment -// ------------------------- - -.media { - > .pull-left { - margin-right: 10px; - } - > .pull-right { - margin-left: 10px; - } + margin-top: 0; + margin-bottom: 5px; } - // Media list variation -// ------------------------- - +// // Undo default ul/ol styles .media-list { padding-left: 0; diff --git a/assets/stylesheets/bootstrap/_progress-bars.scss b/assets/stylesheets/bootstrap/_progress-bars.scss index 09ddfd3..343df63 100644 --- a/assets/stylesheets/bootstrap/_progress-bars.scss +++ b/assets/stylesheets/bootstrap/_progress-bars.scss @@ -19,7 +19,6 @@ } - // Bar itself // ------------------------- @@ -67,18 +66,6 @@ @include animation(progress-bar-stripes 2s linear infinite); } -// Account for lower percentages -.progress-bar { - &[aria-valuenow="0"] { - color: $gray-light; - min-width: 30px; - background-color: transparent; - background-image: none; - box-shadow: none; - } -} - - // Variations // ------------------------- diff --git a/assets/stylesheets/bootstrap/_scaffolding.scss b/assets/stylesheets/bootstrap/_scaffolding.scss index f185d41..626e5eb 100644 --- a/assets/stylesheets/bootstrap/_scaffolding.scss +++ b/assets/stylesheets/bootstrap/_scaffolding.scss @@ -52,7 +52,7 @@ a { &:hover, &:focus { color: $link-hover-color; - text-decoration: underline; + text-decoration: $link-hover-decoration; } &:focus { diff --git a/assets/stylesheets/bootstrap/_tables.scss b/assets/stylesheets/bootstrap/_tables.scss index 5129b12..a575ff1 100644 --- a/assets/stylesheets/bootstrap/_tables.scss +++ b/assets/stylesheets/bootstrap/_tables.scss @@ -170,7 +170,7 @@ table { .table-responsive { overflow-x: auto; - min-height: 0%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) + min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) @media screen and (max-width: $screen-xs-max) { width: 100%; diff --git a/assets/stylesheets/bootstrap/_theme.scss b/assets/stylesheets/bootstrap/_theme.scss index 1efdd07..5a6fcaf 100644 --- a/assets/stylesheets/bootstrap/_theme.scss +++ b/assets/stylesheets/bootstrap/_theme.scss @@ -7,7 +7,6 @@ @import "mixins"; - // // Buttons // -------------------------------------------------- @@ -28,6 +27,10 @@ &.active { @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } + + .badge { + text-shadow: none; + } } // Mixin for generating new styles @@ -74,7 +77,6 @@ .btn-danger { @include btn-styles($btn-danger-bg); } - // // Images // -------------------------------------------------- @@ -85,7 +87,6 @@ } - // // Dropdowns // -------------------------------------------------- @@ -103,7 +104,6 @@ } - // // Navbar // -------------------------------------------------- @@ -118,7 +118,7 @@ .navbar-nav > .open > a, .navbar-nav > .active > a { - @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%)); + @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%)); @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075)); } } @@ -134,7 +134,7 @@ .navbar-nav > .open > a, .navbar-nav > .active > a { - @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%)); + @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%)); @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25)); } @@ -152,7 +152,6 @@ } - // // Alerts // -------------------------------------------------- @@ -177,7 +176,6 @@ .alert-danger { @include alert-styles($alert-danger-bg); } - // // Progress bars // -------------------------------------------------- @@ -223,7 +221,6 @@ } - // // Panels // -------------------------------------------------- @@ -247,7 +244,6 @@ .panel-danger > .panel-heading { @include panel-heading-styles($panel-danger-heading-bg); } - // // Wells // -------------------------------------------------- diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 3d0a2c6..e0f09e1 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -39,6 +39,8 @@ $text-color: $gray-dark !default; $link-color: $brand-primary !default; //** Link hover color set via `darken()` function. $link-hover-color: darken($link-color, 15%) !default; +//** Link hover decoration. +$link-hover-decoration: underline !default; //== Typography |