Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-analytics-dashboard
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-analytics-dashboard
Commits
fb63e46f
Commit
fb63e46f
authored
Sep 04, 2014
by
Clinton Blackburn
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #78 from edx/branding-update
Updated Branding
parents
78dbdfc8
cbaa19a1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
analytics_dashboard/static/images/edx-logo-header.png
+0
-0
analytics_dashboard/static/images/logo-edx.svg
+0
-0
analytics_dashboard/static/sass/_base.scss
+11
-6
analytics_dashboard/templates/brand.html
+1
-1
No files found.
analytics_dashboard/static/images/edx-logo-header.png
0 → 100644
View file @
fb63e46f
1.85 KB
analytics_dashboard/static/images/logo-edx.svg
deleted
100644 → 0
View file @
78dbdfc8
This diff is collapsed.
Click to expand it.
analytics_dashboard/static/sass/_base.scss
View file @
fb63e46f
...
@@ -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
;
}
}
...
...
analytics_dashboard/templates/brand.html
View file @
fb63e46f
...
@@ -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.sv
g' %}"
alt=
"{% settings_value 'PLATFORM_NAME' %}"
/>
<img
class=
"{{ class_prefix }}-brand-logo"
src=
"{% static 'images/
edx-logo-header.pn
g' %}"
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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment