# HG changeset patch # User Daniel Dourvaris # Date 2019-03-06 21:30:13 # Node ID 692134f06cfcebbeae5bb19373c18ab83c777323 # Parent 40ac848d6a6e0c3b688ee9f8bb1946a3bf5d473d ui: fixed branding look&feel as per discussions. diff --git a/rhodecode/apps/admin/tests/test_admin_settings.py b/rhodecode/apps/admin/tests/test_admin_settings.py --- a/rhodecode/apps/admin/tests/test_admin_settings.py +++ b/rhodecode/apps/admin/tests/test_admin_settings.py @@ -214,8 +214,7 @@ class TestAdminSettingsGlobal(object): }) response = response.follow() - response.mustcontain( - """
- %s
""" % new_title) + response.mustcontain(new_title) def post_and_verify_settings(self, settings): old_title = 'RhodeCode' diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -1024,11 +1024,15 @@ label { float:left; } -.branding{ +.branding { float: left; padding: 9px 2px; line-height: 1em; font-size: @navigation-fontsize; + + a { + color: @grey5 + } } img { diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako --- a/rhodecode/templates/base/base.mako +++ b/rhodecode/templates/base/base.mako @@ -11,9 +11,11 @@
RhodeCode
- %if c.rhodecode_name: -
- ${h.branding(c.rhodecode_name)}
- %endif + % if c.rhodecode_name: +
+ ${h.branding(c.rhodecode_name)} +
+ % endif ${self.menu_bar_nav()} diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako --- a/rhodecode/templates/login.mako +++ b/rhodecode/templates/login.mako @@ -16,9 +16,11 @@
RhodeCode
- %if c.rhodecode_name: -
- ${h.branding(c.rhodecode_name)}
- %endif + % if c.rhodecode_name: +
+ ${h.branding(c.rhodecode_name)} +
+ % endif diff --git a/rhodecode/templates/password_reset.mako b/rhodecode/templates/password_reset.mako --- a/rhodecode/templates/password_reset.mako +++ b/rhodecode/templates/password_reset.mako @@ -16,9 +16,11 @@
RhodeCode
- %if c.rhodecode_name: -
- ${h.branding(c.rhodecode_name)}
- %endif + % if c.rhodecode_name: +
+ ${h.branding(c.rhodecode_name)} +
+ % endif diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako --- a/rhodecode/templates/register.mako +++ b/rhodecode/templates/register.mako @@ -16,9 +16,11 @@
RhodeCode
- %if c.rhodecode_name: -
- ${h.branding(c.rhodecode_name)}
- %endif + % if c.rhodecode_name: +
+ ${h.branding(c.rhodecode_name)} +
+ % endif