openstack
/
fuel-docs
Code Issues Proposed changes

Merge "unlink site title"

This commit is contained in:
Jenkins 2015-06-26 09:01:33 +00:00 committed by Gerrit Code Review
parent d29c238db1 ec07d27d19
commit ac83eb8607
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_templates/mirantis/navbar.html
View File

@ -10,7 +10,8 @@
{%- block sidebarlogo %}
<a class="navbar-brand" href="{{ pathto(theme_roottarget) }}" title="{{ project|e }}">
{%- if logo %}<img src="{{ pathto('_static/' + logo, 1) }}">{%- endif %}
{% if theme_navbar_title -%}{{ theme_navbar_title|e }}{%- else -%}{{ project|e }}{%- endif -%}
</a>
{% if theme_navbar_title -%}<span id="site-title">{{ theme_navbar_title|e }}{%- else -%}{{ project|e }}</span>{%- endif -%}
</a>
{%- endblock %}
</div>

5
_templates/mirantis/static/index.html
View File

@ -48,9 +48,8 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#" title="Mirantis OpenStack"><img src="_static/mirantis_logo.png">
Documentation</a>
<span class="navbar-text navbar-version pull-left"><b>6.1</b></span>
<a class="navbar-brand" href="#" title="Mirantis OpenStack"><img src="_static/mirantis_logo.png"></a>
<span id="site-title">Documentation</span>
</div>
<div class="collapse navbar-collapse nav-collapse">

13
_templates/mirantis/static/styles.css
View File

@ -18,6 +18,18 @@ body {
border: none;
}
#site-title {
float: left;
transition: all 0.2s ease;
display: block;
max-width: 100%;
margin-right: 15px;
line-height: 48px;
font-size: 17px;
font-weight: bold;
color: #FFF;
}
h2, h3, h4 {
font-family: 'PT Sans Caption', 'PT Sans', arial, sans-serif;
}
@ -69,7 +81,6 @@ a.navbar-brand {
.navbar > .container .navbar-brand {
line-height: 48px;
margin-right: 15px;
}
.navbar-default .navbar-brand {