Skip to content

Commit

Permalink
Merge pull request #330 from acelaya-forks/feature/fix-switch-alignment
Browse files Browse the repository at this point in the history
Removed hardcoded display: inline for BooleanControls
  • Loading branch information
acelaya committed Oct 31, 2020
2 parents 2e6a351 + ff1fb0d commit 14e31ed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).

## [Unreleased]
## 2.6.1 - 2020-10-31

#### Added

Expand All @@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
* [#316](https://github.com/shlinkio/shlink-web-client/issues/316) Fixed manifest.json file not getting downloaded after passing credentials when the app is protected with basic auth.
* [#311](https://github.com/shlinkio/shlink-web-client/issues/311) Fixed datepicker showing below other components.
* [#306](https://github.com/shlinkio/shlink-web-client/issues/306) Fixed multi-arch docker builds by replacing node-sass with dart-sass.
* [#328](https://github.com/shlinkio/shlink-web-client/issues/328) Fixed toggle switches getting broken in mobile resolutions.


## 2.6.0 - 2020-09-20
Expand Down
2 changes: 1 addition & 1 deletion src/utils/BooleanControl.tsx
Expand Up @@ -24,7 +24,7 @@ const BooleanControl: FC<BooleanControlWithTypeProps> = (
};

return (
<span className={classNames('custom-control', typeClasses, className)} style={{ display: 'inline' }}>
<span className={classNames('custom-control', typeClasses, className)}>
<input type="checkbox" className="custom-control-input" id={id} checked={checked} onChange={onChecked} />
<label className="custom-control-label" htmlFor={id}>{children}</label>
</span>
Expand Down

0 comments on commit 14e31ed

Please sign in to comment.