diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index 74e3b6fccb..15bda027e7 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -77,7 +77,7 @@ } aside { - margin: 0; + margin: ($baseline*1.5) 0 0 0; width: flex-grid(4); float: left; } diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 49c9ac250b..794e445141 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -1,8 +1,8 @@ header.global { border-bottom: 1px solid rgb(190,190,190); @include box-shadow(0 1px 5px 0 rgba(0,0,0, 0.1)); - @include background-image(linear-gradient(-90deg, rgba(255,255,255, 1), rgba(230,230,230, 0.9))); - height: 68px; + background: $white; + height: 76px; position: relative; width: 100%; z-index: 10; @@ -12,7 +12,7 @@ header.global { height: 40px; margin: 0 auto; max-width: 1200px; - padding: 14px 10px 0px; + padding: 18px 10px 0px; max-width: grid-width(12); min-width: 760px; } @@ -251,4 +251,68 @@ header.global { } } } -} + + .nav-global { + margin-top: ($baseline/4); + list-style: none; + + li { + display: inline-block; + margin: 0 ($baseline/4) 0 0; + font-size: em(16); + font-weight: 600; + text-transform: uppercase; + letter-spacing: 0.5px; + + &:last-child { + margin-right: 0; + } + + a { + display:block; + padding: ($baseline/4); + color: tint($black, 20%); + + &:hover, &:active { + text-decoration: none; + color: $m-blue; + } + } + } + + // logged in + &.authenticated { + + } + } + + .nav-courseware { + float: right; + margin-top: ($baseline/2); + list-style: none; + + li { + display: inline-block; + + a { + @include button(simple, $blue); + @include box-sizing(border-box); + @include border-radius(3px); + padding: ($baseline/4) ($baseline/2); + font-size: em(14); + font-weight: 600; + letter-spacing: 0; + text-align: center; + + &:hover { + text-decoration: none; + } + } + } + + // logged in + &.authenticated { + + } + } +} \ No newline at end of file diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index d574bc3f6e..898c665b85 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -44,13 +44,16 @@ site_status_msg = get_site_status_msg(course_id)

${course.org}: ${course.number} ${course.title}

% endif -
    -
  1. - Find Courses + % if user.is_authenticated(): + - % if user.is_authenticated():
    1. @@ -61,38 +64,40 @@ site_status_msg = get_site_status_msg(course_id)
    - % else: -
      -
    1. - About - Blog - Jobs -% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']: - Log In -% endif + % else: + - %endif + + + % endif % if course:
      Warning: Your browser is not fully supported. We strongly recommend using Chrome or Firefox.
      -% endif - -%if not user.is_authenticated(): - <%include file="login_modal.html" /> - <%include file="signup_modal.html" /> - <%include file="forgot_password_modal.html" /> -%endif +% endif \ No newline at end of file