Skip to content
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

Jump to bottom

TASK-390 Stick footer to bottom of page, not viewport #294

Merged
merged 4 commits into from
Mar 21, 2021
Merged

TASK-390 Stick footer to bottom of page, not viewport #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72eb5d3
Change footer to be the end of the content, rather than sticked to th…
mbielech Mar 20, 2021
277b14a
Footer always on the bottom of the page
mbielech Mar 20, 2021
7274233
Repair jira like drawer after footer changes. Repair zarzadzanie tab
mbielech Mar 20, 2021
d870e6c
Merge branch 'develop' into TASK-390-footer-redesign
mbielech Mar 20, 2021
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
6 changes: 0 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"fontsource-roboto": "^3.0.3",
"html2canvas": "^1.0.0-rc.7",
"immutable": "^4.0.0-rc.12",
"is-electron": "^2.2.0",
"jspdf": "^2.3.1",
"jszip": "^3.6.0",
"node-sass": "^4.14.1",
Expand Down
5 changes: 2 additions & 3 deletions src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import ManagementPage from "./components/workers-page/management-page.component"
import { ScheduleDataActionCreator } from "./state/reducers/month-state/schedule-data/schedule-data.action-creator";
import { NotificationProvider } from "./components/common-components/notification/notification.context";
import { NetlifyProFooter } from "./components/common-components/netlify-pro-footer/netlify-pro-footer.component";
import isElectron from "is-electron";
import { Box } from "@material-ui/core";
import { makeStyles } from "@material-ui/core/styles";
import JiraLikeDrawer from "./components/common-components/drawer/jira-like-drawer.component";
Expand All @@ -34,7 +33,7 @@ const useStyles = makeStyles(() => ({
display: "block",
overflowX: "auto",
overflowY: "auto",
height: `calc(100vh - ${parseInt(ScssVars.footerHeight.slice(0, -2))}px)`,
height: "100vh",
flexGrow: 1,
},
drawer: {
Expand Down Expand Up @@ -111,12 +110,12 @@ function App(): JSX.Element {
<Box className={classes.content}>
<HeaderComponent />
<RouteButtonsComponent tabs={tabs} disabled={disableRouteButtons} />
<NetlifyProFooter />
</Box>
<Box className={classes.drawer}>
<JiraLikeDrawer width={690} />
</Box>
</Box>
{isElectron() ? <></> : <NetlifyProFooter />}
</Route>
</Switch>
</JiraLikeDrawerProvider>
Expand Down
2 changes: 1 addition & 1 deletion src/assets/styles/styles/custom/_management_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
overflow: auto;
width: 100%;
padding: 20px;
min-height: 90vh;
min-height: 100vh;
h1 {
margin: 0 10px 10px 10px;
}
Expand Down
1 change: 1 addition & 0 deletions src/assets/styles/styles/custom/_schedule_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
flex-direction: column;
width: 100%;
align-items: center;
min-height: 100vh;

.schedule {
margin: auto;
Expand Down
2 changes: 1 addition & 1 deletion src/components/common-components/drawer/drawer-header.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const useStyles = makeStyles({
height: ScssVars.drawerHeaderHeight,
},
fullHeight: {
height: "80%",
height: "97%",
overflowY: "auto",
},
exitButton: {
Expand Down
1 change: 0 additions & 1 deletion src/components/common-components/drawer/jira-like-drawer.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const useStyles = makeStyles<Theme, StyleProps>({
height: `calc(100vh - ${
parseInt(ScssVars.headerHeight.slice(0, -2)) +
parseInt(ScssVars.drawerHeaderHeight.slice(0, -2)) +
parseInt(ScssVars.footerHeight.slice(0, -2)) +
1
}px)`,
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/common-components/netlify-pro-footer/netlify-pro-footer.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function NetlifyProFooter(): JSX.Element {
return (
<Grid container className={classes.footer} justify="space-between" alignItems="center">
<Grid item>
Wszelkie prawa zastrzeżone. Copyright © 2020-2021:
Wykonanie:
<a href="http://www.glider.agh.edu.pl/" target="_blank" rel="noopener noreferrer">
<img className={classes.logo} src={gliderLogo} alt="Logo koła naukowego Glider" />
Glider
Expand Down