Skip to content

Commit

Permalink
Merge pull request #1 from Iron-Thunder/hack_himan
Browse files Browse the repository at this point in the history
third and the last update where we have updated everything including …
  • Loading branch information
akashjha21 authored Feb 26, 2023
2 parents e851e44 + 6c37695 commit 0bae9ea
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/Assets/116271-meditation-work-stress-relief.json

Large diffs are not rendered by default.

Binary file removed src/Assets/inhale_small.png
Binary file not shown.
Binary file added src/Assets/inhales.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/Pages/Footer/Footer.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import logo from '../../Assets/inhale_small.png'
import logo from '../../Assets/inhales.png'
const Navbar = () => {
return (
<>
Expand All @@ -21,8 +21,8 @@ const Navbar = () => {
</div>
<div className='text-center w-screen md:w-auto mt-8 md:text-left'>
<h2 className=' text-gray-400 mt-8 md:mt-0 mb-4 font-medium m-2'>PRODUCT</h2>
<h2 className='font-medium m-2 '>Inhaleee extention</h2>
<h2 className='font-medium m-2'>Inhaleee App</h2>
<h2 className='font-medium m-2 '>inBreadth extention</h2>
<h2 className='font-medium m-2'>inBreadth App</h2>
<h2 className='font-medium m-2'>Other site</h2>
</div>
<div className='text-center w-screen md:w-auto mt-8 md:mt-0 md:text-left'>
Expand All @@ -42,7 +42,7 @@ const Navbar = () => {
<hr className='md:mx-48' />
<div className='flex flex-col w-screen md:w-auto lg:flex-row md:flex-row justify-between lg:mx-48 md:mx-32 items-center text-center'>
<div className='flex'>
<h4 className='text-gray-400 m-6 text-xs'>©2023, inhaleee</h4>
<h4 className='text-gray-400 m-6 text-xs'>©2023, inBreadth</h4>
<h4 className='text-gray-400 m-6 text-xs'>send feedback</h4>
</div>
<div className='flex'>
Expand Down
5 changes: 3 additions & 2 deletions src/Pages/Home/Home.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React from "react";
import { Player } from "@lottiefiles/react-lottie-player";
import { Link } from "react-router-dom";
import inhale from "../../Assets/inhale_small.png";
import inhale from "../../Assets/inhales.png";
import mobile_inhale from "../../Assets/favicon.ico";
import medi from "../../Assets/116271-meditation-work-stress-relief.json";
const Home = () => {
return (
<>

<div>
<div className="navbar flex justify-between items-center px-8">
<div>
Expand All @@ -25,7 +26,7 @@ const Home = () => {
<div className="hero flex lg:flex-row md:flex-row lg:m-16 lg:justify-center md:m-6 md:my-16 md:justify-center flex-col-reverse justify-around items-center h-full">
<div className="left justify-center h-full items-center m-4">
<h2 className="lg:text-7xl text-5xl lg:text-left md:text-left text-center m-4">
THE EASIEST <br /> WAY TO FEEL <br />BETTER
THE EASIEST <br /> WAY TO FEEL <br />RELAX
</h2>
<h3 className="lg:text-2xl lg:text-left md:text-left text-xl text-center mx-4 my-8">
Get mental practices and exercises at the right <br /> time thanks to
Expand Down
7 changes: 4 additions & 3 deletions src/Pages/Home/description.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ const Description = () => {
fill="black"
/>
</svg>
<h2 className="lg:text-7xl md:text-5xl text-4xl m-4 text-center">
MAKE HIGH WORKLOAD
<br /> AND OVERTIME WORK SAFER
<h2 className="lg:text-5xl md:text-3xl text-2xl m-4 text-center">
Breath is the bridge which connects life to consciousness,
<br /> which unites your body to your thoughts.
</h2>
<h3 className="lg:text-2xl md:text-2xl text-xl text-center mx-8 m-4">
Breaks for practices were scientifically proven as <br /> an effective
Expand All @@ -43,6 +43,7 @@ const Description = () => {
src="https://assets10.lottiefiles.com/packages/lf20_khrclx93.json"
className="player h-48"
loop

autoplay
speed={1}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Testimonials/Testimonials.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ for Psychiatric Genetics</h2>
<h2 className='lg:text-5xl lg:pl-0 md:pl-16 md:text-4xl text-2xl m-4'>“I am glad that I joined such a unique project. At the interview stage, I did not believe in the technology. However, now I am ready to share it with everyone!”</h2>
<img className='w-8 mt-8 ml-6' src={tweet} alt="" />
<h1 className='lg:text-3xl lg:pl-0 md:pl-16 md:text-2xl text-xl m-4'>Christiana Luna</h1>
<h2 className='lg:text-2xl lg:pl-0 md:pl-16 text-xl ml-4 bold text-gray-500'>Communications Manager at Breathhh</h2>
<h2 className='lg:text-2xl lg:pl-0 md:pl-16 text-xl ml-4 bold text-gray-500'>Communications Manager at inBreath</h2>
</div>
</div>
</div>
Expand Down

0 comments on commit 0bae9ea

Please sign in to comment.