-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into fix/card-css-issue-12
- Loading branch information
Showing
18 changed files
with
1,234 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| content="Web site created using create-react-app" | ||
| /> | ||
| <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> | ||
| <link href="https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;700&family=Poppins:wght@400;500;600&display=swap" rel="stylesheet" /> | ||
| <!-- | ||
| manifest.json provides metadata used when your web app is installed on a | ||
| user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ | ||
|
|
@@ -24,7 +25,11 @@ | |
| work correctly both with client-side routing and a non-root public URL. | ||
| Learn how to configure a non-root public URL by running `npm run build`. | ||
| --> | ||
| <link href="./App.css" rel="stylesheet"> | ||
| <link href="./index.css" rel="stylesheet"> | ||
| <title>MsCafe</title> | ||
| <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous"> | ||
| </head> | ||
| </head> | ||
| <body> | ||
| <noscript>You need to enable JavaScript to run this app.</noscript> | ||
|
|
@@ -39,5 +44,6 @@ | |
| To begin the development, run `npm start` or `yarn start`. | ||
| To create a production bundle, use `npm run build` or `yarn build`. | ||
| --> | ||
| <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script> | ||
| </body> | ||
| </html> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| @tailwind base; | ||
| @tailwind components; | ||
| @tailwind utilities; | ||
| .App { | ||
| text-align: center; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* CafeHome.css */ | ||
| @import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;600;700&family=Poppins:wght@300;400;500;600&display=swap'); | ||
|
|
||
| :root { | ||
| --primary-coffee: #8B4513; | ||
| --secondary-coffee: #D2691E; | ||
| --cream: #FFE4B5; | ||
| --light-cream: #FDF5E6; | ||
| --dark-coffee: #2C130B; | ||
| } | ||
|
|
||
| /* Custom Scrollbar */ | ||
| ::-webkit-scrollbar { | ||
| width: 10px; | ||
| } | ||
|
|
||
| ::-webkit-scrollbar-track { | ||
| background: var(--light-cream); | ||
| } | ||
|
|
||
| ::-webkit-scrollbar-thumb { | ||
| background: var(--primary-coffee); | ||
| border-radius: 5px; | ||
| } | ||
|
|
||
| ::-webkit-scrollbar-thumb:hover { | ||
| background: var(--secondary-coffee); | ||
| } | ||
|
|
||
| /* Smooth Scroll Behavior */ | ||
| html { | ||
| scroll-behavior: smooth; | ||
| } | ||
|
|
||
| /* Coffee Steam Animation */ | ||
| @keyframes steam { | ||
| 0% { | ||
| transform: translateY(0) translateX(-50%) scale(1); | ||
| opacity: 0.8; | ||
| } | ||
| 50% { | ||
| transform: translateY(-20px) translateX(-50%) scale(1.2); | ||
| opacity: 0.4; | ||
| } | ||
| 100% { | ||
| transform: translateY(-40px) translateX(-50%) scale(1); | ||
| opacity: 0; | ||
| } | ||
| } | ||
|
|
||
| .steam { | ||
| position: absolute; | ||
| top: -20px; | ||
| left: 50%; | ||
| transform: translateX(-50%); | ||
| font-size: 1.5rem; | ||
| color: var(--cream); | ||
| pointer-events: none; | ||
| animation: steam 3s infinite; | ||
| } | ||
|
|
||
| /* Feature Card Hover Effect */ | ||
| .feature-card:hover .steam { | ||
| opacity: 1; | ||
| } | ||
|
|
||
| /* Image Loading Animation */ | ||
| .lazy-image { | ||
| opacity: 0; | ||
| transition: opacity 0.3s ease-in-out; | ||
| } | ||
|
|
||
| .lazy-image.loaded { | ||
| opacity: 1; | ||
| } | ||
|
|
||
| /* Mobile Optimizations */ | ||
| @media (max-width: 768px) { | ||
| .hero-section { | ||
| background-attachment: scroll; | ||
| } | ||
|
|
||
| .feature-card { | ||
| margin: 1rem; | ||
| } | ||
|
|
||
| .specialty-image { | ||
| width: 250px; | ||
| height: 250px; | ||
| margin: 1rem; | ||
| } | ||
| } | ||
|
|
||
| /* Text Selection Color */ | ||
| ::selection { | ||
| background: var(--secondary-coffee); | ||
| color: var(--cream); | ||
| } |
Oops, something went wrong.