diff --git a/core/modules/tour/css/tour.module.css b/core/modules/tour/css/tour.module.css
index 73bd315..2cf025a 100644
--- a/core/modules/tour/css/tour.module.css
+++ b/core/modules/tour/css/tour.module.css
@@ -47,7 +47,7 @@
}
/* JoyRide Styles. */
-#joyRideTipContent {
+.joyride-list {
display: none;
}
@@ -127,6 +127,10 @@
margin: 0 0 1.4em;
}
+.joyride-tip-guide a.button {
+ margin-left: 0;
+}
+
.joyride-timer-indicator-wrap {
width: 50px;
height: 3px;
@@ -173,6 +177,7 @@
left: 0;
}
+/* Use empty namespace for zurb Foundation */
meta.foundation-data-attribute-namespace {
font-family: false;
}
diff --git a/core/modules/tour/js/tour.js b/core/modules/tour/js/tour.js
index bdb06d0..75a35eb 100644
--- a/core/modules/tour/js/tour.js
+++ b/core/modules/tour/js/tour.js
@@ -103,11 +103,23 @@
if ($tour.find('li').length) {
$(document).foundation({
joyride: {
- post_ride_callback: function () { that.model.set('isActive', false); }
+ post_ride_callback: function () { that.model.set('isActive', false); },
+ template : {
+ link : '×',
+ timer : '
',
+ tip : '
',
+ wrapper : '',
+ button : '',
+ prev_button : '',
+ modal : '',
+ expose : '',
+ expose_cover: ''
+ }
}
});
this.model.set({isActive: true, activeTour: $tour});
$(document).foundation('joyride', 'start');
+ $('.joyride-tip-guide .button--primary').focus();
}
}
else {
diff --git a/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php b/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
index 0362bc6..f66ac8b 100644
--- a/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
+++ b/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
@@ -111,7 +111,7 @@ public function getAttributes() {
$attributes['data-aria-describedby'] = 'tour-tip-' . $this->getAriaId() . '-contents';
$attributes['data-aria-labelledby'] = 'tour-tip-' . $this->getAriaId() . '-label';
if ($location = $this->get('location')) {
- $attributes['data-options'] = 'tipLocation:' . $location;
+ $attributes['data-options'] = 'tip_location:' . $location;
}
return $attributes;
}
diff --git a/core/themes/seven/css/components/tour.theme.css b/core/themes/seven/css/components/tour.theme.css
index a5e0cc4..7346fc6 100644
--- a/core/themes/seven/css/components/tour.theme.css
+++ b/core/themes/seven/css/components/tour.theme.css
@@ -60,6 +60,10 @@
}
/* Button Style */
+.joyride-tip-guide a.button:not(.button--primary) {
+ color: #333;
+}
+
.joyride-tip-guide .joyride-next-tip {
margin: 0;
}