Skip to content

Apply-local-changes-202602240339 #1

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

Apply-local-changes-202602240339 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
325aedd
button change
Devfreedom Feb 23, 2026
e230fe1
Apply local changes
Devfreedom Feb 24, 2026
8098e3f
new changes
Devfreedom Feb 24, 2026
cddf524
change divs
Devfreedom Feb 24, 2026
df3185e
html fix
Devfreedom Feb 24, 2026
17c31fe
css changes
Devfreedom Feb 24, 2026
fd3bc03
Resolve merge conflict in style.css
Devfreedom Feb 24, 2026
96ecdaa
css changes
Devfreedom Feb 24, 2026
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
5 changes: 5 additions & 0 deletions fix_git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
cd "/home/freedom-chukwudi/Desktop/APPLE website"
rm -rf .git/rebase-merge
git reset --hard ORIG_HEAD
git pull --no-rebase origin main
54 changes: 35 additions & 19 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,48 +78,64 @@ <h2 id="heading1"> Which AirPods are <br>
<h4 class="grid-h2">Airpod</h4>
<p class="grid-p1">2nd generation</p>
<p class="grid-p2">₹14900.00*</p>
<div class="div-items">
<button class="button3">Buy</button>
<a id="learn2" href="">Learn more</a>
</div>
</div>
<div class="grid-box"> <img src="airpodcon1.svg" alt="">
<div class="grid-box"> <img src="airpodcon2.svg" alt="">
<h4 class="grid-h2">Airpod</h4>
<p class="grid-p1">2nd generation</p>
<p class="grid-p2">₹14900.00*</p>
<p class="grid-p1">3rd generation</p>
<p class="grid-p2">₹19900.00*</p>
<div class="div-items">
<button class="button3">Buy</button>
<a id="learn2" href="">Learn more</a>
</div>
</div>
<div class="grid-box"> <img src="airpodcon1.svg" alt="">
<div class="grid-box"> <img src="airpodcon3.svg" alt="">
<h4 class="grid-h2">Airpod</h4>
<p class="grid-p1">2nd generation</p>
<p class="grid-p2">₹14900.00*</p>
<p class="grid-p2">₹26900.00*</p>
<div class="div-items">
<button class="button3">Buy</button>
<a id="learn2" href="">Learn more</a>
</div>
</div>
<div class="grid-box"> <img src="airpodcon1.svg" alt="">
<div class="grid-box"> <img id="image4" src="earphone 1.png" alt="">
<h4 class="grid-h2">Airpod</h4>
<p class="grid-p1">2nd generation</p>
<p class="grid-p2">₹14900.00*</p>
<div class="div-items">
<button class="button3">Buy</button>
<a id="learn2-1" href="">Learn more</a>
</div>
</div>

</div>
<div class="grid-container2">
<div class="grid-box2"> <img src="person1.svg" alt="">
<p>Personalised Spatial Audio with
<div class="grid-box2"> <img class="person2" src="person1.svg" alt="">
<p>Personalised Spatial Audio with <br>
dynamic head tracking
2</p>
</div>
<div class="grid-box2"> <img src="person1.svg" alt="">
<p>Personalised Spatial Audio with
dynamic head tracking
<div class="grid-box2"> <img class="person2" src="person1.svg" alt="">
<p id="para1">Personalised Spatial Audio with <br>
dynamic head tracking
2 </p>
</div>
<div class="grid-box2"> <img src="person1.svg" alt="">
<p>Personalised Spatial Audio with
<div class="grid-box2"> <img class="person2" src="person1.svg" alt="">
<p id="para1">Personalised Spatial Audio with <br>
dynamic head tracking
2 </p>
</div>
<div class="grid-box2"> <img src="person2.svg" alt="">
<p>Active Noise
Cancellation and
<div class="grid-box2"> <img class="person2" src="person2.svg" alt="">
<p id="para1">Active Noise <br>
Cancellation and <br>
Adaptive Transparency </p>
</div>
<div class="grid-box2"> <img src="person2.svg" alt="">
<p>Active Noise
Cancellation and
<div class="grid-box2"> <img class="person2" src="person2.svg" alt="">
<p id="para1"> Active Noise <br>
Cancellation and <br>
Adaptive Transparency </p>
</div>

Expand Down
56 changes: 38 additions & 18 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
body { overflow-x: hidden; }
nav {
display: flex;
position: absolute;
width: 998px;
height: 44px;
left: 461px;
left: 350px;
top: 10px;
gap: 20px;
gap: 30px;
margin-top: 15px;
}

Expand Down Expand Up @@ -48,7 +49,7 @@ nav {
gap: -500px;
top: 62px;
align-items: center;
left: 350px;
left: 430px;
}

.nav2-item {
Expand All @@ -70,7 +71,7 @@ nav {
min-width: 110px;
}

.section1 {}


#airpodstext {
position: absolute;
Expand All @@ -91,6 +92,8 @@ nav {
animation-name: slideInLeft;
animation-delay: 10s;
animation: zoom-in 2s ease-out;
animation-delay: 3s;

}

#thirdgen {
Expand Down Expand Up @@ -164,6 +167,7 @@ nav {
top: 20.78px;
width: 250px;
animation: zoom-in1 2s ease-out;
animation-delay: 3s;
}

#airpod2 {
Expand All @@ -173,6 +177,7 @@ nav {
left: 890.84px;
top: 250.96px;
animation: zoom-in2 2s ease-out;
animation-delay: 3s;
}
@keyframes zoom-in { from {
opacity: 0;
Expand Down Expand Up @@ -204,7 +209,7 @@ nav {
to { height: 990px;
width: 500px;
transform: translateY(3000);
left: 1200px;
left: 1100px;
} }


Expand All @@ -216,14 +221,16 @@ nav {


height: 800px;
animation: slideInLeft 0.8s ease-out;
animation: slideInLeft 1s ease-out;
}

#earphone {
padding-top: 50px;
position: absolute;
width: 450px;
left: 580px;
animation: zoomin4 5s ease-out;
animation-delay: 2s;
}

#Fromprice2 {
Expand All @@ -249,7 +256,8 @@ nav {
letter-spacing: -0.230722px;
left: 280px;
padding-top: 100px;
animation: zoom-in3 1s ease-out;
animation: zoom-in3 5s ease-out;
animation-delay: 2s;

}

Expand Down Expand Up @@ -297,17 +305,27 @@ nav {
@keyframes zoom-in3 { from {
opacity: 0;
font-size: 170px;
left: 290px;
}
to {
to { left: 450px;
opacity: 1;
font-size: 150px;
font-size: 120px;
} }
@keyframes zoomin4 { from { padding-top: 50px;
width: 450px;
left: 580px;
transform: translateX(10);
transform: translateY(1);
padding-top: 50px;
}

to { width: 800px; left: 400px;
transform: translateY(1000);
padding-top: -100px; margin-top: -500px; } }

.section3 {
border: #1D1D1F;
margin-top: 100px;
border-style: solid;
border-color: rgb(28, 2, 2);
margin-top: 80px;
width: 1490px;
position: relative;
height: 720px;
Expand Down Expand Up @@ -337,7 +355,7 @@ nav {
left: 400px;
}

.grid-h2 {}




Expand All @@ -348,9 +366,9 @@ nav {
grid-template-columns: repeat(3, 1fr);
/* 4 equal columns */
gap: 0;
left: 400px; }
margin-top:
50px; }
left: 400px;
margin-top: 50px;
}
.button3 {
position: absolute;
font-weight: 700;
Expand All @@ -377,5 +395,7 @@ margin-top:
#learn2-1 { position: absolute; top: 310px
; color: rgb(44, 73, 199);
cursor: pointer; margin-right: 100px; margin-left:35px; }
#para1 { text-align: center; }
.person2 { justify-content: center; margin-left: 120px; }

#para1 { text-align: center; }
.person2 { justify-content: center; margin-left: 119px; }