diff --git a/src/components/Button/Button.css b/src/components/Button/Button.css index fbdbf270..1cb34644 100644 --- a/src/components/Button/Button.css +++ b/src/components/Button/Button.css @@ -7,14 +7,14 @@ padding: 0; } -.primaryButton { +.primaryButtonRoot { @apply --marketplaceButtonStylesPrimary; /* Clear padding that is set for link elements looking like buttons */ padding: 0; } -.secondaryButton { +.secondaryButtonRoot { @apply --marketplaceButtonStylesSecondary; /* We must lift up the text from the center since it looks better with @@ -23,35 +23,15 @@ padding: 0 0 2px 0; } -.inlineTextButton { +.inlineTextButtonRoot { @apply --marketplaceLinkStyles; } -.inlineButton { - display: inline-block; - - /* fill colors should be in sync with marketplace color palette */ - background-color: transparent; - - /* border-width should be in sync with marketplace strike-widths */ - border-width: 0px; - - /* Font configuration */ - text-decoration: none; - - /* Hovers */ - &:enabled { - cursor: pointer; - } - &:enabled:hover, - &:enabled:active { - background-color: transparent; - text-decoration: underline; - } - &:disabled { - background-color: transparent; - cursor: auto; - } +.primaryButton { + /* Class handle for primary button state styles */ +} +.secondaryButton { + /* Class handle for secondary button state styles */ } .inProgress { diff --git a/src/components/Button/Button.example.js b/src/components/Button/Button.example.js index ad145534..34fe0ab4 100644 --- a/src/components/Button/Button.example.js +++ b/src/components/Button/Button.example.js @@ -157,7 +157,7 @@ const ButtonsComponent = () => {

Button with custom styles:

- + ); }; diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js index adda2afa..b009bbf0 100644 --- a/src/components/Button/Button.js +++ b/src/components/Button/Button.js @@ -69,11 +69,20 @@ Button.propTypes = { export default Button; -export const PrimaryButton = props => - ) : ( - - - - ); + const filtersButtonClasses = + selectedFiltersCount > 0 ? css.filtersButtonSelected : css.filtersButton; const categoryLabel = intl.formatMessage({ id: 'SearchFiltersMobile.categoryLabel', @@ -284,7 +275,9 @@ class SearchFiltersMobileComponent extends Component { {searchInProgress ? loadingResults : null}
- {filtersButton} +
diff --git a/src/components/SearchFiltersPanel/SearchFiltersPanel.css b/src/components/SearchFiltersPanel/SearchFiltersPanel.css index 1b650243..939667c3 100644 --- a/src/components/SearchFiltersPanel/SearchFiltersPanel.css +++ b/src/components/SearchFiltersPanel/SearchFiltersPanel.css @@ -16,6 +16,7 @@ } .resetAllButton { + @apply --marketplaceLinkStyles; @apply --marketplaceH5FontStyles; font-weight: var(--fontWeightMedium); color: var(--matterColorAnti); @@ -33,6 +34,7 @@ } .cancelButton { + @apply --marketplaceLinkStyles; @apply --marketplaceH5FontStyles; font-weight: var(--fontWeightMedium); color: var(--matterColorAnti); @@ -50,6 +52,7 @@ } .applyButton { + @apply --marketplaceLinkStyles; @apply --marketplaceH5FontStyles; font-weight: var(--fontWeightMedium); diff --git a/src/components/SearchFiltersPanel/SearchFiltersPanel.js b/src/components/SearchFiltersPanel/SearchFiltersPanel.js index d70dc8b6..4a1946c6 100644 --- a/src/components/SearchFiltersPanel/SearchFiltersPanel.js +++ b/src/components/SearchFiltersPanel/SearchFiltersPanel.js @@ -158,13 +158,13 @@ class SearchFiltersPanelComponent extends Component {
{/* Add filters here */}
- + - + - +
diff --git a/src/components/TabNavHorizontal/TabNavHorizontal.css b/src/components/TabNavHorizontal/TabNavHorizontal.css index 6ad0c4fb..880c3909 100644 --- a/src/components/TabNavHorizontal/TabNavHorizontal.css +++ b/src/components/TabNavHorizontal/TabNavHorizontal.css @@ -23,6 +23,7 @@ } .tabContent { + @apply --marketplaceLinkStyles; display: flex; flex-direction: column; justify-content: flex-end; diff --git a/src/components/TabNavHorizontal/TabNavHorizontal.js b/src/components/TabNavHorizontal/TabNavHorizontal.js index 74cf0298..764fefb8 100644 --- a/src/components/TabNavHorizontal/TabNavHorizontal.js +++ b/src/components/TabNavHorizontal/TabNavHorizontal.js @@ -43,7 +43,7 @@ const Tab = props => { return (
{isButton ? ( - + {text} ) : ( diff --git a/src/components/TopbarDesktop/TopbarDesktop.css b/src/components/TopbarDesktop/TopbarDesktop.css index 93729a89..a9459f92 100644 --- a/src/components/TopbarDesktop/TopbarDesktop.css +++ b/src/components/TopbarDesktop/TopbarDesktop.css @@ -304,6 +304,7 @@ } .logoutButton { + @apply --marketplaceLinkStyles; /* Font is specific to this component */ @apply --marketplaceH4FontStyles; font-size: 14px; diff --git a/src/components/TopbarDesktop/TopbarDesktop.js b/src/components/TopbarDesktop/TopbarDesktop.js index 43fddd9b..54f38347 100644 --- a/src/components/TopbarDesktop/TopbarDesktop.js +++ b/src/components/TopbarDesktop/TopbarDesktop.js @@ -100,7 +100,7 @@ const TopbarDesktop = props => { - + diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.css b/src/components/TopbarMobileMenu/TopbarMobileMenu.css index 1c354e08..52e2c2fd 100644 --- a/src/components/TopbarMobileMenu/TopbarMobileMenu.css +++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.css @@ -55,6 +55,7 @@ } .logoutButton { + @apply --marketplaceLinkStyles; /* Logout font is smaller and gray since the action is not recommended. */ @apply --marketplaceH3FontStyles; color: var(--matterColorAnti); diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.js b/src/components/TopbarMobileMenu/TopbarMobileMenu.js index a8671635..8c1ed145 100644 --- a/src/components/TopbarMobileMenu/TopbarMobileMenu.js +++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.js @@ -81,7 +81,7 @@ const TopbarMobileMenu = props => { - + + ); @@ -86,7 +86,7 @@ const UserCard = props => { const separator = isCurrentUser ? null : •; const contact = ( - + ); diff --git a/src/components/index.js b/src/components/index.js index 65b5cbd2..7f79a06c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,39 +1,16 @@ -export { default as ActivityFeed } from './ActivityFeed/ActivityFeed'; -export { default as AddImages } from './AddImages/AddImages'; -export { default as Avatar, AvatarMedium, AvatarLarge } from './Avatar/Avatar'; -export { default as BookingBreakdown } from './BookingBreakdown/BookingBreakdown'; -export { default as BookingDateRangeFilter } from './BookingDateRangeFilter/BookingDateRangeFilter'; -export { default as Button, PrimaryButton, SecondaryButton, InlineTextButton } from './Button/Button'; -export { default as BookingPanel } from './BookingPanel/BookingPanel'; -export { default as CookieConsent } from './CookieConsent/CookieConsent'; -export { default as Discussion } from './Discussion/Discussion'; -export { default as EditListingAvailabilityPanel } from './EditListingAvailabilityPanel/EditListingAvailabilityPanel'; -export { default as EditListingDescriptionPanel } from './EditListingDescriptionPanel/EditListingDescriptionPanel'; -export { default as EditListingFeaturesPanel } from './EditListingFeaturesPanel/EditListingFeaturesPanel'; -export { default as EditListingLocationPanel } from './EditListingLocationPanel/EditListingLocationPanel'; -export { default as EditListingPhotosPanel } from './EditListingPhotosPanel/EditListingPhotosPanel'; -export { default as EditListingPoliciesPanel } from './EditListingPoliciesPanel/EditListingPoliciesPanel'; -export { default as EditListingPricingPanel } from './EditListingPricingPanel/EditListingPricingPanel'; -export { default as EditListingWizard } from './EditListingWizard/EditListingWizard'; -export { default as ExpandingTextarea } from './ExpandingTextarea/ExpandingTextarea'; -export { default as ExternalLink } from './ExternalLink/ExternalLink'; -export { default as FieldBirthdayInput } from './FieldBirthdayInput/FieldBirthdayInput'; -export { default as FieldBoolean } from './FieldBoolean/FieldBoolean'; -export { default as FieldCheckbox } from './FieldCheckbox/FieldCheckbox'; -export { default as FieldCheckboxGroup } from './FieldCheckboxGroup/FieldCheckboxGroup'; -export { default as FieldCurrencyInput } from './FieldCurrencyInput/FieldCurrencyInput'; -export { default as FieldDateInput } from './FieldDateInput/FieldDateInput'; -export { default as FieldDateRangeController } from './FieldDateRangeController/FieldDateRangeController'; -export { default as FieldDateRangeInput } from './FieldDateRangeInput/FieldDateRangeInput'; -export { default as FieldRadioButton } from './FieldRadioButton/FieldRadioButton'; -export { default as FieldPhoneNumberInput } from './FieldPhoneNumberInput/FieldPhoneNumberInput'; -export { default as FieldReviewRating } from './FieldReviewRating/FieldReviewRating'; -export { default as FieldSelect } from './FieldSelect/FieldSelect'; -export { default as FieldTextInput } from './FieldTextInput/FieldTextInput'; -export { default as FilterPlain } from './FilterPlain/FilterPlain'; -export { default as FilterPopup } from './FilterPopup/FilterPopup'; -export { default as Footer } from './Footer/Footer'; -export { default as Form } from './Form/Form'; +/** + * Independent components + * These components do not include any other components + * + * This order mitigates problems that might arise when trying to import components + * that have circular dependencies to other components. + * Note: import-order also affects to the generated CSS bundle file. + * + * Read more: + * https://medium.com/visual-development/how-to-fix-nasty-circular-dependency-issues-once-and-for-all-in-javascript-typescript-a04c987cf0de + */ + +// Icons export { default as IconAdd } from './IconAdd/IconAdd'; export { default as IconArrowHead } from './IconArrowHead/IconArrowHead'; export { default as IconBannedUser } from './IconBannedUser/IconBannedUser'; @@ -52,43 +29,102 @@ export { default as IconSocialMediaFacebook } from './IconSocialMediaFacebook/Ic export { default as IconSocialMediaInstagram } from './IconSocialMediaInstagram/IconSocialMediaInstagram'; export { default as IconSocialMediaTwitter } from './IconSocialMediaTwitter/IconSocialMediaTwitter'; export { default as IconSpinner } from './IconSpinner/IconSpinner'; -export { default as ImageCarousel } from './ImageCarousel/ImageCarousel'; -export { default as ImageFromFile } from './ImageFromFile/ImageFromFile'; -export { default as LayoutSideNavigation } from './LayoutSideNavigation/LayoutSideNavigation'; -export { default as LayoutSingleColumn } from './LayoutSingleColumn/LayoutSingleColumn'; -export { default as LayoutWrapperFooter } from './LayoutWrapperFooter/LayoutWrapperFooter'; -export { default as LayoutWrapperMain } from './LayoutWrapperMain/LayoutWrapperMain'; -export { default as LayoutWrapperSideNav } from './LayoutWrapperSideNav/LayoutWrapperSideNav'; -export { default as LayoutWrapperTopbar } from './LayoutWrapperTopbar/LayoutWrapperTopbar'; -export { default as ListingCard } from './ListingCard/ListingCard'; -export { default as ListingLink } from './ListingLink/ListingLink'; -export { default as LocationAutocompleteInput, LocationAutocompleteInputField } from './LocationAutocompleteInput/LocationAutocompleteInput'; + +// Other independent components +export { default as ExternalLink } from './ExternalLink/ExternalLink'; +export { default as ExpandingTextarea } from './ExpandingTextarea/ExpandingTextarea'; +export { default as Form } from './Form/Form'; export { default as Logo } from './Logo/Logo'; -export { default as ManageListingCard } from './ManageListingCard/ManageListingCard'; -export { default as Map } from './Map/Map'; -export { default as MapPanel } from './MapPanel/MapPanel'; -export { default as Menu } from './Menu/Menu'; -export { default as MenuContent } from './MenuContent/MenuContent'; -export { default as MenuItem } from './MenuItem/MenuItem'; -export { default as MenuLabel } from './MenuLabel/MenuLabel'; -export { default as Modal } from './Modal/Modal'; -export { default as ModalInMobile } from './ModalInMobile/ModalInMobile'; -export { default as ModalMissingInformation } from './ModalMissingInformation/ModalMissingInformation'; export { default as NamedLink } from './NamedLink/NamedLink'; export { default as NamedRedirect } from './NamedRedirect/NamedRedirect'; export { default as NotificationBadge } from './NotificationBadge/NotificationBadge'; -export { default as OrderDiscussionPanel } from './OrderDiscussionPanel/OrderDiscussionPanel'; export { default as OutsideClickHandler } from './OutsideClickHandler/OutsideClickHandler'; -export { default as Page } from './Page/Page'; -export { default as PaginationLinks } from './PaginationLinks/PaginationLinks'; -export { default as PriceFilter } from './PriceFilter/PriceFilter'; -export { default as PrivacyPolicy } from './PrivacyPolicy/PrivacyPolicy'; export { default as Promised } from './Promised/Promised'; export { default as PropertyGroup } from './PropertyGroup/PropertyGroup'; export { default as RangeSlider } from './RangeSlider/RangeSlider'; export { default as ResponsiveImage } from './ResponsiveImage/ResponsiveImage'; -export { default as ReviewModal } from './ReviewModal/ReviewModal'; +export { default as UserDisplayName } from './UserDisplayName/UserDisplayName'; +export { default as ValidationError } from './ValidationError/ValidationError'; + +/** + * Composite components + * These components include other components + */ + +////////////////////////////////////////////////////////// +// First components that include only atomic components // +////////////////////////////////////////////////////////// + +export { default as Button, PrimaryButton, SecondaryButton, InlineTextButton } from './Button/Button'; +export { default as CookieConsent } from './CookieConsent/CookieConsent'; +export { default as ImageCarousel } from './ImageCarousel/ImageCarousel'; +export { default as ImageFromFile } from './ImageFromFile/ImageFromFile'; +export { default as ListingLink } from './ListingLink/ListingLink'; +export { default as PaginationLinks } from './PaginationLinks/PaginationLinks'; export { default as ReviewRating } from './ReviewRating/ReviewRating'; + +// Layout helpers +export { default as LayoutWrapperFooter } from './LayoutWrapperFooter/LayoutWrapperFooter'; +export { default as LayoutWrapperMain } from './LayoutWrapperMain/LayoutWrapperMain'; +export { default as LayoutWrapperSideNav } from './LayoutWrapperSideNav/LayoutWrapperSideNav'; +export { default as LayoutWrapperTopbar } from './LayoutWrapperTopbar/LayoutWrapperTopbar'; +export { default as LayoutSideNavigation } from './LayoutSideNavigation/LayoutSideNavigation'; +export { default as LayoutSingleColumn } from './LayoutSingleColumn/LayoutSingleColumn'; + +// Menu +export { default as MenuItem } from './MenuItem/MenuItem'; +export { default as MenuContent } from './MenuContent/MenuContent'; +export { default as MenuLabel } from './MenuLabel/MenuLabel'; +export { default as Menu } from './Menu/Menu'; + +// Modal +export { default as Modal } from './Modal/Modal'; +export { default as ModalInMobile } from './ModalInMobile/ModalInMobile'; + +// Fields (for Final Form) +export { default as FieldBirthdayInput } from './FieldBirthdayInput/FieldBirthdayInput'; +export { default as FieldCheckbox } from './FieldCheckbox/FieldCheckbox'; +export { default as FieldCurrencyInput } from './FieldCurrencyInput/FieldCurrencyInput'; +export { default as FieldDateInput } from './FieldDateInput/FieldDateInput'; +export { default as FieldDateRangeController } from './FieldDateRangeController/FieldDateRangeController'; +export { default as FieldDateRangeInput } from './FieldDateRangeInput/FieldDateRangeInput'; +export { default as FieldRadioButton } from './FieldRadioButton/FieldRadioButton'; +export { default as FieldReviewRating } from './FieldReviewRating/FieldReviewRating'; +export { default as FieldSelect } from './FieldSelect/FieldSelect'; +export { default as FieldTextInput } from './FieldTextInput/FieldTextInput'; +// Fields that use other Fields +export { default as FieldBoolean } from './FieldBoolean/FieldBoolean'; +export { default as FieldCheckboxGroup } from './FieldCheckboxGroup/FieldCheckboxGroup'; +export { default as FieldPhoneNumberInput } from './FieldPhoneNumberInput/FieldPhoneNumberInput'; +// Fields and inputs using old naming pattern +export { default as LocationAutocompleteInput, LocationAutocompleteInputField } from './LocationAutocompleteInput/LocationAutocompleteInput'; +export { default as StripeBankAccountTokenInputField } from './StripeBankAccountTokenInputField/StripeBankAccountTokenInputField'; + +// Tab navigation +export { default as TabNav } from './TabNav/TabNav'; +export { LinkTabNavHorizontal, ButtonTabNavHorizontal } from './TabNavHorizontal/TabNavHorizontal'; +export { default as Tabs } from './Tabs/Tabs'; +export { default as UserNav } from './UserNav/UserNav'; + +/////////////////////////////////////////////// +// These components include other components // +/////////////////////////////////////////////// + +export { default as ActivityFeed } from './ActivityFeed/ActivityFeed'; +export { default as AddImages } from './AddImages/AddImages'; +export { default as Avatar, AvatarMedium, AvatarLarge } from './Avatar/Avatar'; +export { default as BookingBreakdown } from './BookingBreakdown/BookingBreakdown'; +export { default as BookingDateRangeFilter } from './BookingDateRangeFilter/BookingDateRangeFilter'; +export { default as BookingPanel } from './BookingPanel/BookingPanel'; +export { default as Discussion } from './Discussion/Discussion'; +export { default as FilterPlain } from './FilterPlain/FilterPlain'; +export { default as FilterPopup } from './FilterPopup/FilterPopup'; +export { default as ListingCard } from './ListingCard/ListingCard'; +export { default as ManageListingCard } from './ManageListingCard/ManageListingCard'; +export { default as Map } from './Map/Map'; +export { default as OrderDiscussionPanel } from './OrderDiscussionPanel/OrderDiscussionPanel'; +export { default as Page } from './Page/Page'; +export { default as PriceFilter } from './PriceFilter/PriceFilter'; export { default as Reviews } from './Reviews/Reviews'; export { default as SearchFilters } from './SearchFilters/SearchFilters'; export { default as SearchFiltersMobile } from './SearchFiltersMobile/SearchFiltersMobile'; @@ -98,22 +134,32 @@ export { default as SearchMapGroupLabel } from './SearchMapGroupLabel/SearchMapG export { default as SearchMapInfoCard } from './SearchMapInfoCard/SearchMapInfoCard'; export { default as SearchMapPriceLabel } from './SearchMapPriceLabel/SearchMapPriceLabel'; export { default as SearchResultsPanel } from './SearchResultsPanel/SearchResultsPanel'; +export { default as SelectMultipleFilter } from './SelectMultipleFilter/SelectMultipleFilter'; +export { default as SelectSingleFilter } from './SelectSingleFilter/SelectSingleFilter'; +export { default as UserCard } from './UserCard/UserCard'; + +////////////////////////////////////////////// +// Page sections and modal content wrappers // +////////////////////////////////////////////// + +export { default as ModalMissingInformation } from './ModalMissingInformation/ModalMissingInformation'; +export { default as ReviewModal } from './ReviewModal/ReviewModal'; +export { default as PrivacyPolicy } from './PrivacyPolicy/PrivacyPolicy'; +export { default as TermsOfService } from './TermsOfService/TermsOfService'; +export { default as EditListingAvailabilityPanel } from './EditListingAvailabilityPanel/EditListingAvailabilityPanel'; +export { default as EditListingDescriptionPanel } from './EditListingDescriptionPanel/EditListingDescriptionPanel'; +export { default as EditListingFeaturesPanel } from './EditListingFeaturesPanel/EditListingFeaturesPanel'; +export { default as EditListingLocationPanel } from './EditListingLocationPanel/EditListingLocationPanel'; +export { default as EditListingPhotosPanel } from './EditListingPhotosPanel/EditListingPhotosPanel'; +export { default as EditListingPoliciesPanel } from './EditListingPoliciesPanel/EditListingPoliciesPanel'; +export { default as EditListingPricingPanel } from './EditListingPricingPanel/EditListingPricingPanel'; +export { default as EditListingWizard } from './EditListingWizard/EditListingWizard'; +export { default as Footer } from './Footer/Footer'; export { default as SectionHero } from './SectionHero/SectionHero'; export { default as SectionHowItWorks } from './SectionHowItWorks/SectionHowItWorks'; export { default as SectionLocations } from './SectionLocations/SectionLocations'; export { default as SectionThumbnailLinks } from './SectionThumbnailLinks/SectionThumbnailLinks'; -export { default as SelectMultipleFilter } from './SelectMultipleFilter/SelectMultipleFilter'; -export { default as SelectSingleFilter } from './SelectSingleFilter/SelectSingleFilter'; -export { default as StripeBankAccountTokenInputField } from './StripeBankAccountTokenInputField/StripeBankAccountTokenInputField'; -export { default as TabNav } from './TabNav/TabNav'; -export { LinkTabNavHorizontal, ButtonTabNavHorizontal } from './TabNavHorizontal/TabNavHorizontal'; -export { default as Tabs } from './Tabs/Tabs'; -export { default as TermsOfService } from './TermsOfService/TermsOfService'; export { default as Topbar } from './Topbar/Topbar'; export { default as TopbarDesktop } from './TopbarDesktop/TopbarDesktop'; export { default as TopbarMobileMenu } from './TopbarMobileMenu/TopbarMobileMenu'; export { default as TransactionPanel } from './TransactionPanel/TransactionPanel'; -export { default as UserCard } from './UserCard/UserCard'; -export { default as UserDisplayName } from './UserDisplayName/UserDisplayName'; -export { default as UserNav } from './UserNav/UserNav'; -export { default as ValidationError } from './ValidationError/ValidationError'; diff --git a/src/containers/AuthenticationPage/AuthenticationPage.css b/src/containers/AuthenticationPage/AuthenticationPage.css index 104fe989..20927b58 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.css +++ b/src/containers/AuthenticationPage/AuthenticationPage.css @@ -122,6 +122,7 @@ /* Helper links */ .modalHelperLink { + @apply --marketplaceLinkStyles; @apply --marketplaceModalHelperLink; } diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js index b9e711cd..783b7759 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.js +++ b/src/containers/AuthenticationPage/AuthenticationPage.js @@ -157,7 +157,7 @@ export class AuthenticationPageComponent extends Component { const email = {user.attributes.email}; const resendEmailLink = ( - + ); diff --git a/src/containers/ListingPage/ListingPage.css b/src/containers/ListingPage/ListingPage.css index 64ef1cb6..a5f9550d 100644 --- a/src/containers/ListingPage/ListingPage.css +++ b/src/containers/ListingPage/ListingPage.css @@ -383,6 +383,7 @@ } .contactLink { + @apply --marketplaceLinkStyles; @apply --marketplaceH4FontStyles; margin: 0; } diff --git a/src/containers/ListingPage/SectionHeading.js b/src/containers/ListingPage/SectionHeading.js index 34e1be65..90b2d954 100644 --- a/src/containers/ListingPage/SectionHeading.js +++ b/src/containers/ListingPage/SectionHeading.js @@ -45,7 +45,7 @@ const SectionHeading = props => { {showContactUser ? ( • - + diff --git a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.css b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.css index 16c043e8..6d500a16 100644 --- a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.css +++ b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.css @@ -52,6 +52,7 @@ } .helperLink { + @apply --marketplaceLinkStyles; @apply --marketplaceModalHelperLink; } diff --git a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js index 48e923de..0f2ff664 100644 --- a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js +++ b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js @@ -45,13 +45,13 @@ export const PasswordRecoveryPageComponent = props => { }); const resendEmailLink = ( - onSubmitEmail(submittedEmail)}> + onSubmitEmail(submittedEmail)}> ); const fixEmailLink = ( - + ); diff --git a/src/forms/ContactDetailsForm/ContactDetailsForm.js b/src/forms/ContactDetailsForm/ContactDetailsForm.js index 36b8df68..b4ae414d 100644 --- a/src/forms/ContactDetailsForm/ContactDetailsForm.js +++ b/src/forms/ContactDetailsForm/ContactDetailsForm.js @@ -316,7 +316,6 @@ class ContactDetailsFormComponent extends Component {
{genericError} ( />

- +
diff --git a/src/forms/PasswordChangeForm/PasswordChangeForm.js b/src/forms/PasswordChangeForm/PasswordChangeForm.js index f023f0f1..5df3eaa8 100644 --- a/src/forms/PasswordChangeForm/PasswordChangeForm.js +++ b/src/forms/PasswordChangeForm/PasswordChangeForm.js @@ -183,7 +183,6 @@ class PasswordChangeFormComponent extends Component {
{genericFailure} { push('company.additionalOwners', undefined)} > diff --git a/src/forms/SendMessageForm/SendMessageForm.css b/src/forms/SendMessageForm/SendMessageForm.css index 4a4ac994..4d5c7b6e 100644 --- a/src/forms/SendMessageForm/SendMessageForm.css +++ b/src/forms/SendMessageForm/SendMessageForm.css @@ -75,6 +75,7 @@ } .submitButton { + @apply --marketplaceButtonStylesSecondary; @apply --marketplaceH5FontStyles; font-weight: var(--fontWeightMedium); diff --git a/src/forms/SendMessageForm/SendMessageForm.js b/src/forms/SendMessageForm/SendMessageForm.js index c0e55d17..716022c8 100644 --- a/src/forms/SendMessageForm/SendMessageForm.js +++ b/src/forms/SendMessageForm/SendMessageForm.js @@ -91,7 +91,7 @@ class SendMessageFormComponent extends Component { ) : null}
( />

- +