Finish the toolbars

Add an app button on sidenav
Add a logout select on sidenav
This commit is contained in:
Benoit Favreault
2015-03-13 02:10:31 -04:00
committed by Francis Lachapelle
parent 9fc713dc5f
commit a57713523b
8 changed files with 86 additions and 51 deletions
@@ -66,26 +66,24 @@ $iconButton-transition: transform $swift-ease-in-duration $swift-ease-in-timing-
transition: $iconButton-transition;
}
}
// Containers have padding, we compensate to align according to specs
.iconButton:last-child {
margin-right: ($iconButton-padding * -1);
margin-end: ($iconButton-padding * -1);
-moz-margin-end: ($iconButton-padding * -1);
-webkit-margin-end: ($iconButton-padding * -1);
}
.iconButton:first-child {
margin-left: ($iconButton-padding * -1);
margin-start: ($iconButton-padding * -1);
-moz-margin-start: ($iconButton-padding * -1);
-webkit-margin-start: ($iconButton-padding * -1);
}
.iconButton:only-child {
margin-start: ($iconButton-padding * -1);
-moz-margin-start: ($iconButton-padding * -1);
-webkit-margin-start: ($iconButton-padding * -1);
// Icon-bars are for iconButtons, by default they're vertical and at the right
// the modifier class is to reflect those values and leave place to other versions
.sg-icon-bar--vertical {
font-size: $sg-font-size-3;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
// Containers have padding, we compensate to align according to specs
margin: 0 ($iconButton-padding * -1) 0 $mg;
}
// NiceToHave: some horizontal or left hand side variant
.sg-icon-bar *.button {
display: block;
}
// angular-material is overspecifying so we are
.md-button.md-default-theme:not([disabled]).iconButton {
@@ -98,6 +96,8 @@ $iconButton-transition: transform $swift-ease-in-duration $swift-ease-in-timing-
margin-left: ($mg * -1);
}
// angular-material is overspecifying so we are and so we have to continue
.sg-button-navicon.iconButton span.md-icon-menu {
.sg-button-navicon.iconButton span.md-icon-menu,
.sg-button-navicon.iconButton i[class|="md-icon"] {
padding: 0;
font-size: $iconButton-menu-size;
}
@@ -9,8 +9,23 @@ md-select {
md-select.md-default-theme.sg-toolbar-sort {
margin: 0 $bl 4px 0;
color: $colorWhite;
md-select-label.md-select-label {
border: none;
color: inherit;
}
}
md-select.md-default-theme.sg-logout {
margin-top: 0;
color: $colorWhite;
// angular material overqualifies, so we are
md-select-label.md-select-label,
md-select-label.md-select-label.md-placeholder,
md-select-label.md-select-label * {
border: none;
color: $colorWhite;
}
}
@@ -6,10 +6,16 @@ md-toolbar {
box-shadow: none;
font-size: initial;
}
.md-toolbar-tools.md-toolbar-tools-top {
padding-top: $bl;
}
.md-toolbar-tools.md-toolbar-tools-bottom {
height: (5 * $line);
max-height: (5 * $line);
}
header {
flex-direction: row;
flex-wrap: nowrap;
@@ -28,17 +34,7 @@ hgroup {
color: inherit;
font-size: sg-size(headline);
}
.sg-icon-bar {
font-size: $sg-font-size-3;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
margin: 0 0 0 $mg;
}
.sg-icon-bar *.button {
display: block;
}
.sg-toolbar-group {
display: flex;
flex-direction: row;
@@ -55,5 +51,3 @@ hgroup {
order: 3;
}
}