-
Notifications
You must be signed in to change notification settings - Fork 88
Week 12 – Design Handover – Trista & Nathalie #57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ohitsnathalie
wants to merge
87
commits into
Technigo:main
Choose a base branch
from
ohitsnathalie:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit
Hold shift + click to select a range
1a72bba
adding all needed components and predetermend colors we need.
ohitsnathalie c2ed0c0
added needed font and changed title tag
ohitsnathalie d684d39
adding packages to json
ohitsnathalie 7a108b3
put info to header
ohitsnathalie 2f9fa1b
fixed tailwind
ohitsnathalie 91195c8
button styling
ohitsnathalie 99d76f5
Connenting most of the compontents together
ohitsnathalie 7ba728a
added color in root
ohitsnathalie 499c139
added more styling to the header. Realized that custom config didn't …
ohitsnathalie e74f4b6
change readme
ohitsnathalie b4bd8ab
forgot the tailwind imports. Still didn't change the outcome
ohitsnathalie 7cf3344
added some dependencies
ohitsnathalie 3224efc
re-added some css
ohitsnathalie 6a54547
adjusted the header section
ohitsnathalie 4b73954
color overlay hero section
ohitsnathalie d9dc19c
added statistics
ohitsnathalie 53a873b
re-arranging things
ohitsnathalie 35cb39e
changed screen size for large
ohitsnathalie 27c6384
navbar
ohitsnathalie 89cb364
deleted most of the stye.css
ohitsnathalie d1fcaed
Merge branch 'main' into statistics
ohitsnathalie a2d80c8
class card done
trista1987 58aaaad
instructor cards done
trista1987 f16f1a1
for merge
trista1987 07191a5
statistic section done
ohitsnathalie 9e190ed
Merge branch 'main' of https://github.com/ohitsnathalie/project-desig…
ohitsnathalie 23cb230
Merge branch 'header'
ohitsnathalie 5273a94
added about us section
ohitsnathalie c3dbbd5
value done half
trista1987 ff39f05
added black text to search bar
ohitsnathalie d70f795
added divider
ohitsnathalie 0877a6b
hover
trista1987 e7533ff
put logo in a component
ohitsnathalie 1af870f
adjusted button and change footer location
ohitsnathalie 9de703b
black logo added. changed old svg to better resoluted svg
ohitsnathalie 218b0bb
adding language icon
ohitsnathalie 34dbdd3
responsiveness
trista1987 2129da1
partially done with address
ohitsnathalie 39ebf76
added social media icons
ohitsnathalie eaf7d00
test change hero image url
ohitsnathalie 010bb65
changed hero image location
ohitsnathalie 74a5717
trying to fix footer. Adjusted line height on header and button height
ohitsnathalie 1ac1701
footer responsivenes
ohitsnathalie 67533cf
responsiveness footer
ohitsnathalie 284bd96
fixed margin of statistics and about us
ohitsnathalie 03478d4
added some spacing
ohitsnathalie bb41655
changed details
trista1987 3f63f7a
basic membership content. still need adjust responsivness and divider
ohitsnathalie 2ede6f0
membership responsiveness
ohitsnathalie 42c78e7
become member content
ohitsnathalie 7b4b0f3
finishing become member part
ohitsnathalie d41d407
button on click color change
ohitsnathalie be38a8b
uncomment components.
ohitsnathalie 789ca74
added fake social links
ohitsnathalie 6e704a4
value card done
trista1987 10367d4
Resolved merge conflict in tailwind.config.js
trista1987 5934db5
changed text size
trista1987 b6acbd3
added search icon to search bar
ohitsnathalie f3304ac
instructor card done
trista1987 126f1a1
class card done
trista1987 73e9a02
carousel not done yet, dots added
trista1987 88ab3f5
changed back to previous cards components
trista1987 54d35c6
changed details
trista1987 a0f8753
merged
trista1987 8802ece
fixing some paths and commented out value cards
ohitsnathalie df47aca
temporary changes
ohitsnathalie b0507b1
merged branch carousel manually
trista1987 03cd503
changed app
trista1987 ad2db86
changed app again
trista1987 6d14279
text slider
trista1987 61ab900
delete test swiper
trista1987 96f7700
value photo changed
trista1987 6aa5179
test another way of swipe
trista1987 d0cabaa
swipe works but layout failed
trista1987 c61ec51
test scroll
trista1987 de47894
Merge branch 'main' of https://github.com/ohitsnathalie/project-desig…
ohitsnathalie ea8c287
changed readme
ohitsnathalie abb1919
adjusted header image
ohitsnathalie 4f8a008
carousel failed, wait for answer
trista1987 fa5462e
carousel failed, wait for answer
trista1987 b4e4903
carousel failed
trista1987 32c5820
adjusted buttons
ohitsnathalie c15ae5b
Merge branch 'main' of https://github.com/ohitsnathalie/project-desig…
ohitsnathalie 7e546e4
test scroll again
trista1987 f2d1002
scroll works and cleaned code
trista1987 c564ba7
updated readme
trista1987 f159cf8
Update README.md
ohitsnathalie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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,27 @@ | ||
| import { ClassPieces } from "./ClassPieces" | ||
| import ZumbaEnergetic from "../assets/ZumbaEnergetic.jpeg" | ||
| import ZumbaHeavy from "../assets/ZumbaHeavy.jpeg" | ||
| import JustZumba from "../assets/JustZumba.jpeg" | ||
|
|
||
| export const ClassCards = () => { | ||
| return <div>ClassCards</div> | ||
| return ( | ||
| <div className='flex flex-col justify-center items-center gap-y-5 px-[60px]'> | ||
| <h4 className='ubuntu text-3xl text-white' >Some of our classes!</h4> | ||
| <div className='flex gap-[27px]'> | ||
| <ClassPieces image={ZumbaEnergetic} alt={'People are having Zumba class'} | ||
| courseName={'Zumba Energetic'} courseInfo={'A class for you that want a fast paced and high cardio workout!'} | ||
| /> | ||
| <ClassPieces image={ZumbaHeavy} alt={'People are having Zumba Heavy'} | ||
| courseName={'Zumba Heavy'} courseInfo={'This class will challenge you a bit further - dance with weights!'} | ||
| /> | ||
| <ClassPieces image={JustZumba} alt={'People are having standard Zumba'} | ||
| courseName={'Just Zumba'} courseInfo={'The classic Zumba concept! follow along with dance steps!'} | ||
| /> | ||
|
|
||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| ) | ||
|
|
||
| } |
This file contains hidden or 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,12 @@ | ||
| export const ClassPieces = ({image, alt, courseName, courseInfo}) => { | ||
| return ( | ||
| <div className='flex flex-col w-[422px] h-[552px] rounded-[10px] bg-purple px-[40px] pt-[40px] pb-[45px] gap-y-[25px] shadow-base shadow-yellow '> | ||
| <img src={image} alt={alt} className='w-[342px] h-[289px] rounded-[10px]'/> | ||
| <div className="flex flex-col gap-y-2"> | ||
| <h5 className="text-xl">{courseName}</h5> | ||
| <p className="text-5xl">{courseInfo}</p> | ||
| </div> | ||
|
|
||
| </div> | ||
| ) | ||
| } | ||
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had a similar problem as you still have in safari for text - it overflows the container- use "white-space:normal" in order to keep it within the container.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the tip. We really need to keep an eye on other browser.