Compare commits

..
Author SHA1 Message Date
hasicicsalih 6d060ceaac Merge pull request 'feature-amanda-nielsen' (#24) from feature-amanda-nielsen into feature-hasicicsalih
Reviewed-on: #24
2026-03-12 11:30:03 +01:00
anielsen99 ae6cbd9bc6 add javascript 2026-03-12 11:28:30 +01:00
nielseamanda 090d4f14c6 Merge pull request 'Add javascript functions' (#23) from feature-hasicicsalih into feature-amanda-nielsen
Reviewed-on: #23
2026-03-12 11:15:53 +01:00
hasicicsalih 3599826f4c Add javascript functions 2026-03-12 11:14:20 +01:00
nielseamanda e14f69f45c Merge pull request 'Add css and change html' (#21) from feature-hasicicsalih into feature-amanda-nielsen
Reviewed-on: #21
2026-03-12 11:13:02 +01:00
hasicicsalih 0298124d01 Merge pull request 'add content and css' (#22) from feature-amanda-nielsen into feature-hasicicsalih
Reviewed-on: #22
2026-03-12 11:12:00 +01:00
anielsen99 f8d3855e65 add content and css 2026-03-12 11:10:02 +01:00
hasicicsalih 0a2eb9b99b add css file and change html 2026-03-12 11:06:30 +01:00
hasicicsalih e8c560ecc7 Merge pull request 'feature-amanda-nielsen' (#20) from feature-amanda-nielsen into feature-hasicicsalih
Reviewed-on: #20
2026-03-12 10:53:47 +01:00
nielseamanda 6ee171fbc6 Merge pull request 'add html' (#19) from feature-hasicicsalih into feature-amanda-nielsen
Reviewed-on: #19
2026-03-12 10:53:31 +01:00
hasicicsalih f39b0c6269 add html 2026-03-12 10:51:23 +01:00
anielsen99 dd964647fe add text to html 2026-03-12 10:50:19 +01:00
anielsen99 c58a585867 Merge branch 'feature-amanda-nielsen' of https://gitea.fhgr.ch/itenmarcalex/msc-uxd-fs26-test into feature-amanda-nielsen 2026-03-12 10:49:13 +01:00
anielsen99 bb25347833 add html file 2026-03-12 10:49:02 +01:00
nielseamanda c14ba3722e Merge pull request 'feature-hasicicsalih' (#8) from feature-hasicicsalih into feature-amanda-nielsen
Reviewed-on: #8
2026-03-12 10:23:27 +01:00
hasicicsalih e6c372b6ea Merge pull request 'add text file' (#7) from feature-amanda-nielsen into feature-hasicicsalih
Reviewed-on: #7
2026-03-12 10:22:08 +01:00
hasicicsalih 30dceac76e chance test.txt 2026-03-12 10:20:15 +01:00
hasicicsalih 3a15bb3ba5 change test.txt 2026-03-12 10:19:51 +01:00
anielsen99 9f8ba1bef3 add text file 2026-03-12 10:18:38 +01:00
hasicicsalih 9dfb016e6b Merge branch 'main' of https://gitea.fhgr.ch/itenmarcalex/msc-uxd-fs26-test into feature-hasicicsalih 2026-03-12 10:15:16 +01:00
hasicicsalih 978ab171b7 add text file 2026-03-12 10:12:31 +01:00
16 changed files with 282 additions and 17 deletions

No files matched your search

-1
View File
@@ -1,4 +1,3 @@
# msc-uxd-fs26-test # msc-uxd-fs26-test
Test-Repository für Unterrichtszwecke Test-Repository für Unterrichtszwecke
Test Marlo
+58
View File
@@ -0,0 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Graubündner Steinböcke</title>
<link rel="stylesheet" href="styles.css">
</head>
<body>
<h1>Graubündner Steinböcke</h1>
<section id="intro">
<h2>Willkommen</h2>
<p>Der Graubündner Steinbock ist ein Symbol der Alpen und hat sich perfekt an das raue Gebirgsklima angepasst. Mit seinem beeindruckenden Geweih und der robusten Statur klettert er elegant über steile Felsen.</p>
</section>
<section id="gallery">
<h2>Bildergalerie</h2>
<div class="gallery">
<img src="steinbock1.jpg" alt="Steinbock im Fels" class="gallery-img active">
<img src="steinbock2.jpg" alt="Steinbock in den Alpen" class="gallery-img">
</div>
<button id="nextImage">Nächstes Bild</button>
</section>
<section id="facts">
<h2>Interessante Fakten</h2>
<button id="toggleFacts">Fakten anzeigen</button>
<div id="factBox" class="fact-box">
<ul>
<li>Steinböcke können bis zu 3.50 Meter hoch springen.</li>
<li>Sie erreichen ein Alter von etwa 15–20 Jahren in freier Wildbahn.</li>
<li>Ihre Hufe sind speziell geformt, um auf Eis und Fels Halt zu finden.</li>
<li>Jedes Jahr im Herbst schiebt der Bock sein Geweih ab und bildet es neu.</li>
</ul>
</div>
</section>
<script>
// Bildwechsler
const imgs = document.querySelectorAll('.gallery-img');
let idx = 0;
document.getElementById('nextImage').addEventListener('click', () => {
imgs[idx].classList.remove('active');
idx = (idx + 1) % imgs.length;
imgs[idx].classList.add('active');
});
// Fakten ein-/ausblenden
const toggleBtn = document.getElementById('toggleFacts');
const factBox = document.getElementById('factBox');
toggleBtn.addEventListener('click', () => {
factBox.classList.toggle('show');
toggleBtn.textContent = factBox.classList.contains('show') ? 'Fakten verbergen' : 'Fakten anzeigen';
});
</script>
</body>
</html>
-11
View File
@@ -1,11 +0,0 @@
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Feature - Anthony</title>
</head>
<body>
</body>
</html>
-1
View File
@@ -1 +0,0 @@
Hello
View File
Whitespace-only changes.
+1
View File
@@ -0,0 +1 @@
Hello World
View File
Whitespace-only changes.
+65
View File
@@ -0,0 +1,65 @@
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body {
font-family: Arial, Helvetica, sans-serif;
min-height: 100vh;
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(135deg, #74ebd5, #9face6);
padding: 20px;
}
.card {
background: rgba(255, 255, 255, 0.15);
padding: 40px 30px;
border-radius: 20px;
text-align: center;
color: white;
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.2);
max-width: 700px;
width: 100%;
}
h1 {
font-size: 2.5rem;
margin-bottom: 20px;
}
h2 {
font-size: 1.5rem;
margin-bottom: 15px;
font-weight: 400;
}
h3 {
font-size: 1.1rem;
font-weight: 300;
opacity: 0.9;
}
.buttons {
margin-top: 25px;
display: flex;
flex-direction: column;
gap: 12px;
}
button {
padding: 12px;
border: none;
border-radius: 10px;
font-size: 1rem;
cursor: pointer;
background: white;
color: #333;
transition: 0.3s;
}
button:hover {
transform: scale(1.03);
}
+24
View File
@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Meine Webseite</title>
<link rel="stylesheet" href="salih-hasicic-app.css">
</head>
<body>
<div class="card">
<h1 id="main-title">Das ist meine hunderste Webseite</h1>
<h2 id="greeting">Schön, dass du da bist!</h2>
<h3 id="fun-text">Have fun on here</h3>
<div class="buttons">
<button onclick="changeGreeting()">Begrüssung ändern</button>
<button onclick="changeBackground()">Hintergrund ändern</button>
<button onclick="toggleText()">Text verstecken / zeigen</button>
</div>
</div>
<script src="script.js"></script>
</body>
</html>
+1
View File
@@ -0,0 +1 @@
Das ist Salihs Datei!
+34
View File
@@ -0,0 +1,34 @@
function changeGreeting() {
const greeting = document.getElementById("greeting");
const hour = new Date().getHours();
if (hour < 12) {
greeting.textContent = "Guten Morgen und willkommen!";
} else if (hour < 18) {
greeting.textContent = "Guten Tag und schön, dass du da bist!";
} else {
greeting.textContent = "Guten Abend und viel Spass hier!";
}
}
function changeBackground() {
const colors = [
"linear-gradient(135deg, #74ebd5, #9face6)",
"linear-gradient(135deg, #ff9a9e, #fad0c4)",
"linear-gradient(135deg, #a18cd1, #fbc2eb)",
"linear-gradient(135deg, #f6d365, #fda085)"
];
const randomColor = colors[Math.floor(Math.random() * colors.length)];
document.body.style.background = randomColor;
}
function toggleText() {
const text = document.getElementById("fun-text");
if (text.style.display === "none") {
text.style.display = "block";
} else {
text.style.display = "none";
}
}
-1
View File
@@ -1 +0,0 @@
Das ist meine persönliche Datei.
+99
View File
@@ -0,0 +1,99 @@
/* Basic reset */
body {
font-family: Arial, sans-serif;
margin: 0;
padding: 0;
line-height: 1.6;
background-color: #f5f5f5;
color: #333;
}
h1, h2 {
color: #2c3e50;
text-align: center;
}
section {
max-width: 800px;
margin: 2rem auto;
background: #fff;
padding: 1.5rem;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
border-radius: 8px;
}
figure {
margin: 1.5rem 0;
text-align: center;
}
img {
max-width: 100%;
height: auto;
border-radius: 4px;
}
figcaption {
font-size: 0.9rem;
color: #555;
margin-top: 0.5rem;
}
button {
display: block;
margin: 1rem auto;
padding: 0.75rem 1.5rem;
font-size: 1rem;
color: #fff;
background-color: #3498db;
border: none;
border-radius: 4px;
cursor: pointer;
transition: background-color 0.3s ease;
}
button:hover {
background-color: #2980b9;
}
/* gallery slider */
.gallery {
display: flex;
justify-content: center;
align-items: center;
position: relative;
height: 300px;
overflow: hidden;
}
.gallery-img {
max-width: 100%;
max-height: 100%;
opacity: 0;
position: absolute;
transition: opacity 0.6s ease;
}
.gallery-img.active {
opacity: 1;
}
/* facts box */
.fact-box {
max-width: 800px;
margin: 1rem auto;
padding: 1rem;
background: #ecf0f1;
border-radius: 6px;
display: none;
animation: fadeIn 0.5s ease-in;
}
.fact-box.show {
display: block;
}
@keyframes fadeIn {
from { opacity: 0; }
to { opacity: 1; }
}
View File
Whitespace-only changes.
-1
View File
@@ -1 +0,0 @@
Hallo
-2
View File
@@ -1,2 +0,0 @@
neue Textdatei yssa