Commit fb63e46f by Clinton Blackburn

Merge pull request #78 from edx/branding-update

Updated Branding
parents 78dbdfc8 cbaa19a1
...@@ -42,6 +42,15 @@ hr.has-emphasis { ...@@ -42,6 +42,15 @@ hr.has-emphasis {
background: $white-t; background: $white-t;
} }
%brand-app {
@extend %hd-titlecased;
display: inline-block;
vertical-align: middle;
color: $edx-blue-s3;
font-weight: 600;
font-family: 'Avenir Next', Helvetica, Arial, sans-serif;
}
// nav + header // nav + header
...@@ -60,9 +69,7 @@ hr.has-emphasis { ...@@ -60,9 +69,7 @@ hr.has-emphasis {
.navbar-brand-app { .navbar-brand-app {
@include transition(color ease-in-out .25s); @include transition(color ease-in-out .25s);
@extend %hd-titlecased; @extend %hd-titlecased;
display: inline-block; @extend %brand-app;
vertical-align: middle;
color: $edx-blue;
// STATE: hover // STATE: hover
&:hover, &:active { &:hover, &:active {
...@@ -383,10 +390,8 @@ hr.has-emphasis { ...@@ -383,10 +390,8 @@ hr.has-emphasis {
.masthead-brand-app { .masthead-brand-app {
@extend %hd-titlecased; @extend %hd-titlecased;
display: inline-block; @extend %brand-app;
vertical-align: middle;
font-size: $font-size-large; font-size: $font-size-large;
color: $edx-blue;
} }
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
{% load dashboard_extras %} {% load dashboard_extras %}
<a class="{{ class_prefix }}-brand" href="/"> <a class="{{ class_prefix }}-brand" href="/">
<img class="{{ class_prefix }}-brand-logo" src="{% static 'images/logo-edx.svg' %}" alt="{% settings_value 'PLATFORM_NAME' %}"/> <img class="{{ class_prefix }}-brand-logo" src="{% static 'images/edx-logo-header.png' %}" alt="{% settings_value 'PLATFORM_NAME' %}"/>
<span class="{{ class_prefix }}-brand-app">{% settings_value 'APPLICATION_NAME' %}</span> <span class="{{ class_prefix }}-brand-app">{% settings_value 'APPLICATION_NAME' %}</span>
</a> </a>
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