Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (19) and others # Via Manuel Raynaud (8) and others * 'master' of https://github.com/thelia/thelia: (47 commits) tax engine tax engine - Add orders view route - Add view & action for orders index Removed a redondant "use" Add tooltip - Add creation address form - Add addresses list - Add update address form Added process_assets config variable Change breadcrumb separator color Add breadcrumb to customers view - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification syntax use ROUTER::ABSOLUTE_URL by default PSE loop todo currency management in PSE loop Add customer view finish Add modal for create/delete customer Update body background fixed typo searching route return relative path pse loop currency ... Conflicts: core/lib/Thelia/Controller/Admin/CouponController.php core/lib/Thelia/Core/Event/TheliaEvents.php web/index_dev.php
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 49 KiB |
@@ -69,6 +69,11 @@
|
||||
|
||||
}
|
||||
|
||||
// -- Bootstrap tooltip --
|
||||
if($('[rel="tooltip"]').length){
|
||||
$('[rel="tooltip"]').tooltip();
|
||||
}
|
||||
|
||||
// -- Confirm Box --
|
||||
if($('[data-toggle="confirm"]').length){
|
||||
$('[data-toggle="confirm"]').click(function(e){
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
// -------------------------
|
||||
|
||||
body {
|
||||
background: url("@{imgDir}/bg.jpg") repeat;
|
||||
background: #FFF url("@{imgDir}/bg.jpg") top left no-repeat;
|
||||
background-size: cover;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -49,5 +49,8 @@
|
||||
// Forms
|
||||
// -------------------------
|
||||
|
||||
@input-border-focus: @link-color;
|
||||
|
||||
@input-border-focus: @link-color;
|
||||
// Breadcrumbs
|
||||
// -------------------------
|
||||
@breadcrumb-color: #333;
|
||||
Reference in New Issue
Block a user