Skip to content

E
edx-platform
Commit cd8051fb by Galen Frechette
Options

cleans up signed in users navigation

parent 9bcdcec6
Showing with 66 additions and 79 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,52 +125,13 @@ header.app { ...@@ -103,52 +125,13 @@ header.app {
} }
} }
} }
}
nav.user { &.user {
float: right; float: right;
ol { a.user-link {
font-size: 0em; padding: 9px 8px 11px 40px;
li {
border-right: 1px solid rgb(200,200,200);
@include inline-block;
margin-top: 10px;
padding: 0px 5px;
position: relative; position: relative;
vertical-align: bottom;
a {
@include border-radius(3px);
color: $lighter-base-font-color;
display: block;
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 {
background: rgb(220,220,220);
color: $base-font-color;
}
&.active {
background: rgb(220,220,220);
color: $base-font-color;
}
&.options {
font: normal 1.2rem/1.2rem $sans-serif;
padding-right: 10px;
text-transform: none;
}
&.user-link {
font: normal 1.2rem/1.2rem $sans-serif;
padding: 10px 10px 10px 45px;
text-transform: none; text-transform: none;
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
...@@ -164,10 +147,10 @@ header.app { ...@@ -164,10 +147,10 @@ header.app {
@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));
height: 22px; height: 22px;
@include inline-block; @include inline-block;
left: 15px; left: 8px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
top: 5px; top: 6px;
width: 22px; width: 22px;
&::after { &::after {
...@@ -190,19 +173,19 @@ header.app { ...@@ -190,19 +173,19 @@ header.app {
} }
} }
} }
}
ol.user-options { ol.user-options {
@include border-radius(4px); @include border-radius(4px);
@include box-shadow(0 1px 6px 0 rgba(0,0,0, 0.3)); @include box-shadow(0 1px 6px 0 rgba(0,0,0, 0.3));
border: 1px solid rgb(200,200,200); border: 1px solid rgb(0,0,0);
background: rgb(220,220,220); @include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
rgba(0,0,0, 0.7) 100%));
display: none; display: none;
right: 4px; right: 0px;
padding: 5px 10px; padding: 5px 10px;
position: absolute; position: absolute;
top: 50px; top: 52px;
width: 170px; width: 150px;
z-index: 3; z-index: 3;
&.expanded { &.expanded {
...@@ -212,54 +195,56 @@ header.app { ...@@ -212,54 +195,56 @@ header.app {
&::before { &::before {
background: transparent; background: transparent;
border: { border: {
top: 8px solid rgb(220,220,220); top: 6px solid rgba(0,0,0, 1);
right: 8px solid rgb(220,220,220); right: 6px solid rgba(0,0,0, 1);
bottom: 8px solid transparent; bottom: 6px solid transparent;
left: 8px solid transparent; left: 6px solid transparent;
} }
@include box-shadow(1px 0 0 0 rgb(200,200,200), 0 -1px 0 0 rgb(200,200,200)); @include box-shadow(1px 0 0 0 rgb(0,0,0), 0 -1px 0 0 rgb(0,0,0));
content: ""; content: "";
display: block; display: block;
height: 0px; height: 0px;
position: absolute; position: absolute;
@include transform(rotate(-45deg)); @include transform(rotate(-45deg));
right: 10px; right: 12px;
top: -7px; top: -6px;
width: 0px; width: 0px;
} }
li { li {
border: { display: block;
top: 1px solid rgb(200,200,200); border-top: 1px solid rgba(0,0,0, 0.4);
right: none; @include box-shadow(inset 0 1px 0 0 rgba(255,255,255, 0.05));
bottom: none;
left: none;
}
margin: 0px;
padding: 0px;
width: 100%;
&:first-child { &:first-child {
border: none; border: none;
@include box-shadow(none);
} }
a { > a {
@include box-sizing(border-box); @include box-sizing(border-box);
color: rgba(255,255,255, 0.9);
display: block; display: block;
font: normal 1rem/1.2rem $sans-serif; font: normal italic 1.2rem/1.4rem $serif;
height: auto; height: auto;
margin: 5px 0px; margin: 5px 0px;
overflow: hidden; overflow: hidden;
padding: 5px; padding: 3px 5px 4px;
text-shadow: none;
text-overflow: ellipsis; text-overflow: ellipsis;
text-transform: none;
@include transition(padding, 0.1s, linear); @include transition(padding, 0.1s, linear);
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
&:hover { &:hover {
background: rgb(255,255,255); background: $blue;
padding: 5px 8px; @include background-image(linear-gradient(-90deg, lighten($blue, 15%) 0%,
} rgba($blue, 1) 100%));
border-color: rgba(0,0,0, 1);
@include box-shadow(none);
padding-left: 8px;
text-shadow: 0 -1px rgba(0,0,0, 0.2);
} }
} }
} }
......
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