From cd26b880fbe8b8b3c21b79beae875fc508d53e0d Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Fri, 13 Sep 2013 15:42:52 +0800
Subject: [PATCH] Change the logo and favicon

---
 app/assets/images/favicon.ico            | Bin 0 -> 1150 bytes
 app/assets/images/ga-logo.png            | Bin 0 -> 4047 bytes
 app/assets/stylesheets/orbit-bar.css.erb |   6 +++---
 app/views/layouts/application.html.erb   |   2 +-
 app/views/layouts/new_admin.html.erb     |   2 +-
 app/views/layouts/page_layout.html.erb   |   2 +-
 app/views/layouts/standalone.html.erb    |   2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/images/favicon.ico
 create mode 100644 app/assets/images/ga-logo.png

diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9155f91103e6b694dee5eeb9de341b63ea1693a9
GIT binary patch
literal 1150
zcma))eN5F=7{`yRt-qR7h7d#qGkRMjcr(mJnN!5FGJ`d)Q-Vt*7a0k}z~oK9u0jgl
zkfH<}FEd`cc`s5B+>6}2V+=5X3`#&rGa(?LRESUKcO4sRY;}J7{?2or=lgx0bIx;w
zSRy|M2O<CNBJxfl9EA{%N=TRV-1f^!2pRi7W7W!?&VH(By~-!9Rl&2Xq6-3^f6wK=
zv^zpRTz>Glk&cO5BxY6P;S!GL1L33}t)q7qV$%xvAhFnWu{_&e+ows>WfGm7!ewAs
zBJWHu38r?2q&+6FUtdUSPBwcJigz!}vEe1H+u5NJ;?pxp(&gIqze@fm=dO@$yF|aV
zf0xKC{EWT2L)2I=P*&39HJ`)PQNtfH?i&(C<>`96zVZ7W-hB0S-q^4a%g`@elku9C
z7S={2@|(0>mupb;{%dwQt@PeQm8BbP_F)1u3Md<%VnT8vL&JDCVwZjIH{?1vrxaar
zDf-G*e0}11&M*AoHLK%v9!{a`Kif}Hje#u(ib!g^gr;qTW$up=tc~Mmsol}=6JdoX
zF*G+}9i7Da9yNZdm^`Pu)fO4XFg%KDL>3tpUs3lLxH~#=@<a*7>M!v2R#751U2e9r
zKILO<lQ*~}HO>xd%i}AwX60^_^Z6y~dFK6mMx<SSqLinf@*!YjAXU;XK0m<L+%mjk
zbGa(xlM<e88cRfE{sHBFFV4+j>Fgq_qMAmz)`o==v}qH~CL`s?j`Hc%zu8w|;Jcpl
zbj#v>lA{jEKH{&6x&PGIG%pr4^VYFiUalM9-qnHVDy!MkK1y=OH3Cu&OW$T{<+&Oz
z^fNdIqf+nlM94!*4;s5J^TW+qjAJt-m3_&$j5%(JB+cAIhP4mh&^YS;l>Lp#W?e-G
zskVMf8@lcNQ}pj_&vFXdnUAS+fR9dhvaO(&GgC8YzwRQ;*g@|M)c0NFRQn(;KMu1s
z=pcp~o4cZ&AG@`A>J^?^yq}C=TGo#@_tG_e6WjPS(chdyK7Sr`ej7Iz4W-AMH1oQJ
zb9`+6(nma^D3NuqOa8alr!ZZau)m))eLY^DQB+m6EL*5q%wE4X%3<>>$%j5SwYL@-
t+N|qdNXXe9oPOV8+*yAi#+M2)c$X07JA_DGavT5V&ifUP!c{bi_8(QfLfZfU

literal 0
HcmV?d00001

diff --git a/app/assets/images/ga-logo.png b/app/assets/images/ga-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d30467b35b386a41a210d4d48c0fe5adbee2cf4f
GIT binary patch
literal 4047
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
LVuLTno{9KBmh9-T

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/orbit-bar.css.erb b/app/assets/stylesheets/orbit-bar.css.erb
index 5cebe2735..d6e30b014 100644
--- a/app/assets/stylesheets/orbit-bar.css.erb
+++ b/app/assets/stylesheets/orbit-bar.css.erb
@@ -55,9 +55,9 @@
 	width:100%;
 }
 #orbit-bar .orbit-logo .brand {
-	background:url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px;
-	text-indent:-9999px;
-	padding:5px 20px 4px;
+	background: url(<%= asset_path 'ga-logo.png' %>) no-repeat center center;
+	text-indent: -9999px;
+	padding: 5px 20px 4px;
 }
 #orbit-bar .orbit-logo .brand:hover {
 	background-color:#009ddc;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5a8283ec5..f5d763c36 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <title><%= @title || APP_CONFIG['orbit'] %></title>
-  <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
+  <link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>">
   <%= yield :page_specific_link %>
   <%= stylesheet_link_tag "new_admin" %>
   <%= javascript_include_tag "new_admin" %>
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index 26f299fb2..a85ca6f28 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 	<title><%= @title || APP_CONFIG['orbit'] %></title>
-	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
+	<link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>">
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb
index ae1fef156..fe0779b32 100644
--- a/app/views/layouts/page_layout.html.erb
+++ b/app/views/layouts/page_layout.html.erb
@@ -16,7 +16,7 @@
 </script>
 <meta charset="utf-8">
 	<%= page_title(@item).html_safe %>
-	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
+	<link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>">
 	<%= page_metas(@item).html_safe %>
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
diff --git a/app/views/layouts/standalone.html.erb b/app/views/layouts/standalone.html.erb
index faa592d94..8ce2ad272 100644
--- a/app/views/layouts/standalone.html.erb
+++ b/app/views/layouts/standalone.html.erb
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
   <%= page_title(@item).html_safe %>
-  <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
+  <link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>">
   <%= page_metas(@item).html_safe %>
   <!--[if lt IE 9]>
      <%= javascript_include_tag "html5" %>