Skip to content

Creacion de los archivos para la fusion de los componentes de la vista principal #85

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.

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
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion clase1.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -19,32 +20,38 @@
--md: 16px;
--lg: 18px;
}

body {
margin: 0;
font-family: 'Quicksand', sans-serif;
}

.login {
width: 100%;
height: 100vh;
display: grid;
place-items: center;
}

.form-container {
display: grid;
grid-template-rows: auto 1fr auto;
width: 300px;
}

.logo {
width: 150px;
margin-bottom: 48px;
justify-self: center;
display: none;
}

.title {
font-size: var(--lg);
margin-bottom: 12px;
text-align: center;
}

.subtitle {
color: var(--very-light-pink);
font-size: var(--md);
Expand All @@ -53,15 +60,18 @@
margin-bottom: 32px;
text-align: center;
}

.form {
display: flex;
flex-direction: column;
}

.label {
font-size: var(--sm);
font-weight: bold;
margin-bottom: 4px;
}

.input {
background-color: var(--text-input-field);
border: none;
Expand All @@ -71,6 +81,7 @@
padding: 6px;
margin-bottom: 12px;
}

.primary-button {
background-color: var(--hospital-green);
border-radius: 8px;
Expand All @@ -82,24 +93,27 @@
font-weight: bold;
height: 50px;
}

.login-button {
margin-top: 14px;
margin-bottom: 30px;
}

@media (max-width: 640px) {
.logo {
display: block;
}
}
</style>
</head>

<body>
<div class="login">
<div class="form-container">
<img src="./logos/logo_yard_sale.svg" alt="logo" class="logo">

<h1 class="title">Create a new password</h1>
<p class="subtitle">Enter a new passwrd for yue account</p>
<p class="subtitle">Enter a new password for you account</p>

<form action="/" class="form">
<label for="password" class="label">Password</label>
Expand All @@ -113,4 +127,5 @@ <h1 class="title">Create a new password</h1>
</div>
</div>
</body>

</html>
46 changes: 31 additions & 15 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -11,8 +12,10 @@

<link rel="stylesheet" href="./styles.css">

<title>YardSale: tienda online de cositas chidas</title>
<title>MAYECREMS cremas naturales hechas con amor</title>

</head>

<body>
<nav>
<img src="./icons/icon_menu.svg" alt="menu" class="menu">
Expand Down Expand Up @@ -57,11 +60,11 @@
<li>
<a href="/" class="title">My orders</a>
</li>

<li>
<a href="/">My account</a>
</li>

<li>
<a href="/">Sign out</a>
</li>
Expand Down Expand Up @@ -92,7 +95,7 @@
<a href="/">Other</a>
</li>
</ul>

<ul>
<li>
<a href="/">My orders</a>
Expand All @@ -101,7 +104,7 @@
<a href="/">My account</a>
</li>
</ul>

<ul>
<li>
<a href="/" class="email">platzi@example.com</a>
Expand All @@ -111,6 +114,7 @@
</li>
</ul>
</div>

</nav>

<aside id="shoppingCartContainer" class="inactive">
Expand All @@ -122,7 +126,9 @@
<div class="my-order-content">
<div class="shopping-cart">
<figure>
<img src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940" alt="bike">
<img
src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940"
alt="bike">
</figure>
<p>Bike</p>
<p>$30,00</p>
Expand All @@ -131,7 +137,9 @@

<div class="shopping-cart">
<figure>
<img src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940" alt="bike">
<img
src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940"
alt="bike">
</figure>
<p>Bike</p>
<p>$30,00</p>
Expand All @@ -140,7 +148,9 @@

<div class="shopping-cart">
<figure>
<img src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940" alt="bike">
<img
src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940"
alt="bike">
</figure>
<p>Bike</p>
<p>$30,00</p>
Expand All @@ -158,14 +168,16 @@
Checkout
</button>
</div>
</div>
</div>
</aside>

<aside id="productDetail" class="inactive">
<div class="product-detail-close">
<img src="./icons/icon_close.png" alt="close">
</div>
<img src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940" alt="bike">
<img
src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940"
alt="bike">
<div class="product-info">
<p>$35,00</p>
<p>Bike</p>
Expand All @@ -180,8 +192,10 @@
<section class="main-container">
<div class="cards-container">

<!-- <div class="product-card">
<img src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940" alt="">
<!-- <div class="product-card">
<img
src="https://images.pexels.com/photos/276517/pexels-photo-276517.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940"
alt="">
<div class="product-info">
<div>
<p>$120,00</p>
Expand All @@ -191,11 +205,13 @@
<img src="./icons/bt_add_to_cart.svg" alt="">
</figure>
</div>
</div> -->
</div>
-->

</div>
</section>

<script src="./main.js"></script>

</body>
</html>

</html>
Loading