amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'hotfix/digital.glarus.menu' into develop

Browse source
This commit is contained in:
rascencio 2015-10-04 19:05:31 -06:00
commit 254d027e4e
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
digitalglarus/static/digitalglarus/css/business-casual.css
View file

@ -42,6 +42,10 @@ hr {
display: none; display: none;
} }
.brand {
text-transform: uppercase;
}
.navbar-brand { .navbar-brand {
text-transform: uppercase; text-transform: uppercase;
font-weight: 900; font-weight: 900;
@ -250,3 +254,13 @@ article {
.blog-abstract { .blog-abstract {
max-width: 700px; max-width: 700px;
} }
.language-chooser-list {
width: 200px;
margin-bottom: 20px;
}
.language-chooser-list a {
color: white;
float: left;
}

6
templates/cms/digitalglarus/base.html
View file

@ -49,11 +49,15 @@
<body> <body>
{% cms_toolbar %} {% cms_toolbar %}
{% language_chooser "menu/language_chooser.html" %}
<div class="brand">Digital Glarus</div> <div class="brand">Digital Glarus</div>
<div class="address-bar"> <div class="address-bar">
{% placeholder 'digital_glarus_legend' %} {% placeholder 'digital_glarus_legend' %}
</div> </div>
<div class="center-block">
<ul class="list-inline center-block language-chooser-list">
{% language_chooser "menu/language_chooser.html" %}
</ul>
</div>
<!-- Navigation --> <!-- Navigation -->
{% include "cms/digitalglarus/partials/menu.html" %} {% include "cms/digitalglarus/partials/menu.html" %}

3
templates/cms/digitalglarus/partials/menu.html
View file

@ -16,7 +16,8 @@
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% show_sub_menu 1 %} {% show_menu 0 0 0 1 %}
{% show_menu_below_id "digital-glarus-page" 0 %}
<li> <li>
<a href="{% url 'digitalglarus:blog' %}">Blog</a> <a href="{% url 'digitalglarus:blog' %}">Blog</a>
</li> </li>