Skip to content

Commit

Permalink
Merge pull request sakaiproject#1816 from SedueRey/SAK-30385
Browse files Browse the repository at this point in the history
SAK-30385 - Sites and profile button sections not on top
  • Loading branch information
juanjmerono committed Feb 29, 2016
2 parents df11745 + b2f77f3 commit 6afbd9d
Showing 1 changed file with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ body.is-logged-out{
padding: 0 1em;
text-align: left;
width: auto;

@include flex-shrink( 0 );
@include transition(width 0.5s linear);
@media #{$phone}{
width: 0px;
}
.#{$namespace}headerLogo--institution{
background: url($logo) no-repeat center center;
width: 50px;
Expand Down Expand Up @@ -72,9 +69,9 @@ body.is-logged-out{

&.is-maximized{
.siteNavWrap{
width: calc( 100% - 370px );
@include flex-grow( 1 );
@media #{$phone}{

display: none;
}
}
}
Expand Down Expand Up @@ -187,23 +184,28 @@ body.is-logged-out{
color: $background-color;
font-size: 0.9em;
min-height: 45px;
width: 100%;
@include display-flex(inline-flex);
@include align-items(center);
@include transition( top 0.25s linear );
a{
color: $background-color;
font-weight: 300;
}
> * {
display: inline-block;
vertical-align: middle;
@media #{$phone}{
display: inline;
}
}
.#{$namespace}loginNav{
float: right;
margin: 0 1em 0 0px
margin: 0 1em 0 0px;
@include flex-shrink( 0 );
@include align-self( flex-start );
}

@media #{$phone}{
display: block;
position: fixed;
width: 100%;
top: 0;
Expand All @@ -218,8 +220,6 @@ body.is-logged-out{
}

#mastLogin{

//width: calc( 100% - #{$tool-menu-width} - 4px ); //Fix for inline-block margin.

@media #{$phone}{
margin: 0 0 0 0;
Expand Down Expand Up @@ -279,7 +279,7 @@ body.is-logged-out{

.has-avatar, .no-avatar{
display: inline-block;
padding: 0em 1.5em 0.8em 0px;
padding: 0em 1.5em 0.2em 0px;
position: relative;
margin-top: -0.8em;
.#{$namespace}userNav__submenuitem--username, .#{$namespace}userNav__submenuitem--userid{
Expand Down

0 comments on commit 6afbd9d

Please sign in to comment.