Skip to content

nazdar #12

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
AdamMajak wants to merge 7 commits into
base: main-merge
Choose a base branch
from
Open

nazdar #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9bcf04
Update README.md
MarekKromka Jun 17, 2025
52ee0b9
bum
rtatigua Jun 17, 2025
74c02b7
Update README.md
MarekKromka Jun 17, 2025
f545cf3
Merge branch 'main' of https://github.com/Openlab-2-2023/Git-Exercise
rtatigua Jun 17, 2025
61ac0d8
Update README.md
MarekKromka Jun 17, 2025
4cd472a
Update README.md
MarekKromka Jun 17, 2025
1c54104
Merge pull request #8 from Openlab-2-2023/MarekKromka-patch-1
MarekKromka Jun 17, 2025
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
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ Tento projekt slúži ako základ na precvičenie práce s Gitom a GitHubom v t
5. V `script.js` pridaj jednoduchú interaktivitu (napr. zmena farby po kliknutí).
6. Commitni a pushni zmeny.
7. Otvor pull request do `main` vetvy.
8. Sprav salto na stole

## 💡 Úloha 2: Merge konflikt
1. Všetci študenti upravia prvź `<div class="project">` v `index.html` na niečo vlastné.
2. Commitni zmeny v novej vetve (`feature-<meno>-conflict`).
3. Vytvor pull request do `main`.
1. Vytvor novu vetvu (`feature-<meno>-conflict`) z vetvy (`main-merge`).
2. Všetci študenti upravia prvý `<div class="project">` v `index.html` na niečo vlastné.
3. Vytvor pull request do `main-merge`.
4. Prvý, kto mergne, bude v poriadku. Ostatní budú mať **merge conflict**.
5. Vyrieš konflikt ručne a dokonči merge.

Expand Down
18 changes: 14 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<title>Sofia's Portfolio</title>
<link rel="stylesheet" href="style.css">
</head>

<body>
<header>
<h1>Sofia Kováčová</h1>
Expand All @@ -27,9 +29,14 @@ <h2>Vitajte na mojej stránke!</h2>

<section id="about">
<h2>O mne</h2>
<p>Volám sa Sofia, mám 16 rokov a navštevujem základnú školu. Baví ma tvoriť weby a učiť sa nové technológie.</p>
<p>Volám sa Sofia, mám 16 rokov a navštevujem základnú školu. Baví ma tvoriť weby a učiť sa nové
technológie.</p>
<p>Tento školský rok som sa naučila HTML, CSS a trošku JavaScriptu.</p>
</section>
<section id="milan-section">
<h2>O mne</h2>
<p>Ahoj, volám sa Milan. Baví ma život.</p>
</section>

<section id="projects">
<h2>Moje Projekty</h2>
Expand All @@ -47,8 +54,10 @@ <h3>🎨 Farebný experiment</h3>

<div class="project">
<h3>🎮 Záverečná práca – Hra: Witcher 4</h3>
<p>Moja prvá hra napísaná v JavaScripte! Inšpirované Zaklínačom, no s mojím vlastným vymysleným dejom a jednoduchou grafikou.</p>
<img src="https://wykop.pl/cdn/c3201142/comment_wKmzuiYveM1CyGFiy6RglOA7f9QkMENy.gif" alt="Witcher 4" style="max-width:100%; border-radius: 6px; margin: 10px 0;">
<p>Moja prvá hra napísaná v JavaScripte! Inšpirované Zaklínačom, no s mojím vlastným vymysleným dejom a
jednoduchou grafikou.</p>
<img src="https://wykop.pl/cdn/c3201142/comment_wKmzuiYveM1CyGFiy6RglOA7f9QkMENy.gif" alt="Witcher 4"
style="max-width:100%; border-radius: 6px; margin: 10px 0;">
<a href="#">(Odkaz na GitHub alebo projekt bude pridaný neskôr)</a>
</div>
</section>
Expand All @@ -65,4 +74,5 @@ <h2>Kontakt</h2>

<script src="script.js"></script>
</body>
</html>

</html>
3 changes: 3 additions & 0 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
document.querySelector('h1').addEventListener('click', function() {
alert('Header clicked!');
});
document.getElementById("milan-section").addEventListener("click", function () {
this.style.backgroundColor = "#ccffcc";
});
7 changes: 7 additions & 0 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,10 @@ footer {
background-color: #eee;
margin-top: 30px;
}
#milan-section {
background-color: #e6ffe6;
color: #222;
padding: 20px;
border-left: 4px solid #00cc66;
transition: background-color 0.4s;
}