engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui: fixed branding look&feel as per discussions.

Browse source
This commit is contained in:
Daniel Dourvaris 2019-03-06 22:30:13 +01:00
parent 30ab5584db
commit 2ff4542cd5
6 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/apps/admin/tests/test_admin_settings.py
View file

@ -214,8 +214,7 @@ class TestAdminSettingsGlobal(object):
})
response = response.follow()
response.mustcontain(
"""<div class="branding">- %s</div>""" % new_title)
response.mustcontain(new_title)
def post_and_verify_settings(self, settings):
old_title = 'RhodeCode'

6
rhodecode/public/css/main.less
View file

@ -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 {

8
rhodecode/templates/base/base.mako
View file

@ -11,9 +11,11 @@
<div class="logo-wrapper">
<a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
</div>
%if c.rhodecode_name:
<div class="branding">- ${h.branding(c.rhodecode_name)}</div>
%endif
% if c.rhodecode_name:
<div class="branding">
<a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
</div>
% endif
</div>
<!-- MENU BAR NAV -->
${self.menu_bar_nav()}

8
rhodecode/templates/login.mako
View file

@ -16,9 +16,11 @@
<div class="logo-wrapper">
<a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
</div>
%if c.rhodecode_name:
<div class="branding">- ${h.branding(c.rhodecode_name)}</div>
%endif
% if c.rhodecode_name:
<div class="branding">
<a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
</div>
% endif
</div>
</div>
</div>

8
rhodecode/templates/password_reset.mako
View file

@ -16,9 +16,11 @@
<div class="logo-wrapper">
<a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
</div>
%if c.rhodecode_name:
<div class="branding">- ${h.branding(c.rhodecode_name)}</div>
%endif
% if c.rhodecode_name:
<div class="branding">
<a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
</div>
% endif
</div>
</div>
</div>

8
rhodecode/templates/register.mako
View file

@ -16,9 +16,11 @@
<div class="logo-wrapper">
<a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
</div>
%if c.rhodecode_name:
<div class="branding">- ${h.branding(c.rhodecode_name)}</div>
%endif
% if c.rhodecode_name:
<div class="branding">
<a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
</div>
% endif
</div>
</div>
</div>