Skip to content

XNAT-8789 Empty header resize function causing logo overlap #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
willhorton-xw wants to merge 1 commit into
base: develop
Choose a base branch
from
+4 −21
Open

XNAT-8789 Empty header resize function causing logo overlap #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion xnat-web/src/main/webapp/style/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,8 +1654,9 @@ span.sep {
}

#header {
position: relative;
background: #fff;
height: unset !important;
position: relative;
z-index: 2;
}

Expand Down
20 changes: 1 addition & 19 deletions xnat-web/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,25 +323,7 @@

XNAT.app.adjustHeaderAndNavForLogoSize = function(){

var header_logo$ = jq('#header_logo');

// adjust height of header if logo is taller than 65px
var hdr_logo_height = header_logo$.height();
if (hdr_logo_height > 65) {
jq('.main_header').height(hdr_logo_height + 10);
}

## Commented out 2016/09/02 (XNAT-4501). I don't think we want to do this (See home page when this takes effect)
##// adjust width of main nav if logo is wider than 175px
##var hdr_logo_width = header_logo$.width();
##if (hdr_logo_width > 175) {
## jq('#main_nav').width(932 - hdr_logo_width - 20);
##}

//
//var recent_proj_height = jq('#min_projects_list > div').height();
var recent_proj_height = 67;
//jq('#min_projects_list, #min_expt_list').height(recent_proj_height * 5).css({'min-width':349,'overflow-y':'scroll'});
// remove this function's capability. CSS is better used to adjust this header.

}

Expand Down
2 changes: 1 addition & 1 deletion xnat-web/src/main/webapp/xnat-templates/screens/QuickSearch.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

// only show the header logo on the 'home' page
$('#header_logo').show();
XNAT.app.adjustHeaderAndNavForLogoSize();
// XNAT.app.adjustHeaderAndNavForLogoSize();

@rherrick rherrick Aug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should just delete the line rather than comment it out.


var frontTabs = new YAHOO.widget.TabView('front_search');

Expand Down
Loading