changeset 4140:05ed7e20bd0f rhodecode-2.2.5-gpl

old style: use kallithea-logo.png in page headers Using http://openfontlibrary.org/en/font/fally-pin
author Mads Kiilerich <madski@unity3d.com>
date Tue, 10 Dec 2013 19:28:05 +0100
parents ec7e44bf9f31
children fe4e9a7d7bb7
files rhodecode/public/css/style.css rhodecode/public/images/kallithea-logo.png rhodecode/templates/base/base.html rhodecode/templates/login.html rhodecode/templates/password_reset.html rhodecode/templates/register.html
diffstat 6 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/style.css	Wed Jul 02 19:03:21 2014 -0400
+++ b/rhodecode/public/css/style.css	Tue Dec 10 19:28:05 2013 +0100
@@ -249,8 +249,20 @@
     visibility: visible;
 }
 
-#header {
-}
+#header #logo {
+    padding-left: 20px;
+}
+
+#header #logo div.header,
+#header #logo div.branding {
+    font-size: 20px;
+    color: white;
+    float: left;
+    height: 44px;
+    line-height: 44px;
+    margin-right: 10px;
+}
+
 #header ul#logged-user {
     margin-bottom: 5px !important;
     -webkit-border-radius: 0px 0px 8px 8px;
Binary file rhodecode/public/images/kallithea-logo.png has changed
--- a/rhodecode/templates/base/base.html	Wed Jul 02 19:03:21 2014 -0400
+++ b/rhodecode/templates/base/base.html	Tue Dec 10 19:28:05 2013 +0100
@@ -6,7 +6,7 @@
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>
--- a/rhodecode/templates/login.html	Wed Jul 02 19:03:21 2014 -0400
+++ b/rhodecode/templates/login.html	Tue Dec 10 19:28:05 2013 +0100
@@ -13,7 +13,7 @@
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>
--- a/rhodecode/templates/password_reset.html	Wed Jul 02 19:03:21 2014 -0400
+++ b/rhodecode/templates/password_reset.html	Tue Dec 10 19:28:05 2013 +0100
@@ -13,7 +13,7 @@
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>
--- a/rhodecode/templates/register.html	Wed Jul 02 19:03:21 2014 -0400
+++ b/rhodecode/templates/register.html	Tue Dec 10 19:28:05 2013 +0100
@@ -11,7 +11,7 @@
     <div id="header-inner" class="title">
         <div id="logo">
             <div class="header">
-                <a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
             </div>
             %if c.rhodecode_name:
              <div class="branding">- ${c.rhodecode_name}</div>