From f5ee26fc989b39f6ad8f623083140a070482ebb7 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 21 Jul 2014 20:11:45 +0200 Subject: [PATCH] rake convert --- assets/javascripts/bootstrap.js | 16 ++-------------- assets/javascripts/bootstrap/button.js | 16 ++-------------- assets/stylesheets/bootstrap/_forms.scss | 1 + assets/stylesheets/bootstrap/_tables.scss | 6 ++++++ assets/stylesheets/bootstrap/_theme.scss | 2 ++ assets/stylesheets/bootstrap/_utilities.scss | 1 - assets/stylesheets/bootstrap/_variables.scss | 6 +++--- lib/bootstrap-sass/version.rb | 2 +- 8 files changed, 17 insertions(+), 33 deletions(-) diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index a7870a9c..f1c50206 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -333,15 +333,6 @@ } - // FOCUS SHIM (FOR BUTTON GROUPS) - // ============================== - - function getBtnTarget(target) { - var $target = $(target) - return $target.hasClass('btn') ? $target : $target.parent('.btn') - } - - // BUTTON DATA-API // =============== @@ -352,11 +343,8 @@ Plugin.call($btn, 'toggle') e.preventDefault() }) - .on('focus.bs.button.data-api', '[data-toggle^="button"]', function (e) { - getBtnTarget(e.target).addClass('focus') - }) - .on('blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { - getBtnTarget(e.target).removeClass('focus') + .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { + $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus') }) }(jQuery); diff --git a/assets/javascripts/bootstrap/button.js b/assets/javascripts/bootstrap/button.js index 7e2a6e4e..b3e944c5 100644 --- a/assets/javascripts/bootstrap/button.js +++ b/assets/javascripts/bootstrap/button.js @@ -97,15 +97,6 @@ } - // FOCUS SHIM (FOR BUTTON GROUPS) - // ============================== - - function getBtnTarget(target) { - var $target = $(target) - return $target.hasClass('btn') ? $target : $target.parent('.btn') - } - - // BUTTON DATA-API // =============== @@ -116,11 +107,8 @@ Plugin.call($btn, 'toggle') e.preventDefault() }) - .on('focus.bs.button.data-api', '[data-toggle^="button"]', function (e) { - getBtnTarget(e.target).addClass('focus') - }) - .on('blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { - getBtnTarget(e.target).removeClass('focus') + .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { + $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus') }) }(jQuery); diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index ff008a81..c94cb76f 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_forms.scss @@ -337,6 +337,7 @@ input[type="checkbox"] { height: $input-height-base; line-height: $input-height-base; text-align: center; + pointer-events: none; } .input-lg + .form-control-feedback { width: $input-height-large; diff --git a/assets/stylesheets/bootstrap/_tables.scss b/assets/stylesheets/bootstrap/_tables.scss index be88fc40..6d925140 100644 --- a/assets/stylesheets/bootstrap/_tables.scss +++ b/assets/stylesheets/bootstrap/_tables.scss @@ -6,6 +6,12 @@ table { background-color: $table-bg; } +caption { + padding-top: $table-cell-padding; + padding-bottom: $table-cell-padding; + color: $text-muted; + text-align: left; +} th { text-align: left; } diff --git a/assets/stylesheets/bootstrap/_theme.scss b/assets/stylesheets/bootstrap/_theme.scss index 00386a28..266ad310 100644 --- a/assets/stylesheets/bootstrap/_theme.scss +++ b/assets/stylesheets/bootstrap/_theme.scss @@ -116,6 +116,7 @@ $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); @include box-shadow($shadow); + .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 box-shadow(inset 0 3px 9px rgba(0,0,0,.075)); @@ -131,6 +132,7 @@ @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg); @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered + .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 box-shadow(inset 0 3px 9px rgba(0,0,0,.25)); diff --git a/assets/stylesheets/bootstrap/_utilities.scss b/assets/stylesheets/bootstrap/_utilities.scss index 3ad5f2ee..85cb62ea 100644 --- a/assets/stylesheets/bootstrap/_utilities.scss +++ b/assets/stylesheets/bootstrap/_utilities.scss @@ -53,5 +53,4 @@ .affix { position: fixed; - @include translate3d(0, 0, 0); } diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 8cdc824f..7fb9ff0a 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -1,4 +1,4 @@ -// When true, asset path helpers are used, otherwise regular url() is used +// When true, asset path helpers are used, otherwise regular `url()`` is used. // When there no function is defined, `fn('')` is parsed as string that equals the right hand side // NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path) $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default; @@ -12,7 +12,7 @@ $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("") // //## Gray and brand colors for use across Bootstrap. -$gray-base: #000 !default; +$gray-base: #000 !default; $gray-darker: lighten($gray-base, 13.5%) !default; // #222 $gray-dark: lighten($gray-base, 20%) !default; // #333 $gray: lighten($gray-base, 33.5%) !default; // #555 @@ -196,7 +196,7 @@ $input-border-radius: $border-radius-base !default; $input-border-focus: #66afe9 !default; //** Placeholder text color -$input-color-placeholder: $gray-light !default; +$input-color-placeholder: #999 !default; //** Default `.form-control` height $input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default; diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 58dd9efa..0da30095 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.2.0.0' - BOOTSTRAP_SHA = 'c3ae289f4a9e5fc14e489e3914d150954469f1ac' + BOOTSTRAP_SHA = '49519e981614fb8e0c4fabcbb0a632db292c2b3c' end