Skip to content

Commit

Permalink
Merge pull request #75 from the-collab-lab/name-app
Browse files Browse the repository at this point in the history
add logo and name app
  • Loading branch information
ocsiddisco authored Apr 4, 2024
2 parents abe1764 + 8dcfb8f commit 6e610ee
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
/>
<meta
name="description"
content="A smart shopping list that learns your purchase habits and makes suggestions, so you don't forget to buy what's important."
content="Despiensa, a smart shopping list that learns your purchase habits and makes suggestions, so you don't forget to buy what's important."
/>
<link rel="icon" type="image/svg+xml" href="/src/favicon.ico" />
<link rel="icon" type="image/png" href="/src/assets/favicon.png" />
<meta name="color-scheme" content="dark light" />
<title>Smart Shopping List</title>
<title>Despiensa</title>
<script type="module" src="/src/index.jsx" async></script>
<script
src="https://kit.fontawesome.com/d9b2f1cd4a.js"
Expand Down
Binary file removed public/logo192.png
Binary file not shown.
Binary file removed public/logo512.png
Binary file not shown.
Binary file added src/assets/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions src/components/NavBar/NavBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ export function NavBar({ user, lists, listPath }) {
{/* DESKTOP MENU */}
<nav className="h-16 hidden fixed z-20 w-full lg:flex shadow-md bg-offWhite text-darkPurple text-lg sm:text-xl">
<div className="h-full w-full flex flex-row justify-between items-center xl:w-9/12 xl:mx-auto ">
<div className="h-full flex items-center pl-12">
<h2 className="font-amiri text-xl sm:text-2xl font-bold">
Smart Shopping List
<div className="h-full flex flex-col justify-center pl-12">
<h2 className="font-amiri text-2xl sm:text-3xl font-bold">
Despiensa
</h2>
<p className="text-xs font-poppins">Un-think your pantry</p>
</div>
{!!user && (
<div className="h-full flex flex-row items-center">
Expand All @@ -29,8 +30,8 @@ export function NavBar({ user, lists, listPath }) {
<nav className="h-12 w-full flex flex-row justify-between lg:hidden relative shadow-md text-darkPurple bg-offWhite text-lg sm:text-xl">
{/* MOBILE-MENU */}
<div className="h-full flex items-center pl-12">
<h2 className="font-amiri text-xl sm:text-2xl font-bold">
Smart Shopping List
<h2 className="font-amiri text-2xl sm:text-3xl font-bold">
Despiensa
</h2>
</div>
{!!user && (
Expand Down
Binary file removed src/favicon.ico
Binary file not shown.
6 changes: 3 additions & 3 deletions src/views/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ export function Layout({ lists, listPath, user, isLoadingUser }) {
<div className="lg:w-fit flex flex-col items-center">
<h1 className="max-w-sm font-amiri text-3xl sm:text-4xl text-darkPurple leading-[3rem] sm:leading-[3rem]">
Simplify your shopping with{' '}
<span className="font-semibold">SmartShoppingList</span>, the
intuitive list organizer.
<span className="font-semibold">Despiensa</span>, the intuitive
list organizer.
</h1>
<button
className="w-80 mt-8 p-2 rounded-md font-poppins text-base sm:text-lg text-puurWhite bg-lightPurple"
className="w-80 mt-8 p-2 rounded-md font-poppins text-base sm:text-lg text-puurWhite bg-lightPurple hover:bg-hoverPurple transition ease-in-out"
type="button"
onClick={handleClickSignIn}
>
Expand Down

0 comments on commit 6e610ee

Please sign in to comment.