maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-30 09:36:42 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix class-via-props usage (always overwrite)

Browse source
This commit is contained in:
Vesa Luusua 2018-05-02 16:41:17 +03:00
parent 219a611938
commit 7c92d35b25
6 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/FieldBirthdayInput/FieldBirthdayInput.js
View file

@ -156,7 +156,7 @@ class BirthdayInputComponent extends Component {
disabled={disabled}
id={dateId}
value={selectedValue(this.state.selected.day)}
className={classNames(css.select, selectClassName, {
className={classNames(selectClassName || css.select, {
[css.notSet]: !parseNum(this.state.selected.day),
})}
onFocus={() => this.handleSelectFocus()}
@ -177,7 +177,7 @@ class BirthdayInputComponent extends Component {
disabled={disabled}
id={monthId}
value={selectedValue(this.state.selected.month)}
className={classNames(css.select, selectClassName, {
className={classNames(selectClassName || css.select, {
[css.notSet]: !parseNum(this.state.selected.month),
})}
onFocus={() => this.handleSelectFocus()}
@ -198,7 +198,7 @@ class BirthdayInputComponent extends Component {
disabled={disabled}
id={yearId}
value={selectedValue(this.state.selected.year)}
className={classNames(css.select, selectClassName, {
className={classNames(selectClassName || css.select, {
[css.notSet]: !parseNum(this.state.selected.year),
})}
onFocus={() => this.handleSelectFocus()}

2
src/components/MenuContent/MenuContent.js
View file

@ -23,7 +23,7 @@ const MenuContent = props => {
const rootClass = rootClassName || css.root;
const classes = classNames(rootClass, className, { [css.isOpen]: isOpen });
const contentClasses = classNames(contentClassName, css.content);
const contentClasses = classNames(contentClassName || css.content);
const arrowPositionStyle =
arrowPosition && style.right != null

2
src/components/Modal/Modal.js
View file

@ -101,7 +101,7 @@ export class ModalComponent extends Component {
<div className={scrollLayerClasses}>
<div className={containerClasses}>
{closeBtn}
<div className={classNames(css.content, contentClassName)}>{children}</div>
<div className={classNames(contentClassName || css.content)}>{children}</div>
</div>
</div>
</div>

2
src/components/SectionThumbnailLinks/SectionThumbnailLinks.js
View file

@ -21,7 +21,7 @@ const ThumbnailLink = props => {
[css.link2Columns]: linksPerRow === 2,
[css.link3Columns]: linksPerRow === 3,
});
const imageWrapperClasses = classNames(css.imageWrapper, imageWrapperClassName);
const imageWrapperClasses = classNames(imageWrapperClassName || css.imageWrapper);
const LinkComponentProps = type === 'NamedLink' ? { name, params, to } : { href };
const LinkComponent = type === 'NamedLink' ? NamedLink : ExternalLink;

5
src/containers/ListingPage/ListingPage.css
View file

@ -723,11 +723,16 @@
}
}
.bookingDatesSubmitButtonWrapper {
flex-shrink: 0;
padding: 0 24px 24px 24px;
width: 100%;
position: fixed;
bottom: 0;
background-color: var(--matterColorLight);
@media (--viewportMedium) {
padding: 0;
width: 100%;
position: static;
bottom: unset;
background-color: transparent;

3
src/forms/BookingDatesForm/BookingDatesForm.js
View file

@ -142,8 +142,7 @@ export class BookingDatesFormComponent extends Component {
const endDatePlaceholderText =
endDatePlaceholder || intl.formatDate(tomorrow, dateFormatOptions);
const submitButtonClasses = classNames(
css.submitButtonWrapper,
submitButtonWrapperClassName
submitButtonWrapperClassName || css.submitButtonWrapper
);
return (