Skip to content

Commit

Permalink
Merge branch 'release/v1.26' into dev/fix-distance-alignment
Browse files Browse the repository at this point in the history
  • Loading branch information
nmanu1 authored Nov 15, 2021
2 parents bf62ce6 + d4a56a7 commit 194d928
Show file tree
Hide file tree
Showing 98 changed files with 566 additions and 363 deletions.
2 changes: 1 addition & 1 deletion cards/document-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class document_standardCardComponent extends BaseCard['document-standard'] {
// ariaLabel: '',
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
6 changes: 2 additions & 4 deletions cards/document-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
<div class="HitchhikerDocumentStandard-info">
{{> details }}
</div>
<div class="HitchhikerCard-actions">
{{> ctas }}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{> ctas }}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/event-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class event_standardCardComponent extends BaseCard['event-standard'] {
// ariaLabel: '',
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
8 changes: 3 additions & 5 deletions cards/event-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
{{/if}}
{{> 'details'}}
</div>
<div class="HitchhikerCard-actions">
{{#if (any (all card.CTA1 card.CTA1.url) (all card.CTA2 card.CTA2.url))}}
{{#if (any (all card.CTA1 card.CTA1.url) (all card.CTA2 card.CTA2.url))}}
<div class="HitchhikerEventStandard-ctasWrapper">
{{#if (all card.CTA1.url card.CTA1.label)}}
<div class="HitchhikerEventStandard-primaryCTA">
Expand All @@ -50,10 +49,9 @@
</div>
{{/if}}
</div>
{{/if}}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{/if}}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/faq-accordion/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class faq_accordionCardComponent extends BaseCard['faq-accordion'] {
// ariaLabel: '',
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
38 changes: 18 additions & 20 deletions cards/faq-accordion/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,25 @@
</div>
{{/if}}
{{> 'details'}}
<div class="HitchhikerCard-actions">
{{#if (any (all card.CTA1 card.CTA1.url card.CTA1.label) (all card.CTA2 card.CTA2.url card.CTA2.label))}}
<div class="HitchhikerFaqAccordion-ctasWrapper">
{{#if card.CTA1.url}}
<div class="HitchhikerFaqAccordion-primaryCTA">
{{#with card.CTA1}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{#if card.CTA2.url}}
<div class="HitchhikerFaqAccordion-secondaryCTA">
{{#with card.CTA2}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{#if (any (all card.CTA1 card.CTA1.url card.CTA1.label) (all card.CTA2 card.CTA2.url card.CTA2.label))}}
<div class="HitchhikerFaqAccordion-ctasWrapper">
{{#if card.CTA1.url}}
<div class="HitchhikerFaqAccordion-primaryCTA">
{{#with card.CTA1}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{/if}}
{{#if card.CTA2.url}}
<div class="HitchhikerFaqAccordion-secondaryCTA">
{{#with card.CTA2}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
</div>
{{/if}}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/financial-professional-location/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class financial_professional_locationCardComponent extends BaseCard['financial-p
// ariaLabel: ''
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
6 changes: 2 additions & 4 deletions cards/financial-professional-location/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
{{> list }}
{{> phone }}
</div>
<div class="HitchhikerCard-actions">
{{> ctas }}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{> ctas }}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/job-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class job_standardCardComponent extends BaseCard['job-standard'] {
// ariaLabel: '', // Accessible text providing a descriptive label for the CTA
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
6 changes: 2 additions & 4 deletions cards/job-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
<div class="HitchhikerJobStandard-info">
{{> details }}
</div>
<div class="HitchhikerCard-actions">
{{> ctas }}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{> ctas }}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/link-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class link_standardCardComponent extends BaseCard['link-standard'] {
// },
details: profile.htmlSnippet, // The text in the body of the card
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
4 changes: 1 addition & 3 deletions cards/link-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
{{> subtitle }}
<div class="HitchhikerLinkStandard-contentWrapper">
{{> details }}
<div class="HitchhikerCard-actions">
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/location-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class location_standardCardComponent extends BaseCard['location-standard'] {
// ariaLabel: '',
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
6 changes: 2 additions & 4 deletions cards/location-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
{{> contactInfo }}
{{> details }}
</div>
<div class="HitchhikerCard-actions">
{{> ctas }}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{> ctas }}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion cards/menuitem-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class menuitem_standardCardComponent extends BaseCard['menuitem-standard'] {
// ariaLabel: '',
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: 'Thank you for your feedback!', // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: 'Thanks!', // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: 'This answered my question', // Screen reader only text for thumbs-up
negativeFeedbackSrText: 'This did not answer my question' // Screen reader only text for thumbs-down
};
Expand Down
8 changes: 3 additions & 5 deletions cards/menuitem-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
{{> list }}
{{> details }}
</div>
<div class="HitchhikerCard-actions">
{{#if (any (all card.CTA1 card.CTA1.url) (all card.CTA2 card.CTA2.url))}}
{{#if (any (all card.CTA1 card.CTA1.url) (all card.CTA2 card.CTA2.url))}}
<div class="HitchhikerMenuItemStandard-ctasWrapper">
{{#with card.CTA1}}
{{> CTA ctaName="primaryCTA" }}
Expand All @@ -18,10 +17,9 @@
{{> CTA ctaName="secondaryCTA" }}
{{/with}}
</div>
{{/if}}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{/if}}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/multilang-event-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class multilang_event_standardCardComponent extends BaseCard['multilang-event-st
// ariaLabel: '',
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: {{ translateJS phrase='Thank you for your feedback!' }}, // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: {{ translateJS phrase='Thanks!' }}, // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: {{ translateJS phrase='This answered my question' }}, // Screen reader only text for thumbs-up
negativeFeedbackSrText: {{ translateJS phrase='This did not answer my question' }} // Screen reader only text for thumbs-down
};
Expand Down
38 changes: 18 additions & 20 deletions cards/multilang-event-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,26 @@
{{/if}}
{{> 'details'}}
</div>
<div class="HitchhikerCard-actions">
{{#if (any (all card.CTA1 card.CTA1.url) (all card.CTA2 card.CTA2.url))}}
<div class="HitchhikerEventStandard-ctasWrapper">
{{#if (all card.CTA1.url card.CTA1.label)}}
<div class="HitchhikerEventStandard-primaryCTA">
{{#with card.CTA1}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{#if (all card.CTA2.url card.CTA2.label)}}
<div class="HitchhikerEventStandard-secondaryCTA">
{{#with card.CTA2}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{#if (any (all card.CTA1 card.CTA1.url) (all card.CTA2 card.CTA2.url))}}
<div class="HitchhikerEventStandard-ctasWrapper">
{{#if (all card.CTA1.url card.CTA1.label)}}
<div class="HitchhikerEventStandard-primaryCTA">
{{#with card.CTA1}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{/if}}
{{#if (all card.CTA2.url card.CTA2.label)}}
<div class="HitchhikerEventStandard-secondaryCTA">
{{#with card.CTA2}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
</div>
{{/if}}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/multilang-faq-accordion/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class multilang_faq_accordionCardComponent extends BaseCard['multilang-faq-accor
// ariaLabel: '',
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: {{ translateJS phrase='Thank you for your feedback!' }}, // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: {{ translateJS phrase='Thanks!' }}, // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: {{ translateJS phrase='This answered my question' }}, // Screen reader only text for thumbs-up
negativeFeedbackSrText: {{ translateJS phrase='This did not answer my question' }} // Screen reader only text for thumbs-down
};
Expand Down
38 changes: 18 additions & 20 deletions cards/multilang-faq-accordion/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,25 @@
</div>
{{/if}}
{{> 'details'}}
<div class="HitchhikerCard-actions">
{{#if (any (all card.CTA1 card.CTA1.url card.CTA1.label) (all card.CTA2 card.CTA2.url card.CTA2.label))}}
<div class="HitchhikerFaqAccordion-ctasWrapper">
{{#if card.CTA1.url}}
<div class="HitchhikerFaqAccordion-primaryCTA">
{{#with card.CTA1}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{#if card.CTA2.url}}
<div class="HitchhikerFaqAccordion-secondaryCTA">
{{#with card.CTA2}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{#if (any (all card.CTA1 card.CTA1.url card.CTA1.label) (all card.CTA2 card.CTA2.url card.CTA2.label))}}
<div class="HitchhikerFaqAccordion-ctasWrapper">
{{#if card.CTA1.url}}
<div class="HitchhikerFaqAccordion-primaryCTA">
{{#with card.CTA1}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{/if}}
{{#if card.CTA2.url}}
<div class="HitchhikerFaqAccordion-secondaryCTA">
{{#with card.CTA2}}
{{> CTA }}
{{/with}}
</div>
{{/if}}
</div>
{{/if}}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class multilang_financial_professional_locationCardComponent extends BaseCard['m
// ariaLabel: ''
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: {{ translateJS phrase='Thank you for your feedback!' }}, // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: {{ translateJS phrase='Thanks!' }}, // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: {{ translateJS phrase='This answered my question' }}, // Screen reader only text for thumbs-up
negativeFeedbackSrText: {{ translateJS phrase='This did not answer my question' }} // Screen reader only text for thumbs-down
};
Expand Down
6 changes: 2 additions & 4 deletions cards/multilang-financial-professional-location/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
{{> list }}
{{> phone }}
</div>
<div class="HitchhikerCard-actions">
{{> ctas }}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{> ctas }}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/multilang-job-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class multilang_job_standardCardComponent extends BaseCard['multilang-job-standa
// ariaLabel: '', // Accessible text providing a descriptive label for the CTA
},
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: {{ translateJS phrase='Thank you for your feedback!' }}, // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: {{ translateJS phrase='Thanks!' }}, // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: {{ translateJS phrase='This answered my question' }}, // Screen reader only text for thumbs-up
negativeFeedbackSrText: {{ translateJS phrase='This did not answer my question' }} // Screen reader only text for thumbs-down
};
Expand Down
6 changes: 2 additions & 4 deletions cards/multilang-job-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
<div class="HitchhikerJobStandard-info">
{{> details }}
</div>
<div class="HitchhikerCard-actions">
{{> ctas }}
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
{{> ctas }}
</div>
{{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion cards/multilang-link-standard/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class multilang_link_standardCardComponent extends BaseCard['multilang-link-stan
// },
details: profile.htmlSnippet, // The text in the body of the card
feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card
feedbackTextOnSubmission: {{ translateJS phrase='Thank you for your feedback!' }}, // Text to display after a thumbs up/down is clicked
feedbackTextOnSubmission: {{ translateJS phrase='Thanks!' }}, // Text to display after a thumbs up/down is clicked
positiveFeedbackSrText: {{ translateJS phrase='This answered my question' }}, // Screen reader only text for thumbs-up
negativeFeedbackSrText: {{ translateJS phrase='This did not answer my question' }} // Screen reader only text for thumbs-down
};
Expand Down
Loading

0 comments on commit 194d928

Please sign in to comment.