Skip to content
This repository has been archived by the owner on Dec 2, 2022. It is now read-only.

Commit

Permalink
Fix: Logo breaks header when using 'old navbar'.
Browse files Browse the repository at this point in the history
  • Loading branch information
gjb2048 committed Feb 7, 2019
1 parent 4100a3c commit a0261b8
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 24 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ New in 3.5.1.5
==============
- FIX: Administration / Naviagtion menu still appearing when flat navigation is on because they are not in the side-pre region.
- FIX: 'courselistteachericon' not showing.
- FIX: Logo breaks header when using 'old navbar'.
- NEW: Course content search attribute and order.

New in 3.5.1.4
Expand Down
1 change: 0 additions & 1 deletion layout/tiles/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
<div id="page-header" class="clearfix<?php echo ($oldnavbar) ? ' oldnavbar' : ''; echo ($haslogo) ? ' logo' : ' nologo'; ?>">
<div class="container-fluid">
<div class="row-fluid">
<!-- HEADER: LOGO AREA -->
<?php
if (!$haslogo) {
echo '<div class="pull-left">';
Expand Down
27 changes: 18 additions & 9 deletions less/essential/header.less
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@
}
}

a.logo {
background-position: left center;
float: left;
}

div.titlearea {
margin-left: 80px;
padding-left: 10px;
Expand Down Expand Up @@ -140,9 +135,16 @@
}

#page-header {
&.logo {
min-height: 52px;
&.logo .logo-container {
height: 52px;
.logo {
line-height: 52px;
img {
max-height: 52px;
}
}
}

&.nologo {
height: 52px;
max-height: 52px;
Expand All @@ -151,9 +153,16 @@

@media (min-width: @navbarCollapseDesktopWidth) {
#page-header {
&.logo {
min-height: 64px;
&.logo .logo-container {
height: 64px;
.logo {
line-height: 64px;
img {
max-height: 64px;
}
}
}

&.nologo {
height: 64px;
max-height: 64px;
Expand Down
6 changes: 2 additions & 4 deletions less/essential/navigation.less
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@

#essentialnavbar {
&.oldnavbar {
&.nologo {
top: 52px;
}
top: 52px;
}
}

@media (min-width: @navbarCollapseDesktopWidth) {
#essentialnavbar.oldnavbar.nologo {
#essentialnavbar.oldnavbar {
top: 64px;
}
}
Expand Down
32 changes: 22 additions & 10 deletions style/essential.css
Original file line number Diff line number Diff line change
Expand Up @@ -14305,6 +14305,10 @@ form {
.mform .fitem .fitemtitle div {
display: inline;
}
.mform .fitem .fitemtitle .mediaplugin,
.mform .fitem .fitemtitle .mediaplugin div {
display: block;
}
#adminsettings .error,
.loginpanel .error,
.mform .error {
Expand Down Expand Up @@ -23149,10 +23153,6 @@ table#greyboxleft h2 {
#page-header #essentialicons button {
margin: 0 0 0 5px;
}
#page-header a.logo {
background-position: left center;
float: left;
}
#page-header div.titlearea {
margin-left: 80px;
padding-left: 10px;
Expand Down Expand Up @@ -23184,16 +23184,28 @@ table#greyboxleft h2 {
max-height: 80px;
}
}
#page-header.logo {
min-height: 52px;
#page-header.logo .logo-container {
height: 52px;
}
#page-header.logo .logo-container .logo {
line-height: 52px;
}
#page-header.logo .logo-container .logo img {
max-height: 52px;
}
#page-header.nologo {
height: 52px;
max-height: 52px;
}
@media (min-width: 980px) {
#page-header.logo {
min-height: 64px;
#page-header.logo .logo-container {
height: 64px;
}
#page-header.logo .logo-container .logo {
line-height: 64px;
}
#page-header.logo .logo-container .logo img {
max-height: 64px;
}
#page-header.nologo {
height: 64px;
Expand Down Expand Up @@ -23367,11 +23379,11 @@ ul.socials li {
margin-top: 0;
}
}
#essentialnavbar.oldnavbar.nologo {
#essentialnavbar.oldnavbar {
top: 52px;
}
@media (min-width: 980px) {
#essentialnavbar.oldnavbar.nologo {
#essentialnavbar.oldnavbar {
top: 64px;
}
}
Expand Down

0 comments on commit a0261b8

Please sign in to comment.