From f9c66c4df44ce1a4cae78673d55b985727620ba9 Mon Sep 17 00:00:00 2001 From: Ayushraj_2804 Date: Sun, 20 Oct 2024 11:43:36 +0530 Subject: [PATCH] Resolved merge conflicts --- Project Food Menu/index.html | 35 +++++++++++++++++++++++++++-------- Project Food Menu/style.css | 23 +++++++++++++++++++++++ 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/Project Food Menu/index.html b/Project Food Menu/index.html index 599e306..7364704 100644 --- a/Project Food Menu/index.html +++ b/Project Food Menu/index.html @@ -11,6 +11,9 @@ crossorigin="anonymous" referrerpolicy="no-referrer" /> + @@ -30,7 +33,8 @@
  • Testimonial
  • Contact
    • -

    RETRO

    + +
    @@ -41,8 +45,8 @@

    Eat Right Food

    -
    -
    +
    +

    About Us

    We've beem making healthy food last for 10 years

    @@ -59,7 +63,7 @@

    We've beem making healthy food last for 10 years

    -
    +

    Types of food

    @@ -90,7 +94,7 @@

    vegetable

    -
    +
    error
    @@ -106,7 +110,7 @@

    grin

    -
    +

    Food Menu

    @@ -193,7 +197,7 @@

    Food Menu Item 6

    -
    +

    What Our Customers Say

    @@ -261,7 +265,7 @@

    What Our Customers Say

    -
    +
    @@ -284,6 +288,21 @@

    Contact Us

    Restraunt © all rights reserved

    + + + diff --git a/Project Food Menu/style.css b/Project Food Menu/style.css index 0e9060b..2ac5078 100644 --- a/Project Food Menu/style.css +++ b/Project Food Menu/style.css @@ -640,3 +640,26 @@ body { height: 50vmax; } } +@keyframes appear { + from { + opacity: 0; + clip-path: inset(100% 100% 0 0); + } + to { + opacity: 1; + clip-path: inset(0 0 0 0); + } +} + +.block { + animation: appear linear; + animation-timeline: view(); + animation-range: entry 0% cover 40%; +} +.logo{ + font-size: 3rem; + font-family: 'Poppins', sans-serif; + color: #353047; + font-weight: bolder; + text-decoration: none; +} \ No newline at end of file