Skip to content
This repository has been archived by the owner on Oct 12, 2023. It is now read-only.

Commit

Permalink
Give its own class to inner far side container (#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
PatoBeltran authored May 21, 2019
1 parent 2cd42d4 commit 47f5f0d
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# CHANGELOG
## v6.2.3
### Fixed
- Add the far side container of the form field label only if a far side item is present.
- Update styles of far side container of form field label.

## v6.2.2
### Added
- Added ability to include an extra node to the far side of the label in form fields.
- Added ability to include an extra node to the far side of the label in form fields.

## v6.2.1
### Fixed
- BUG 4445327: Masthead: hover color regression on action buttons
- BUG 4445327: Masthead: hover color regression on action buttons

## v6.2.0
- Refactor component styling logic using ThemeProvider in styled component library.
Expand Down
6 changes: 6 additions & 0 deletions lib/components/Field/Field.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,15 @@ $line-height: 5*$grid-size;
}
}

.label-farSide-container {
@include md-box(flex-row);
align-items: flex-end;
}

.label-inner-container {
@include md-box(flex-row);
align-items: flex-end;
flex: 1;
}

.field-error {
Expand Down
9 changes: 5 additions & 4 deletions lib/components/Field/FormLabel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface FormLabelType {}
export interface FormLabelAttributes {
container?: DivProps;
innerContainer?: DivProps;
farSideContainer?: DivProps;
text?: LabelProps;
icon?: IconAttributes;
balloon?: BalloonAttributes;
Expand Down Expand Up @@ -118,11 +119,11 @@ export const FormLabel: React.StatelessComponent<FormLabelProps> = (props: FormL
</Attr.label>
{balloon}
</Attr.div>
<Attr.div
className={css('label-inner-container')}
attr={props.attr.innerContainer}>
{props.farSide && <Attr.div
className={css('label-farSide-container')}
attr={props.attr.farSideContainer}>
{props.farSide}
</Attr.div>
</Attr.div>}
</Attr.div>
);
};
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/azure-iot-ux-fluent-controls",
"version": "6.2.2",
"version": "6.2.3",
"description": "Azure IoT UX Fluent Controls",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
Expand Down

0 comments on commit 47f5f0d

Please sign in to comment.