Skip to content

E
edx-platform
Commit cd8051fb by Galen Frechette
Options

cleans up signed in users navigation

parent 9bcdcec6
Showing with 131 additions and 144 deletions
lms/static/sass/_shared_header.scss
...@@ -19,6 +19,26 @@ header.app { ...@@ -19,6 +19,26 @@ header.app {
float: left; float: left;
height: 100%; height: 100%;
margin: 16px 15px 0px 0px; margin: 16px 15px 0px 0px;
position: relative;
img {
position: relative;
z-index: 2;
}
&:hover {
&::before {
@include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 0.8) 0%, rgba(255,255,255, 0) 100%));
content: "";
display: block;
height: 90px;
left: -20px;
position: absolute;
top: -32px;
width: 90px;
z-index: 1;
}
}
} }
.divider { .divider {
...@@ -79,6 +99,8 @@ header.app { ...@@ -79,6 +99,8 @@ header.app {
} }
li.primary { li.primary {
position: relative;
a { a {
border: 1px solid transparent; border: 1px solid transparent;
@include border-radius(3px); @include border-radius(3px);
...@@ -86,16 +108,16 @@ header.app { ...@@ -86,16 +108,16 @@ header.app {
color: $base-font-color; color: $base-font-color;
display: block; display: block;
font: normal 1.2rem/1.4rem $sans-serif; font: normal 1.2rem/1.4rem $sans-serif;
height: 30px; height: 38px;
@include inline-block; @include inline-block;
margin: 5px; margin: 1px 5px;
padding: 6px 8px; padding: 10px 8px;
text-decoration: none; text-decoration: none;
text-transform: uppercase; text-transform: uppercase;
text-shadow: 0 1px rgba(255,255,255, 0.6); text-shadow: 0 1px rgba(255,255,255, 0.6);
vertical-align: middle; vertical-align: middle;
&:hover { &:hover, &.active {
@include background-image(linear-gradient(-90deg, rgb(245,245,245) 0%, rgb(243,243,243) 50%, rgb(237,237,237) 50%, rgb(235,235,235) 100%)); @include background-image(linear-gradient(-90deg, rgb(245,245,245) 0%, rgb(243,243,243) 50%, rgb(237,237,237) 50%, rgb(235,235,235) 100%));
border-color: rgb(200,200,200); border-color: rgb(200,200,200);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6)); @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
...@@ -103,163 +125,126 @@ header.app { ...@@ -103,163 +125,126 @@ header.app {
} }
} }
} }
}
nav.user { &.user {
float: right; float: right;
ol {
font-size: 0em;
li { a.user-link {
border-right: 1px solid rgb(200,200,200); padding: 9px 8px 11px 40px;
@include inline-block;
margin-top: 10px;
padding: 0px 5px;
position: relative; position: relative;
vertical-align: bottom; text-transform: none;
a { @media screen and (max-width: 768px) {
@include border-radius(3px); font-size: 0em;
color: $lighter-base-font-color; padding: 10px 0px;
display: block; width: 38px;
font: normal italic 1.2rem/1.2rem $serif; }
height: 15px;
padding: 10px;
text-decoration: none;
text-transform: lowercase;
text-shadow: 0 1px rgba(255,255,255, 0.4);
&:hover { .avatar {
background: rgb(220,220,220); background: rgb(220,220,220);
color: $base-font-color; @include border-radius(3px);
} border: 1px solid rgb(180,180,180);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
height: 22px;
@include inline-block;
left: 8px;
overflow: hidden;
position: absolute;
top: 6px;
width: 22px;
&.active { &::after {
background: rgb(220,220,220); @include background-image(linear-gradient((-60deg), rgba(0,0,0, 0) 0%, rgba(0,0,0, 0.1) 50%, rgba(0,0,0, 0.2) 50%, rgba(0,0,0, 0.3) 100%));
color: $base-font-color; content: "";
display: block;
height: 100%;
position: absolute;
right: 0px;
top: 0px;
width: 100%;
} }
&.options { img {
font: normal 1.2rem/1.2rem $sans-serif; @include border-radius(4px);
padding-right: 10px; display: block;
text-transform: none; min-height: 100%;
min-width: 100%;
height: 100%;
} }
}
}
&.user-link { ol.user-options {
font: normal 1.2rem/1.2rem $sans-serif; @include border-radius(4px);
padding: 10px 10px 10px 45px; @include box-shadow(0 1px 6px 0 rgba(0,0,0, 0.3));
text-transform: none; border: 1px solid rgb(0,0,0);
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
@media screen and (max-width: 768px) { rgba(0,0,0, 0.7) 100%));
font-size: 0em; display: none;
padding: 10px 0px; right: 0px;
width: 38px; padding: 5px 10px;
} position: absolute;
top: 52px;
.avatar { width: 150px;
background: rgb(220,220,220); z-index: 3;
@include border-radius(3px);
border: 1px solid rgb(180,180,180); &.expanded {
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6)); display: block;
height: 22px; }
@include inline-block;
left: 15px;
overflow: hidden;
position: absolute;
top: 5px;
width: 22px;
&::after {
@include background-image(linear-gradient((-60deg), rgba(0,0,0, 0) 0%, rgba(0,0,0, 0.1) 50%, rgba(0,0,0, 0.2) 50%, rgba(0,0,0, 0.3) 100%));
content: "";
display: block;
height: 100%;
position: absolute;
right: 0px;
top: 0px;
width: 100%;
}
img { &::before {
@include border-radius(4px); background: transparent;
display: block; border: {
min-height: 100%; top: 6px solid rgba(0,0,0, 1);
min-width: 100%; right: 6px solid rgba(0,0,0, 1);
height: 100%; bottom: 6px solid transparent;
} left: 6px solid transparent;
}
} }
@include box-shadow(1px 0 0 0 rgb(0,0,0), 0 -1px 0 0 rgb(0,0,0));
content: "";
display: block;
height: 0px;
position: absolute;
@include transform(rotate(-45deg));
right: 12px;
top: -6px;
width: 0px;
} }
ol.user-options { li {
@include border-radius(4px); display: block;
@include box-shadow(0 1px 6px 0 rgba(0,0,0, 0.3)); border-top: 1px solid rgba(0,0,0, 0.4);
border: 1px solid rgb(200,200,200); @include box-shadow(inset 0 1px 0 0 rgba(255,255,255, 0.05));
background: rgb(220,220,220);
display: none;
right: 4px;
padding: 5px 10px;
position: absolute;
top: 50px;
width: 170px;
z-index: 3;
&.expanded { &:first-child {
display: block; border: none;
@include box-shadow(none);
} }
&::before { > a {
background: transparent; @include box-sizing(border-box);
border: { color: rgba(255,255,255, 0.9);
top: 8px solid rgb(220,220,220);
right: 8px solid rgb(220,220,220);
bottom: 8px solid transparent;
left: 8px solid transparent;
}
@include box-shadow(1px 0 0 0 rgb(200,200,200), 0 -1px 0 0 rgb(200,200,200));
content: "";
display: block; display: block;
height: 0px; font: normal italic 1.2rem/1.4rem $serif;
position: absolute; height: auto;
@include transform(rotate(-45deg)); margin: 5px 0px;
right: 10px; overflow: hidden;
top: -7px; padding: 3px 5px 4px;
width: 0px; text-shadow: none;
} text-overflow: ellipsis;
text-transform: none;
li { @include transition(padding, 0.1s, linear);
border: { white-space: nowrap;
top: 1px solid rgb(200,200,200);
right: none;
bottom: none;
left: none;
}
margin: 0px;
padding: 0px;
width: 100%; width: 100%;
&:first-child { &:hover {
border: none; background: $blue;
} @include background-image(linear-gradient(-90deg, lighten($blue, 15%) 0%,
rgba($blue, 1) 100%));
a { border-color: rgba(0,0,0, 1);
@include box-sizing(border-box); @include box-shadow(none);
display: block; padding-left: 8px;
font: normal 1rem/1.2rem $sans-serif; text-shadow: 0 -1px rgba(0,0,0, 0.2);
height: auto;
margin: 5px 0px;
overflow: hidden;
padding: 5px;
text-overflow: ellipsis;
@include transition(padding, 0.1s, linear);
white-space: nowrap;
width: 100%;
&:hover {
background: rgb(255,255,255);
padding: 5px 8px;
}
} }
} }
} }
......
lms/templates/navigation.html
...@@ -25,15 +25,17 @@ ...@@ -25,15 +25,17 @@
%if user.is_authenticated(): %if user.is_authenticated():
<nav class="user"> <nav class="user">
<ol> <ol>
<li> <li class="primary">
<div class="divider"></div>
<a href="/dashboard" class="user-link"> <a href="/dashboard" class="user-link">
<span class="avatar"><img src="${static.url('images/profile.jpg')}" /></span> <span class="avatar"><img src="${static.url('images/profile.jpg')}" /></span>
Neil deGrasse Tyson Neil deGrasse Tyson
</a> </a>
</li> <div class="divider"></div>
<li>
<a href="#" class="options">&#9662</a> <a href="#" class="options">&#9662</a>
<div class="divider"></div>
<ol class="user-options"> <ol class="user-options">
<li><a href="#">Account Settings</a></li>
<li><a href="#">Help</a></li> <li><a href="#">Help</a></li>
<li><a href="/logout">Log Out</a></li> <li><a href="/logout">Log Out</a></li>
</ol> </ol>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment