Skip to content

Juan Montilla / TBW2223_equipo12

Go to a project
Commit a6674b7b by Manuel Ruiz Toribio
Options

Prueba ramas

parent 1f9dcb8b
Expand all
Inline Side-by-side
Showing with 50 additions and 24 deletions
app/Views/pages/login.php
...@@ -5,13 +5,12 @@ ...@@ -5,13 +5,12 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Iniciar Sesión</title> <title>Iniciar Sesión</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" integrity="sha512-Wq3znUOIZtqZkpWpkTVRtRwQ2YyPCvT03zWlj+iS9dH1eNTjiOVlG2xgC4np4FXwL+Hgx1pjcTXy09pgH5u5HA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="stylesheet" href="<?= base_url("css/login.css") ?>"> <link rel="stylesheet" href="<?= base_url("css/login.css") ?>">
</head> </head>
<body> <body>
<div class="container mt-6"> <div class="container mt-6" id="bigcont">
<div class="row align-items-center justify-content-center" style="height: 90vh;"> <div class="row align-items-center justify-content-center" style="height: 90vh;">
<div class="col-md-7"> <div class="col-md-7">
<div class="container" id="container"> <div class="container" id="container">
...@@ -19,9 +18,12 @@ ...@@ -19,9 +18,12 @@
<form action="#"> <form action="#">
<h1>Crear cuenta</h1> <h1>Crear cuenta</h1>
<div class="social-container"> <div class="social-container">
<a href="https://accounts.google.com/" class="social"><img src="<?= base_url("iconos/google.ico")?>" width="53" height="53"></a> <a href="https://accounts.google.com/" class="social"><img
<a href="https://www.facebook.com/" class="social"><img src="<?= base_url("iconos/facebook.ico")?>" width="52" height="52"></a> src="<?= base_url("iconos/google.ico") ?>" width="53" height="53"></a>
<a href="https://appleid.apple.com/" class="social"><img src="<?= base_url("iconos/apple.ico")?>" width="52" height="52"></a> <a href="https://www.facebook.com/" class="social"><img
src="<?= base_url("iconos/facebook.ico") ?>" width="52" height="52"></a>
<a href="https://appleid.apple.com/" class="social"><img
src="<?= base_url("iconos/apple.ico") ?>" width="52" height="52"></a>
</div> </div>
<span>o usa tu correo</span> <span>o usa tu correo</span>
<input type="text" placeholder="Nombre" /> <input type="text" placeholder="Nombre" />
...@@ -34,9 +36,12 @@ ...@@ -34,9 +36,12 @@
<form action="#"> <form action="#">
<h1>Iniciar Sesión</h1> <h1>Iniciar Sesión</h1>
<div class="social-container"> <div class="social-container">
<a href="https://accounts.google.com/" class="social"><img src="<?= base_url("iconos/google.ico")?>" width="53" height="53"></a> <a href="https://accounts.google.com/" class="social"><img
<a href="https://www.facebook.com/" class="social"><img src="<?= base_url("iconos/facebook.ico")?>" width="52" height="52"></a> src="<?= base_url("iconos/google.ico") ?>" width="53" height="53"></a>
<a href="https://appleid.apple.com/" class="social"><img src="<?= base_url("iconos/apple.ico")?>" width="52" height="52"></a> <a href="https://www.facebook.com/" class="social"><img
src="<?= base_url("iconos/facebook.ico") ?>" width="52" height="52"></a>
<a href="https://appleid.apple.com/" class="social"><img
src="<?= base_url("iconos/apple.ico") ?>" width="52" height="52"></a>
</div> </div>
<span>o usa tu correo</span> <span>o usa tu correo</span>
<input type="email" placeholder="Email" /> <input type="email" placeholder="Email" />
...@@ -59,11 +64,11 @@ ...@@ -59,11 +64,11 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
<script src="<?= base_url("js/login.js")?>"></script> <script src="<?= base_url("js/login.js") ?>"></script>
\ No newline at end of file
app/Views/templates/header.php
<!DOCTYPE html> <!DOCTYPE html>
<html class="h-100" lang="en"> <html class="h-100" lang="en">
<head>
<head>
<!-- Required meta tags --> <!-- Required meta tags -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="<?= base_url("bootstrap/css/bootstrap.min.css") ?>"> <link rel="stylesheet" href="<?= base_url("bootstrap/css/bootstrap.min.css") ?>">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css"
integrity="sha512-Wq3znUOIZtqZkpWpkTVRtRwQ2YyPCvT03zWlj+iS9dH1eNTjiOVlG2xgC4np4FXwL+Hgx1pjcTXy09pgH5u5HA=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<style> <style>
main > .container { main>.container {
padding: 60px 15px 0; padding: 60px 15px 0;
} }
</style> </style>
</head> </head>
<body class="d-flex flex-column h-100">
<body class="d-flex flex-column h-100">
<header>
<!-- Fixed navbar --> <!-- Fixed navbar -->
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark"> <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#"><img src="<?= base_url("imagenes/logo.png")?>" alt="Logo de Wa2Eat" style="max-width: 100px;"></a> <a class="navbar-brand" href="#"><img src="<?= base_url("imagenes/logo.png") ?>" alt="Logo de Wa2Eat"
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" style="max-width: 100px;"></a>
data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
aria-label="Toggle navigation"> aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarCollapse"> <div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav me-auto mb-2 mb-md-0"> <ul class="navbar-nav me-auto mb-2 mb-md-0">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" aria-current="home" href="<?=base_url('home') ?>">Home</a> <a class="nav-link active" aria-current="home" href="<?= base_url('home') ?>">Home</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="<?=base_url()?>">CodeIgniter</a> <a class="nav-link" href="<?= base_url() ?>">CodeIgniter</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link disabled" href="#">About</a> <a class="nav-link disabled" href="#">About</a>
...@@ -40,7 +45,7 @@ ...@@ -40,7 +45,7 @@
</div> </div>
</div> </div>
</nav> </nav>
</header>
<!-- Begin page content --> <!-- Begin page content -->
<main class="flex-shrink-0"> <main class="flex-shrink-0">
......
public/css/login.css
...@@ -89,6 +89,21 @@ input { ...@@ -89,6 +89,21 @@ input {
width: 100%; width: 100%;
} }
.bigcont{
background-color: #ff0000;
border-radius: 10px;
box-shadow: 0 14px 28px rgba(0,0,0,0.25),
0 10px 10px rgba(0,0,0,0.22);
position: relative;
overflow: hidden;
width: 5400px;
max-width: 100%;
min-height: 480px;
}
.container { .container {
background-color: #fff; background-color: #fff;
border-radius: 10px; border-radius: 10px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment