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

Commit

Permalink
More uialignment fixes (#60)
Browse files Browse the repository at this point in the history
- Masthead user display name and email are now centered vertically.
- Shell now allows Masthead to use a different NavigationProperties than the one passed to the main navbar.
  • Loading branch information
vishwam authored Feb 4, 2019
1 parent c3adb2f commit 0baac8b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## v6.0.3
### Fixed
- Masthead user display name and email are now centered vertically.
- Shell now allows Masthead to use a different NavigationProperties than the one passed to the main navbar.

## v6.0.2
### Fixed
- Changed Checkbox and RadioInputs to be controlled components: pass the `checked` parameter instead of `defaultChecked` to fix issue when the checkbox state change did not reflect the new value. Also change the onChange handlers to return the new values from the incoming props instead of relying on the html element.
Expand Down
15 changes: 4 additions & 11 deletions lib/components/Masthead/Masthead.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,7 @@ $search-max-size: 100 * $grid-size;
padding: 0 $grid-size*4;
width: 100%;

&>* {
height: $layout-nav-item-height / 2;
display: block;
}

.name {
line-height: #{$layout-nav-item-height / 2 + $grid-size};
}

.email {
line-height: #{$layout-nav-item-height / 2 - 3*$grid-size};

@include themify {
color: themed('color-text-placeholder');
}
Expand Down Expand Up @@ -206,6 +195,10 @@ $search-max-size: 100 * $grid-size;

.masthead-toolbar-btn-container {
width: 100%;
height: $layout-nav-item-height;
display: flex;
flex-direction: column;
justify-content: center; // vertically align
text-align: left;

button {
Expand Down
2 changes: 1 addition & 1 deletion lib/components/Shell/Shell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function Shell({ theme, isRtl, masthead, navigation, children, onClick }:
return (
<div className={css('theme-' + theme)}>
<div className={css('shell', { rtl: isRtl })} onClick={onClick}>
{masthead && <Masthead {...masthead} navigation={navigation} />}
{masthead && <Masthead navigation={navigation} {...masthead} />}
<div className={css('nav-and-workspace')}>
{navigation && <Navigation {...navigation} />}
<div className={css('workspace')}>
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.0.2",
"version": "6.0.3",
"description": "Azure IoT UX Fluent Controls",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
Expand Down

0 comments on commit 0baac8b

Please sign in to comment.