Skip to content

Revert "fix: pin masthead to top, fix footer overlap, and restore das… #1207

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

Closed
Janell-Huyck wants to merge 1 commit into from
Closed

Revert "fix: pin masthead to top, fix footer overlap, and restore das… #1207

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
38 changes: 0 additions & 38 deletions app/assets/javascripts/masthead_height.js
View file
Open in desktop

This file was deleted.

38 changes: 14 additions & 24 deletions app/assets/stylesheets/hyrax/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,13 @@ $admin-panel-border-color: #dedede !default;

body.dashboard {
background-color: $body-background-color;
padding-top: 0;
}

@media only screen and (max-width : 767px) {
/* Hyrax sidebar layout uses absolute positioning; restore normal flow on mobile. */
.dashboard .sidebar,
.dashboard .main-content {
position: static;
width: 100%;
}

.dashboard .sidebar {
min-height: 0;
}
padding-top: $navbar-height;

.dashboard .main-content {
padding-left: 15px;
padding-right: 15px;
@media only screen and (max-width : 767px) {
padding-top: 0;
}
}

body.dashboard #content-wrapper::after {
clear: both;
content: "";
display: table;
}

.dashboard {
.count-display {
font-size: 1.1em;
Expand All @@ -90,9 +70,19 @@ body.dashboard #content-wrapper::after {
border-top: 2px solid $tab-active-accent-color;
}

/* Masthead positioning is managed globally in scholar.scss. */
/* The #masthead selector below could (and ideally, should) be removed if we can
* replace the "navbar-static-top" class with "navbar-fixed-top" for the Admin UI only
*/
#masthead {
border: 0;
left: 0;
position: fixed;
right: 0;
top: 0;

@media only screen and (max-width : 767px) {
position: initial;
}
}

/* This is needed in Chrome for the admin/admin_sets edit view AND the collection
Expand Down
33 changes: 14 additions & 19 deletions app/assets/stylesheets/scholar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,13 @@ a.visibility-link .label:visited {

.scholar-footer {
padding: 10px;
position: absolute;
bottom: 0;
width: 100%;
background-color: #222;
border-color: #090909;
color: #fff;
font-size:12px;
margin-top: auto;
}

.scholar-footer a {
Expand Down Expand Up @@ -544,32 +545,26 @@ a.media.collection-work-row-link {
margin-top: 50px;
}

:root {
--masthead-height: 70px;
}

html,
body {
min-height: 100%;
}

body {
min-height: 100vh;
display: flex;
flex-direction: column;
}

/* Fixed masthead styles */
header {
min-height: var(--masthead-height);
min-height: 60px;
}

#masthead.navbar-fixed-top {
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 1030;
}

#content-wrapper {
flex: 1 0 auto;
@media (max-width: 767px) {
/* Let the masthead flow normally on small screens so expanded menus push content down */
header {
min-height: 0;
}

#masthead.navbar-fixed-top {
position: static;
}
}
Loading