Merge pull request #1816 from jhawthorn/bootstrap-4-0-0-alpha6

Upgrade to Bootstrap 4.0.0.alpha6
solidusio · Apr 5, 2017 · f6b660d · f6b660d
2 parents 55c4eba + 4842050
commit f6b660d
Show file tree

Hide file tree

Showing 191 changed files with 5,417 additions and 5,085 deletions.
diff --git a/backend/app/assets/javascripts/spree/backend/components/tooltips.js b/backend/app/assets/javascripts/spree/backend/components/tooltips.js
@@ -1,7 +1,8 @@
 $(function(){
   $('body').popover({selector: '.hint-tooltip', html: true, trigger: 'hover', placement: 'top'});
 
-  $('body').tooltip({selector: '.with-tip'});
+  /* Animation has to be off to work around a bug in bootstrap 4.0.0.alpha6 */
+  $('body').tooltip({selector: '.with-tip', animation: false});
 
   /*
    * Poll tooltips to hide them if they are no longer being hovered.

diff --git a/...ts/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs b/...ts/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs
@@ -1,13 +1,13 @@
 <div class="fullwidth tier">
   <div class="row">
-    <div class="col-xs-6">
+    <div class="col-6">
       <a class="fa fa-trash remove js-remove-tier"></a>
       <div class="input-group">
         <span class="input-group-addon">$</span>
         <input class="js-base-input form-control" type="text" value={{baseField.value}}>
       </div>
     </div>
-    <div class="col-xs-6">
+    <div class="col-6">
       <div class="input-group">
         <span class="input-group-addon">$</span>
         <input class="js-value-input form-control"

diff --git a/...sets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs b/...sets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs
@@ -1,13 +1,13 @@
 <div class="fullwidth tier">
   <a class="fa fa-trash remove js-remove-tier"></a>
   <div class="row">
-    <div class="col-xs-6">
+    <div class="col-6">
       <div class="input-group">
         <span class="input-group-addon">$</span>
         <input class="js-base-input form-control" type="text" value={{baseField.value}}>
       </div>
     </div>
-    <div class="col-xs-6">
+    <div class="col-6">
       <div class="input-group">
         <input class="js-value-input form-control right-align"
           name="{{valueField.name}}" type="text" value={{valueField.value}}>

diff --git a/backend/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs b/backend/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs
@@ -1,9 +1,9 @@
 <div class="fullwidth promo-rule-option-value">
   <div class="row">
-    <div class="col-xs-6">
+    <div class="col-6">
       <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
     </div>
-    <div class="col-xs-5">
+    <div class="col-5">
       <input class="js-promo-rule-option-value-option-values-select fullwidth" name="{{ paramPrefix }}[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
     </div>
   </div>