Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update(toolbar): add responsive heights as per spec #2157

Merged
merged 2 commits into from
Dec 14, 2016
Merged

update(toolbar): add responsive heights as per spec #2157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
340f5fa
update(toolbar): add responsive heights as per spec
devversion Dec 10, 2016
2bcc28a
Remove extra blank line
devversion Dec 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/lib/core/style/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ $md-body-font-size-base: rem(1.4) !default;
$md-font-family: Roboto, 'Helvetica Neue', sans-serif !default;

// Media queries
// TODO: Find a way to respect media query ranges.
// TODO: For example the xs-breakpoint should not interfere with the sm-breakpoint.
$md-xsmall: 'max-width: 600px';
$md-small: 'max-width: 960px';

// TODO: Revisit all z-indices before beta
// z-index master list
Expand Down
28 changes: 25 additions & 3 deletions src/lib/toolbar/toolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
@import '../core/style/variables';

$md-toolbar-height-desktop: 64px !default;
$md-toolbar-height-mobile-portrait: 56px !default;
$md-toolbar-height-mobile-landscape: 48px !default;

$md-toolbar-min-height: 64px !default;
$md-toolbar-font-size: 20px !default;
$md-toolbar-padding: 16px !default;


@mixin md-toolbar-height($height) {
md-toolbar {
min-height: $height;
}
md-toolbar-row {
height: $height;
}
}

md-toolbar {
display: flex;
box-sizing: border-box;

width: 100%;
min-height: $md-toolbar-min-height;

// Font Styling
font-size: $md-toolbar-font-size;
Expand All @@ -27,10 +37,22 @@ md-toolbar {
box-sizing: border-box;

width: 100%;
height: $md-toolbar-min-height;

// Flexbox Vertical Alignment
flex-direction: row;
align-items: center;
}
}

// Set the default height for the toolbar.
@include md-toolbar-height($md-toolbar-height-desktop);

// Specific height for mobile devices in portrait mode.
@media ($md-xsmall) and (orientation: portrait) {
@include md-toolbar-height($md-toolbar-height-mobile-portrait);
}

// Specific height for mobile devices in landscape mode.
@media ($md-small) and (orientation: landscape) {
@include md-toolbar-height($md-toolbar-height-mobile-landscape);
}