diff --git a/static/css/style.css b/static/css/style.css index 1aa40e8f5850ac18451cd24086dbc59e6ddda159..e3434263ce10bc836912a85ba3cb40d823ea57f4 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -6,15 +6,20 @@ body { background-attachment: fixed; } container-md { - + background-color: grey; margin-left: auto; margin-right: auto; background: #ffffff; width: 20em; } + +container { + background: #ffffff; + border-radius: 25px; +} h1 { - color: #53105e; + color: #fa33ff; } .softimage { min-height: 15em; @@ -32,7 +37,7 @@ h1 { justify-content: left; } p { - color: #53105e; + color: #fa33ff; font-size: large; } .title{ @@ -54,10 +59,11 @@ button{ td th { padding-right: 20px; cursor: pointer; + color: #808000; } a { cursor: pointer; - + color:#fa33ff; } @@ -69,6 +75,11 @@ a { animation: rainbow 3s linear infinite; background-size: 200% 100%; } +#plushbox { + background: #606060; + border-radius:30px; + padding:20px; +} @keyframes rainbow { 0% { diff --git a/templates/home.html b/templates/home.html index da77b19410e90f949d8a004140051b253b46c205..469769dee13867a6038a59e06138e6bcc307ad0d 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,7 +1,7 @@ {%extends 'template2.html'%} {%block homepage %} <title>hOwOme</title> -<div class="container bg-light"> +<div class="container bg-dark"> <div class="container-md"> <h1 ID="girlmode"> Hiiiiiiiiiiiiiii </h1> <h1 id="girlmode">Welcome to my website </h1> diff --git a/templates/mediaReview.html b/templates/mediaReview.html index af48b9c73cf15b361a8bde005237c91b4459c54b..f0c95700f880b75770b842a2f9c37e3487bc59ef 100644 --- a/templates/mediaReview.html +++ b/templates/mediaReview.html @@ -1,14 +1,15 @@ {%extends 'template2.html'%} {%block homepage %} <title>Media Review</title> -<div class="container bg-light"> +<div class="container bg-dark"> <div class="container-md"> + <br> {%for cuddle in plosh %} - <div class="container"> + <div class="container" id="plushbox"> <img src={{cuddle[3]}} class="softimage"> <div class="mt-3"><h2>_</h2></div> <div class="mt-3"> - <a onclick="window.open('{{cuddle[1]}}')"class="title"> {{cuddle[0].title()}}</p> + <a onclick="window.open('{{cuddle[1]}}')"class="title"> {{cuddle[0].title()}}</a> <a>{{cuddle[-1]}}</a> <p>{{cuddle[2]}}</p> </div> diff --git a/templates/plushies.html b/templates/plushies.html index d5be402d769c7198bcf25d959c0fe9faab1a8cfa..867c6e6b0ba6f04dbfa0729f84e03d4340fb23f2 100644 --- a/templates/plushies.html +++ b/templates/plushies.html @@ -1,10 +1,11 @@ {%extends 'template2.html'%} {%block homepage %} <title>Plushies:3</title> -<div class="container bg-light"> +<div class="container bg-dark"> <div class="container-md"> + <br> <br> {%for cuddle in plosh %} - <div class="container"> + <div id="plushbox"class="container" style="border-radius:30px; padding:20px;"> <img src={{cuddle[4]}} class="softimage"> <div class="mt-3"><h2>_</h2></div> <div class="mt-3"> diff --git a/templates/template.html b/templates/template.html deleted file mode 100644 index 2ea40829459b70019e4742c617a70433be14297d..0000000000000000000000000000000000000000 --- a/templates/template.html +++ /dev/null @@ -1,73 +0,0 @@ -<!DOCTYPE html> -<html lang ="en"> - <head> - <meta charset="UTF-8"> - <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> - <link rel="stylesheet" href="/style.css"> - <link rel="shortcut icon" type="image/png" href="/img/adachi.png"> - <title>Home</title> - </head> - <body> - {%block navbar%} - <nav class="navbar navbar-dark navbar-expand-md" id="barpurple"> - <div class="container-fluid"> - <a href="/home" class="navbar-brand"><span class="fw-bold"> : 3 </span></a> - <div class="collapse navbar-collapse justify-content-end align-center" id="main-nav"> - - <ul> - <li class="nav-item"> - <a href="/hottakes">Media Reviews</a> - </li> - <li class="nav-item"> - <a href="/blog" class="nav-link">Blog</a> - </li> - <li class="nav-item"> - <a href="/cooking" class="nav-link">Cooking</a> - </li> - <li class-"nav-item"> - <a href="/modelling">Modelling</a> - </li> - - <li class="nav-item"> - <a href="/plushies" class="nav-link">Plushies :3</a> - </li> - </ul> - </div> - <a class="nav-item" id="loginbutton"></a> - </div> - </nav> - i <div class="modal fade" id="loginModal" tabindex="-1" aria-labelledby="Login" aria-hidden="true"> - <div class="modal-dialog modal-dialog-centered" id="loginRegisterForm"> - <div class="modal-content"> - <div class="modal-header"> - <h1 class="modal-title fs-5" id="exampleModalLabel">Login</h1> - <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> - </div> - - <form class="" action="" onsubmit="return validateLogin()"> - <div class="modal-body"> - <div class="mb-3"> - <label for="usernameLogin" class="form-label">Username</label> - <input type="text" class="form-control" id="usernameLogin" required> - </div> - <div class="mb-3"> - <label for="passwordLogin" class="form-label">Password</label> - <input type="password" class="form-control" id="passwordLogin" required> - <div id="passwordLoginFeedback" class="invalid-feedback"></div> - </div> - </div> - <div class="modal-footer"> - <button type="button" class="btn" onclick="switchtoRegister()">Register</button> - <button type="submit" class="btn green-btn">Login</button> - </form> - - </div> - </div> - </div> - </div> - - - - - - {%endblock%} diff --git a/templates/template2.html b/templates/template2.html index 2680ab04277446d8c42724e7b214a7e060b56760..b97b2cfe13f46cffde17a1c7f0bed11a5baaa3b6 100644 --- a/templates/template2.html +++ b/templates/template2.html @@ -5,23 +5,21 @@ <link rel="ICON" href="static/img/3.ico" type="image/ico" /> <html lang="en"> -<head> <meta charset="UTF-8"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"> <link rel="stylesheet" href="/static/css/style.css"> - <link rel="shortcut icon" type="image/png" href="img/Adachi.png"/> </head> - +<body> {%block navbar%} <nav class="navbar navbar-expand-md navbar-dark" style="background-color: #551a8c;"> <div class="container-fluid"> - <a class="navbar-brand" id = "girlmode"href="home">my website </a> + <a class="navbar-brand" id = "girlmode"href="home">my website uwu </a> <ul class="navbar-nav "> @@ -32,6 +30,9 @@ <a class="nav-link" href="/hottakes">Media review</a> </li> <li class="nav-item"> + <a class="nav-link" href="/plushies">Hardware</a> + </li> + <li class="nav-item"> <a class="nav-link" href="/plushies">Plushies :3 </a> </li> <li class="nav-item"> @@ -55,7 +56,8 @@ {%block footer%} <!-- bg-green --> <section class="footer"> - <div class="container"> + + <div class="container bg-dark"> <table height = "20" style="padding: 20px;"> <td style="padding: 20px;"> <a onclick="window.open('https://twitter.com/elliemoding')"><img class="socialbutton" src="static/img/twitter.png"> <h1 style="cursor:pointer">@elliemoding </h1></a></div> @@ -73,7 +75,12 @@ </td> </table> </div> - </section> - {%endblock%} + <div class="container bg-dark"> + + <iframe src="https://john.citrons.xyz/embed?ref=example.com" style="margin-left:auto;display:block;margin-right:auto;max-width:732px;width:100%;height:94px;border:none;"></iframe> </div> + + </section> + {%endblock%} +</body> </html> diff --git a/views.json b/views.json index 2d828461b6912dc00f044b46a61b4336403c56f4..ef491079a37cc374abca2e517e35441c362236d2 100644 --- a/views.json +++ b/views.json @@ -1 +1 @@ -289 \ No newline at end of file +337 \ No newline at end of file