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

Updated smaller footer #138

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+132 −139
Open

Updated smaller footer #138

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b59c59
updated smaller footer
Jan 28, 2021
1040048
update-small-footer
Feb 2, 2021
cfc5ed3
update static footer screen
Feb 4, 2021
2f6f360
Add-download-text-button and bug-ci-github
Feb 4, 2021
3fe6735
update bug ci and download text button
Feb 4, 2021
124a7f3
Merge pull request #2 from perdi8/Add-download-text-button
perdi8 Feb 4, 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
13 changes: 6 additions & 7 deletions front/src/common-app/components/footer/footer.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,37 @@ import LanguageIcon from '@material-ui/icons/Language';
export const FooterComponent: React.FC = () => {
const {
footerContainer,
topContainerCenter,
logoContainer,
lemoncodeIcon,
bottomContainer,
iconContainer,
iconListItem,
icon,
githubIcon,
copyright,
} = classes;
return (
<footer className={footerContainer}>
<div className={topContainerCenter}>
<div className={logoContainer}>
<LemoncodeLogo className={lemoncodeIcon} />
</div>
<div className={bottomContainer}>
<ul className={iconContainer}>
<li className={iconListItem}>
<li>
<a href="https://github.com/Lemoncode" target="_blank">
<GithubIcon className={githubIcon} />
</a>
</li>
<li className={iconListItem}>
<li>
<a href="https://twitter.com/lemoncoders" target="_blank">
<TwitterIcon className={icon} />
</a>
</li>
<li className={iconListItem}>
<li>
<a href="https://lemoncode.net/" target="_blank">
<LanguageIcon className={icon} />
</a>
</li>
<li className={iconListItem}>
<li>
<a href="mailto:[email protected]" target="_blank">
<EmailRoundedIcon className={icon} />
</a>
Expand Down
47 changes: 11 additions & 36 deletions front/src/common-app/components/footer/footer.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,19 @@ export const footerContainer = css`
display: flex;
flex-direction: column;
justify-content: space-between;
height: ${spacing(37.5)};
padding: ${spacing(2.5)} ${spacing(12.5)};
background-color: ${color.secondary};
@media (max-width: ${breakpoints.values.md}px) {
padding: ${spacing(2.5)} ${spacing(5)} ${spacing(3.75)} ${spacing(5)};
}
@media (max-width: ${breakpoints.values.xs}px) {
height: ${spacing(43.75)};
}
`;

export const topContainer = css`
display: flex;
justify-content: space-between;
height: ${spacing(24.375)};
padding: 0 ${spacing(2)};
align-items: center;
@media (max-width: ${breakpoints.values.xs}px) {
flex-direction: column-reverse;
justify-content: center;
align-items: center;
height: ${spacing(27.5)};
}
`;

export const topContainerCenter = css`
export const logoContainer = css`
display: flex;
justify-content: center;
align-items: center;
height: ${spacing(24.375)};
padding: 0 ${spacing(2)};
`;

export const bottomContainer = css`
display: flex;
justify-content: space-between;
padding-top: ${spacing(2)};
padding: ${spacing(3)};
border-top: 1px solid ${color.primary};
@media (max-width: ${breakpoints.values.xs}px) {
flex-direction: column;
Expand All @@ -54,23 +30,22 @@ export const bottomContainer = css`
`;

export const lemoncodeIcon = css`
height: ${spacing(12.5)};
max-width: 100px;
padding: ${spacing(3)} 0;
`;

export const iconContainer = css`
display: flex;
justify-content: space-between;
width: 50%;
margin: 0;
padding: 0;
padding: 0 0 ${spacing(1)};
list-style: none;
`;

export const iconListItem = css`
margin-right: ${spacing(1)};
&:first-of-type {
margin-right: ${spacing(1.4)};
@media (min-width: ${breakpoints.values.sm}px) {
width: 20%;
}
&:last-of-type {
margin-right: 0;
@media (min-width: ${breakpoints.values.lg}px) {
width: 10%;
}
`;

Expand Down
1 change: 0 additions & 1 deletion front/src/pods/student/student.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import TextareaAutosize from '@material-ui/core/TextareaAutosize';
import Typography from '@material-ui/core/Typography';
import * as innerClasses from './student.styles';

interface Props {
room: string;
log: string;
Expand Down
1 change: 1 addition & 0 deletions front/src/pods/trainer/components/session.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,4 @@ export const undoIcon = css`
display: initial;
}
`;

4 changes: 2 additions & 2 deletions front/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ <h3>6. NON-WAIVER</h3>
</div>
</main>
<footer class="footer">
<div class="footer__top-container">
<div class="footer-container">
<nav>
Copy link
Member

Choose a reason for hiding this comment

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

I think isn't necessary because the top menu is fixed

<ul class="footer__list">
<li class="footer__list__item">
Expand All @@ -432,7 +432,7 @@ <h3>6. NON-WAIVER</h3>
</li>
<li class="footer__icon-list-item">
<a href="https://twitter.com/lemoncoders" target="_blank">
<svg class="footer__icon-twitter">
<svg class="footer__icon">
<use xlink:href="assets/sprite.svg#twitter-icon"></use>
</svg>
</a>
Expand Down
115 changes: 34 additions & 81 deletions front/static/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,61 +568,39 @@ form textarea {
.footer {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 30rem;
padding: 2rem 10rem;
justify-content: space-around;
background-color: var(--color-dark);
}

@media only screen and (max-width: 728px) {
.footer {
padding: 2rem 4rem 3rem 4rem;
}
}

@media only screen and (max-width: 380px) {
.footer {
height: 35rem;
}
.footer-container {
display: flex;
flex-direction: row;
justify-content: space-between;
padding: 0 10rem;
}

.footer__top-container {
padding: 0 2rem;
.footer__bottom-container {
display: flex;
justify-content: space-between;
height: 19.5rem;
align-items: center;
border-top: 1px solid #d9d900;
padding: 1.5rem 0 3.5rem 0;
}

@media only screen and (max-width: 380px) {
.footer__top-container {
flex-direction: column-reverse;
align-items: center;
.footer__bottom-container {
flex-direction: column;
justify-content: center;
height: 22rem;
align-items: center;
}
Copy link
Member

Choose a reason for hiding this comment

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

the same

}

.footer__logo {
height: 10rem;
width: 11.2rem;
}

.footer__list {
padding: 0;
margin: 0;
font-size: 1.5rem;
list-style: none;
}

@media only screen and (max-width: 380px) {
.footer__list {
text-align: center;
margin-top: 2.4rem;
}
padding-top: 4rem;
}

.footer__list__item {
margin-top: 0.5rem;
margin-top: 1.5rem;
}

.footer__list__item a {
Expand All @@ -636,47 +614,33 @@ form textarea {
color: var(--color-primary-main);
}

.footer__bottom-container {
display: flex;
justify-content: space-between;
align-items: center;
border-top: 1px solid #d9d900;
padding-top: 1rem;
}

@media only screen and (max-width: 380px) {
.footer__bottom-container {
flex-direction: column;
align-items: center;
.footer__list {
text-align: center;
margin-top: 2.4rem;
}
}

.footer--logo-lemon-container:hover .footer--logo-lemon {
fill: var(--color-secondary-main);
}

.footer--logo-lemon {
position: absolute;
top: 0.8rem;
right: 1.6rem;
fill: var(--color-light);
height: 10rem;
width: 10rem;
.footer__logo {
display: flex;
justify-content: right;
align-items: center;
max-width: 100px;
padding: 0.5rem 0;
}

.footer__icon-list {
display: flex;
align-items: center;
padding: 0;
margin: 0;
list-style: none;
padding: 0 5rem;
}

.footer__icon-list-item {
margin-right: 1.2rem;
margin-right: 1.5rem;
fill: var(--color-grey-light);
}
.footer__icon-list-item:last-of-type {
margin-right: 0;

.footer__list__item a:hover {
color: var(--color-primary-main);
}

.footer__icon {
Expand All @@ -687,25 +651,14 @@ form textarea {

.footer__icon:hover {
fill: var(--color-primary-main);
}

.footer__icon-twitter {
height: 3.5rem;
width: 3.5rem;
margin-top: 0.2rem;
margin-right: -0.6rem;
margin-left: -0.6rem;
fill: var(--color-grey-light);
}

.footer__icon-twitter:hover {
fill: var(--color-primary-main);
cursor: pointer;
}

.footer__copyright {
font-weight: 400;
font-size: 1.5rem;
padding: 0 5rem;
color: var(--color-grey-light);
font-weight: 300;
font-size: 1.4rem;
}

@media only screen and (max-width: 578px) {
Expand Down