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

Javier branch #4

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Javier branch #4

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
8a61a81
feat (index.html): Changes in labels
JavierAmadorFrisa Mar 24, 2024
673ba45
another change
JavierAmadorFrisa Mar 24, 2024
9e0e455
feat: broken code
JavierAmadorFrisa Mar 24, 2024
4c37fd1
Revert "feat: broken code"
JavierAmadorFrisa Mar 24, 2024
511754a
cambioss
JavierAmadorFrisa Mar 24, 2024
418343d
Buenos cambios
JavierAmadorFrisa Mar 24, 2024
42331eb
arreglado
JavierAmadorFrisa Mar 24, 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
2 changes: 1 addition & 1 deletion LilL_Monsters_Site/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ html {
.site-header .header-subtitle {
animation: clear 1s 0.7s forwards;
transform: translateY(10rem);
opacity: 0;
opacity: 0.30;
}

.site-header .header-cue {
Expand Down
12 changes: 8 additions & 4 deletions LilL_Monsters_Site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
<script defer src="js/lib/fontawesome-all.min.js"></script>
<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="css/style.css" />
<title>CSS: Scrolling &amp; Parallax</title>
<<<<<<< HEAD
<title>CSS: Scrolling &amp; Parallax Esto!</title>
=======
<title>CSS: Scrolling &amp; Parallax Cambios!</title>
>>>>>>> 511754ae0e5d355530b16cba4e42124afa6ec1b0
</head>

<body>
Expand Down Expand Up @@ -66,12 +70,12 @@ <h3 class="header-title display-2 font-weight-lighter">
<article id="meet" class="page-section text-center py-5">
<header class="container w-100">
<h1 class="display-4 text-danger font-weight-lighter mb-0">
Meet The Monsters
Meet The Monsters:)
</h1>
<p class="lead">
With a wide range of backgrounds, skills, and personality, the LiL
Monsters are a team to reckon with. There’s little they can’t achieve
when they put their monster minds together.
when they put their monster minds together. This is great!
</p>
</header>

Expand All @@ -85,7 +89,7 @@ <h1 class="display-4 text-danger font-weight-lighter mb-0">
src="images/monster01_tn.svg"
alt="Monster Image 01"
/>
<h5 class="pt-2 font-weight-light">Mingle</h5>
<h5 class="pt-2 font-weight-light">Mingle the Monster</h5>
</section>

<section class="monster mb-5 col">
Expand Down
2 changes: 1 addition & 1 deletion LilL_Monsters_Site/js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $(function () {
new ScrollMagic.Scene({
triggerElement: '#types',
triggerHook: 0,
duration: 300,
duration: 305,
})
.setPin('#types')
.setTween(typesTween)
Expand Down