Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Bootstrap 4.0.0.alpha6 #1776

Closed
wants to merge 12 commits into from
Closed

Upgrade to Bootstrap 4.0.0.alpha6 #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f7298c9
Upgrade bootstrap to v4.0.0-alpha.6
jhawthorn Mar 31, 2017
8954224
Fix breadcrumbs
jhawthorn Mar 16, 2017
e6f5f93
Fix table spacing
jhawthorn Mar 30, 2017
42bc6a6
Replace boostrap's col-xs-N with col-N
jhawthorn Mar 30, 2017
5256e1f
Disable bootstrap transitions
jhawthorn Mar 16, 2017
8914af0
Disable animations on tooltips
jhawthorn Mar 17, 2017
25065ec
Fix colours on tooltips
jhawthorn Mar 17, 2017
45ea284
Simplify link_to_with_icon
jhawthorn Mar 17, 2017
3dd7b22
Only auto add with-tip when :no_text specified
jhawthorn Mar 17, 2017
2d73f0c
Fix number_with_currency
jhawthorn Mar 30, 2017
035d147
Fix font sizes and padding
jhawthorn Mar 30, 2017
affa680
Fix layout padding?
jhawthorn Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backend/app/assets/javascripts/spree/backend/components/tooltips.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...ts/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ...sets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}>
Expand Down
4 changes: 2 additions & 2 deletions backend/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading