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

Merge pull request #615 from tiwariav/bugfix/4427/fix_navbar_logo_repeat

Browse source 
bugfix/4427 fix navbar logo repeat
This commit is contained in:
Arvind Tiwari 2018-04-09 03:27:29 +05:30 • committed by GitHub
commit a7db7e05b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Changelog
View file

@ -1,5 +1,8 @@
next: 1.6.5: 2018-04-08
* #4396: [ungleich] add favicon to ungleich blog * #4396: [ungleich] add favicon to ungleich blog
* #4327: [dcl] fix navbar logo repeat
* bgfix: [hosting] fix broken footer links
* bgfix: [dcl] remove ghost migrations from squashed migration
1.6.4: 2018-04-06 1.6.4: 2018-04-06
* #4362: [cms] Fix the need of dummy home page for different CMS-based sites * #4362: [cms] Fix the need of dummy home page for different CMS-based sites
1.6.3: 2018-04-05 1.6.3: 2018-04-05

5
datacenterlight/static/datacenterlight/css/common.css
View file

@ -74,6 +74,10 @@ a.list-group-item-danger.active:focus {
padding: 10px; padding: 10px;
} }
.navbar-brand > img {
height: 100%;
}
#logoWhite, #logoWhite,
.navbar-transparent #logoBlack { .navbar-transparent #logoBlack {
display: none; display: none;
@ -82,7 +86,6 @@ a.list-group-item-danger.active:focus {
#logoBlack, #logoBlack,
.navbar-transparent #logoWhite { .navbar-transparent #logoWhite {
display: block; display: block;
width: 220px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {

4
datacenterlight/static/datacenterlight/css/landing-page.css
View file

@ -89,10 +89,6 @@ textarea {
border-radius: 6px; border-radius: 6px;
} }
.navbar-brand > img {
max-height: 30px;
}
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar-default .navbar-nav>li>a{ .navbar-default .navbar-nav>li>a{
font-weight: 400; font-weight: 400;

17
ungleich_page/static/ungleich_page/css/glasfaser.css
View file

@ -1,9 +1,11 @@
.topnav img { #logoWhite,
height: 100%; .navbar-transparent #logoBlack {
display: none;
} }
#logoBlack,
.navbar-transparent #logoWhite { .navbar-transparent #logoWhite {
width: 140px; display: block;
} }
.navbar-default { .navbar-default {
@ -12,6 +14,15 @@
padding: 5px; padding: 5px;
} }
@media (max-width: 767px) {
.navbar-transparent #logoBlack {
display: block;
}
.navbar-transparent #logoWhite {
display: none;
}
}
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-transparent { .navbar-transparent {
padding: 20px; padding: 20px;

4
ungleich_page/templates/ungleich_page/glasfaser.html
View file

@ -50,8 +50,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a href="{% url 'ungleich_page:landing' %}" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_black.svg' %}"></a> <a href="https://ungleich.ch" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_black.svg' %}"></a>
<a href="{% url 'ungleich_page:landing' %}" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_white.svg' %}"></a> <a href="https://ungleich.ch" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_white.svg' %}"></a>
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<!-- Start Navbar collapse--> <!-- Start Navbar collapse-->