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

10 final demasha0908 #430

Merged
merged 5 commits into from
Jan 8, 2024
Merged

10 final demasha0908 #430

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a91b79
add 10-final homework
demasha0908 Dec 16, 2023
b26cc6c
fix some login page
demasha0908 Dec 16, 2023
e4a11e2
fix bugs
demasha0908 Dec 22, 2023
c4b04aa
fix games.js
demasha0908 Dec 25, 2023
4889833
Merge branch 'main' into 10-final_demasha0908
vladyslav-yermolin-moc Jan 8, 2024
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
105 changes: 105 additions & 0 deletions docs/demasha0908/calculator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Basic JS</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="css/calculator.css">
<style>

</style>
</head>
<body>
<div class="wrapper">
<header class="header">
<div class="container">
<div class="header__inner">
<a class="logo" href="https://www.mastersacademy.education/frontend-for-beginners-it">
<img src="images/logo.png" alt="icon menu">
</a>
<nav class="menu">
<button class="menu__btn" type="button">
<span class="menu__btn-span"></span>
<span class="menu__btn-span"></span>
<span class="menu__btn-span"></span>
</button>
<ul class="menu__list">
<li class="menu__list-item">
<a class="menu__list-link menu__list-link--active" href="calculator.html">Calculator</a>
</li>
<li class="menu__list-item">
<a class="menu__list-link" href="games.html">Games</a>
</li>
<li class="menu__list-item">
<a class="menu__list-link" href="index.html">About</a>
</li>
<li class="menu__list-item">
<a class="menu__list-link" href="loginpage.html">Login</a>
</li>
</ul>
</nav>
</div>
</div>
</header>
<main>
<div class="field">
<div class="container">
<h1 class="field__title">Calculator</h1>
<div class="field__calculate">
<label>
<input class="field__input" id="firstValue">
</label>
<label>
<select class="field__select" name="operation" id="operation">
<option value="+">+</option>
<option value="-">-</option>
<option value="/">/</option>
<option value="*">*</option>
<option value="**">**</option>
</select>
</label>
<label>
<input class="field__input" id="secondValue">
</label>
<button class="field__button" id="calculate" type="button">=</button>
<span class="field__result" id="result"></span>
</div>
</div>
</div>
</main>
<footer class="footer">
<div class="container">
<div class="footer__content">
<ul class="footer__content-icons">
<li class="footer__icons-facebook">
<a href="https://www.facebook.com/profile.php?id=100004895010154">
<img src="images/facebook.png" alt="facebook">
</a>
</li>
<li class="footer__icons-linkedin">
<a href="https://www.linkedin.com/">
<img src="images/linkedin.png" alt="linkedin">
</a>
</li>
<li class="footer__icons-instagram">
<a href="https://www.instagram.com/mary.demch/">
<img src="images/instagram.png" alt="instagram">
</a>
</li>
</ul>
<h3 class="footer__copyright">
Made with 💗 on course <a href="https://www.mastersacademy.education/frontend-for-beginners-it">'Frontend for beginners' from Masters Academy in 2023</a>, by Mariia Demchenko
</h3>
</div>
</div>
</footer>
</div>
<script src="scripts/calculatefunction.js"></script>
<script src="scripts/calculator.js"></script>
<script src="scripts/menubtn.js"></script>
</body>
</html>
62 changes: 62 additions & 0 deletions docs/demasha0908/css/calculator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
@import url("main.css");

.field {
display: flex;
flex-direction: column;
margin: 20px;
}

.field__title {
margin: 20px 0;
text-align: center;
font-size: 48px;
}

.field__calculate {
display: flex;
column-gap: 20px;
}

.field__select,
.field__input,
.field__button,
.field__result {
font-size: 22px;
}

.field__input,
.field__select {
border-radius: 6px;
border: .6px solid #A9A9A9;
}

.field__select {
background-color: #333;
color: #FFF;
}

.field__button {
border-radius: 6px;
background: #EF4934;
border-width: 0;
color: #FFF;
font-weight: 600;
cursor: pointer;
}

@media (max-width: 860px) {

.field__calculate {
display: flex;
line-height: 58px;
flex-direction: column;
align-items: center;
}

.field__select,
.field__input,
.field__button,
.field__result {
font-size: 30px;
}
}
151 changes: 151 additions & 0 deletions docs/demasha0908/css/games.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
@import url("main.css");

.checkbox {
display: flex;
gap: 32px;
justify-content: center;
background-color: #221F1F;
}

.checkbox__item {
color: #FFF;
}

.checkbox__item-inp {
height: 0;
width: 0;
opacity: 0;
position: absolute;
}

.checkbox__item-check {
position: relative;
display: inline-block;
height: 20px;
width: 20px;
background-color: #221F1F;
border: solid 1px #FFF;
border-radius: 6px;
margin-right: 12px;
vertical-align: sub;
}

.checkbox__item-check::before {
content: " ";
display: inline-block;
width: 14px;
height: 14px;
background-image: url("../images/check-black.png");
background-size: contain;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%) scale(0);
transition: .2s ease-in-out;
}

.checkbox__item-inp:checked+.checkbox__item-check::before {
transform: translate(-50%, -50%) scale(1);
}

.games__text-title {
font-size: 48px;
padding: 40px 0;
text-align: center;
}

.games__loading {
font-size: 48px;
color: #221F1F;
}

.games__loading-text {
display: flex;
justify-content: center;
align-items: center;
}

.games__cards-container {
display: grid;
grid-template-columns: repeat(4, 2fr);
gap: 25px;
padding: 0;
margin: 0 0 46px;
}

.games__box-item {
background-color: #ECECEC;
padding: 12px 12px 22px;
border-radius: 12px;
max-width: 100%;
}

.games__box-top {
display: flex;
justify-content: space-between;
gap: 12px;
}

.games__top-icon {
max-height: 72px;
max-width: 96px;
border-radius: 8px;
}

.games__top-name {
font-size: 18px;
font-weight: 700;
}

.games__top-info {
line-height: 21px;
}

.games__box-bottom {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 16px;
padding-top: 22px;
}

@media (max-width: 1180px) {

.games__cards-container {
display: grid;
grid-template-columns: repeat(3, 3fr);
gap: 25px;
padding: 0;
}
}

@media (max-width: 890px) {

.games__cards-container {
display: grid;
grid-template-columns: repeat(2, 2fr);
padding: 0 25px;
margin: 0;
width: 100%;
}

.games__box-bottom {
margin: 0;
}
}

@media (max-width: 680px) {

.games__text-title {
font-size: 30px;
padding: 30px 0;
}

.games__cards-container {
display: grid;
grid-template-columns: repeat(1, 1fr);
padding: 0 25px;
margin: 0;
}
}

Loading