MAAS

Merge lp:~ricgard/maas/updating-favicon into lp:~maas-committers/maas/trunk

  1. updating-favicon
  2. Merge into trunk
Proposed by Richard McCartney
Status: Merged
Approved by: Richard McCartney
Approved revision: no longer in the source branch.
Merged at revision: 4411
Proposed branch: lp:~ricgard/maas/updating-favicon
Merge into: lp:~maas-committers/maas/trunk
Prerequisite: lp:~ricgard/maas/disabled-secondary-buttons
Diff against target: 26 lines (+2/-2)
2 files modified
src/maasserver/templates/maasserver/base.html (+1/-1)
src/maasserver/templates/maasserver/index.html (+1/-1)
To merge this branch: bzr merge lp:~ricgard/maas/updating-favicon
Reviewer Review Type Date Requested Status
Richard McCartney (community) Approve
Blake Rouse (community) Approve
Review via email: mp+275353@code.launchpad.net

Commit message

Updating the favicon graphic to use the correct brand colour.

Description of the change

Updating the favicon so it is the correct ubuntu orange colour.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Approved. Got conflict!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Richard McCartney (ricgard) wrote :

Fixed all conflicts.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'src/maasserver/static/img/favicon.png'
2Binary files src/maasserver/static/img/favicon.png 1970-01-01 00:00:00 +0000 and src/maasserver/static/img/favicon.png 2015-10-26 10:46:10 +0000 differ
3=== modified file 'src/maasserver/templates/maasserver/base.html'
4--- src/maasserver/templates/maasserver/base.html 2015-09-25 07:26:05 +0000
5+++ src/maasserver/templates/maasserver/base.html 2015-10-26 10:46:10 +0000
6@@ -14,7 +14,7 @@
7 <meta http-equiv="X-UA-Compatible" content="IE=8">
8 <![endif]-->
9
10- <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" type="image/x-icon" />
11+ <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png" />
12
13 {% block pre_head %}
14 {% endblock %}
15
16=== modified file 'src/maasserver/templates/maasserver/index.html'
17--- src/maasserver/templates/maasserver/index.html 2015-10-21 19:45:50 +0000
18+++ src/maasserver/templates/maasserver/index.html 2015-10-26 10:46:10 +0000
19@@ -15,7 +15,7 @@
20 <meta http-equiv="X-UA-Compatible" content="IE=8">
21 <![endif]-->
22
23- <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" type="image/x-icon" />
24+ <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png" />
25
26 {% include "maasserver/css-conf.html" %}
27