From 018c0b924824b9f5e33a4e3b6978235576b8647b Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 2 Nov 2013 02:34:48 +0100 Subject: [PATCH] rake convert --- lib/bootstrap-sass/version.rb | 2 +- vendor/assets/javascripts/bootstrap/affix.js | 2 +- vendor/assets/javascripts/bootstrap/alert.js | 2 +- vendor/assets/javascripts/bootstrap/button.js | 2 +- vendor/assets/javascripts/bootstrap/carousel.js | 2 +- vendor/assets/javascripts/bootstrap/collapse.js | 2 +- vendor/assets/javascripts/bootstrap/dropdown.js | 2 +- vendor/assets/javascripts/bootstrap/modal.js | 2 +- vendor/assets/javascripts/bootstrap/popover.js | 2 +- vendor/assets/javascripts/bootstrap/scrollspy.js | 2 +- vendor/assets/javascripts/bootstrap/tab.js | 2 +- vendor/assets/javascripts/bootstrap/tooltip.js | 2 +- vendor/assets/javascripts/bootstrap/transition.js | 2 +- vendor/assets/stylesheets/bootstrap/_panels.scss | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index d48d6300..7a1e1a9d 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.0.1.0.rc' - BOOTSTRAP_SHA = '867e2bef8d9c9b901022899227b306a532f5baf3' + BOOTSTRAP_SHA = 'ea3c89189a6b922c08729857006713de209b66d8' end diff --git a/vendor/assets/javascripts/bootstrap/affix.js b/vendor/assets/javascripts/bootstrap/affix.js index a75a46db..c7910373 100644 --- a/vendor/assets/javascripts/bootstrap/affix.js +++ b/vendor/assets/javascripts/bootstrap/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.0.0 + * Bootstrap: affix.js v3.0.1 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/alert.js b/vendor/assets/javascripts/bootstrap/alert.js index 73372e4f..25bc67c2 100644 --- a/vendor/assets/javascripts/bootstrap/alert.js +++ b/vendor/assets/javascripts/bootstrap/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.0.0 + * Bootstrap: alert.js v3.0.1 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/button.js b/vendor/assets/javascripts/bootstrap/button.js index 44c101a2..8a518cb0 100644 --- a/vendor/assets/javascripts/bootstrap/button.js +++ b/vendor/assets/javascripts/bootstrap/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.0.0 + * Bootstrap: button.js v3.0.1 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/carousel.js b/vendor/assets/javascripts/bootstrap/carousel.js index cf7baf2a..8c580b81 100644 --- a/vendor/assets/javascripts/bootstrap/carousel.js +++ b/vendor/assets/javascripts/bootstrap/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.0.0 + * Bootstrap: carousel.js v3.0.1 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/collapse.js b/vendor/assets/javascripts/bootstrap/collapse.js index beb04772..c89de982 100644 --- a/vendor/assets/javascripts/bootstrap/collapse.js +++ b/vendor/assets/javascripts/bootstrap/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.0.0 + * Bootstrap: collapse.js v3.0.1 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/dropdown.js b/vendor/assets/javascripts/bootstrap/dropdown.js index e45d51c2..5680791c 100644 --- a/vendor/assets/javascripts/bootstrap/dropdown.js +++ b/vendor/assets/javascripts/bootstrap/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.0.0 + * Bootstrap: dropdown.js v3.0.1 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/modal.js b/vendor/assets/javascripts/bootstrap/modal.js index b5b56016..d5e11296 100644 --- a/vendor/assets/javascripts/bootstrap/modal.js +++ b/vendor/assets/javascripts/bootstrap/modal.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: modal.js v3.0.0 + * Bootstrap: modal.js v3.0.1 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/popover.js b/vendor/assets/javascripts/bootstrap/popover.js index d5cd02e5..f2ba5be0 100644 --- a/vendor/assets/javascripts/bootstrap/popover.js +++ b/vendor/assets/javascripts/bootstrap/popover.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: popover.js v3.0.0 + * Bootstrap: popover.js v3.0.1 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/scrollspy.js b/vendor/assets/javascripts/bootstrap/scrollspy.js index c88eaad9..19ed6fcd 100644 --- a/vendor/assets/javascripts/bootstrap/scrollspy.js +++ b/vendor/assets/javascripts/bootstrap/scrollspy.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.0.0 + * Bootstrap: scrollspy.js v3.0.1 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/tab.js b/vendor/assets/javascripts/bootstrap/tab.js index 7aff6130..87dae645 100644 --- a/vendor/assets/javascripts/bootstrap/tab.js +++ b/vendor/assets/javascripts/bootstrap/tab.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tab.js v3.0.0 + * Bootstrap: tab.js v3.0.1 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/javascripts/bootstrap/tooltip.js b/vendor/assets/javascripts/bootstrap/tooltip.js index 41375c6c..68078d05 100644 --- a/vendor/assets/javascripts/bootstrap/tooltip.js +++ b/vendor/assets/javascripts/bootstrap/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.0.0 + * Bootstrap: tooltip.js v3.0.1 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== diff --git a/vendor/assets/javascripts/bootstrap/transition.js b/vendor/assets/javascripts/bootstrap/transition.js index d3a7abff..bf6c7329 100644 --- a/vendor/assets/javascripts/bootstrap/transition.js +++ b/vendor/assets/javascripts/bootstrap/transition.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: transition.js v3.0.0 + * Bootstrap: transition.js v3.0.1 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2013 Twitter, Inc. diff --git a/vendor/assets/stylesheets/bootstrap/_panels.scss b/vendor/assets/stylesheets/bootstrap/_panels.scss index 3cb03e11..44abf258 100644 --- a/vendor/assets/stylesheets/bootstrap/_panels.scss +++ b/vendor/assets/stylesheets/bootstrap/_panels.scss @@ -96,7 +96,7 @@ border-bottom: 1px solid transparent; @include border-top-radius($panel-border-radius - 1); - & > .dropdown .dropdown-toggle { + > .dropdown .dropdown-toggle { color: inherit; } }