-
-
Notifications
You must be signed in to change notification settings - Fork 616
ZA2 - Chandre De Wet - Karma Project #359
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
base: master
Are you sure you want to change the base?
Changes from all commits
4e658ae
edc47d2
16f6616
6ab440b
e5c8e9d
0f63567
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
|
|
||
| /* We are using the 'Roboto' font from Google. This has already been added to your HTML header */ | ||
|
|
||
| body { | ||
| font-family: 'Roboto', sans-serif; | ||
| -webkit-font-smoothing: antialiased; | ||
| } | ||
|
|
||
| /** | ||
| * Add your custom styles below | ||
| * | ||
| * Remember: | ||
| * - Be organised, use comments and separate your styles into meaningful chunks | ||
| * for example: General styles, Navigation styles, Hero styles, Footer etc. | ||
| * | ||
| * - When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' | ||
| */ | ||
|
|
||
| /* | ||
| Reset */ | ||
|
|
||
| html, body { | ||
| margin:0; | ||
| } | ||
|
|
||
| /* *Navigation styles */ | ||
|
|
||
| /* | ||
| Grid Info */ | ||
|
|
||
| body { | ||
| display: grid; | ||
| grid-template-columns: 33% 33% 33%; | ||
| grid-template-rows: 1fr auto 1fr 1 fr 1fr; | ||
| grid-template-areas: | ||
| "logo nav nav" | ||
| "hero hero hero" | ||
| "head2 head2 head2" | ||
| "sec1 sec2 sec3" | ||
| "footer footer footer"; | ||
| } | ||
|
|
||
| .logo{ | ||
| grid-area: logo; | ||
| background-color: green; | ||
| } | ||
|
|
||
| nav { | ||
| grid-area: nav; | ||
| display: flex; | ||
| background-color: pink; | ||
| } | ||
|
|
||
| .hero { | ||
| grid-area: hero; | ||
| background-color: yellow; | ||
| background-image: url(/img/first-background.jpg); | ||
| background-size: cover; | ||
| } | ||
| main h2 { | ||
| grid-area: head2; | ||
| } | ||
| article:nth-of-type(1) { | ||
| grid-area: sec1; | ||
| background-color: blue; | ||
| } | ||
|
|
||
| article:nth-of-type(2) { | ||
| grid-area: sec2; | ||
| background-color: red; | ||
| } | ||
|
|
||
| article:nth-of-type(3) { | ||
| grid-area: sec3; | ||
| background-color: purple; | ||
| } | ||
|
|
||
| footer { | ||
| grid-area:footer; | ||
| width: 100%; | ||
| height: 20%; | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,5 +15,47 @@ | |
| <!-- Remember: Use semantic HTML tags like <header>, <main>, <nav>, <footer>, <section> etc --> | ||
| <!-- All the images you need are in the 'img' folder --> | ||
|
|
||
| <header> | ||
| <img class=logo src="/img/karma-logo.svg" alt="logo"> | ||
| <nav> | ||
| <ul><a href="#"><strong>Meet Karma</strong></a></ul> | ||
| <ul><a href="#">How it Works</a></ul> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi Chandre. Wouldn't be better to add a 'list'
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi Kabelo, thanks for this feedback. I found it quite humorous that I didn't do a proper unordered list :) I guess that's the benefits of having others review your code! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi Chandre Yes, it's great to have a team buddy to review your work. Please review |
||
| <ul><a href="#">Store</a></ul> | ||
| <ul><a href="#">Blog</a></ul> | ||
| <ul><a href="#">Help</a></ul> | ||
| <ul><a href="#">Login</a></ul> | ||
| </nav> | ||
| </header> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| <section class="hero"> | ||
| <h1>Introducing Karma</h1> | ||
| <p>Bring Wifi with you, everywhere you go.</p> | ||
| <button>Learn More</button> | ||
| </section> | ||
| <h2> Everyone needs a little Chandre.</h2> | ||
| <section class="articlecontainer"> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. section class="article-container", its much cleaner that way and clear to read |
||
| <article> | ||
| <img src="/img/icon-devices.svg" alt="different devices with different screensizes"> | ||
| <p>Internet for all devices</p> | ||
| </article> | ||
| <article> | ||
| <img src="/img/icon-coffee.svg" alt="a cup with steam"> | ||
| <p>Boost your Productivity</p> | ||
| </article> | ||
| <article> | ||
| <img src="/img/icon-refill.svg" alt="a petrol tank"> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I like your sense of humour there for your alt="Petrol tank", why didn't you use something like "Device Icon"? |
||
| <p>Pay as You Go</p> | ||
| </article> | ||
| </section> | ||
|
|
||
| <footer> | ||
| <hr> | ||
| <p>Join us on</p> | ||
| <img src="/img/twitter-icon.svg" alt="twitter icon"> | ||
| <img src="/img/facebook-icon.svg" alt="Facebook icon"> | ||
| <img src="/img/instagram-icon.svg" alt=" Instagram Logo" width="40" | ||
| height="40"> | ||
| <p class="copyright"> Ⓒ Karma Mobility Inc.</p> | ||
| </footer> | ||
|
|
||
| </body> | ||
| </html> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <!DOCTYPE html> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am glad you added the proper HTML tags(Semantic) |
||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> | ||
| <title>Karma</title> | ||
| <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,300' rel='stylesheet' type='text/css'> | ||
| <link rel="stylesheet" href="css/normalize.css"> | ||
| <link rel="stylesheet" href="css/style.css"> | ||
| <link rel="shortcut icon" type="image/x-icon" href="favicon.ico"> | ||
| </head> | ||
| <body> | ||
|
|
||
| <!-- Add your HTML markup here --> | ||
| <!-- Remember: Use semantic HTML tags like <header>, <main>, <nav>, <footer>, <section> etc --> | ||
| <!-- All the images you need are in the 'img' folder --> | ||
|
|
||
|
|
||
| <div class="logo">logo</div> | ||
| <nav> | ||
| <ul><a href="#">Meet Karma</a></ul> | ||
| <ul><a href="#">How it Works</a></ul> | ||
| <ul><a href="#">Store</a></ul> | ||
| <ul><a href="#">Blog</a></ul> | ||
| <ul><a href="#">Help</a></ul> | ||
| <ul><a href="#">Login</a></ul> | ||
| </nav> | ||
|
|
||
| <div class="hero"> | ||
| <h1>Introducing Karma</h1> | ||
| <p>Bring Wifi with you, everywhere you go.</p> | ||
| <button>Learn More</button> | ||
| </div> | ||
|
|
||
| <main> | ||
| <h2> Everyone needs a little Karma.</h2> | ||
| <section> | ||
| <article> | ||
| <img src="/img/icon-devices.svg" alt="different devices with different screensizes"> | ||
| <p>Internet for all devices</p> | ||
| </article> | ||
| <article> | ||
| <img src="/img/icon-coffee.svg" alt="a cup with steam"> | ||
| <p>Internet for all devices</p> | ||
| </article> | ||
| <article> | ||
| <img src="/img/icon-refill.svg" alt="a petrol tank"> | ||
| <p>Pay as You Go</p> | ||
| </article> | ||
| </section> | ||
| </main> | ||
| <footer> | ||
| <p>Join us on</p> | ||
| <p>Karma Mobility Inc.</p> | ||
| <img src="/img/twitter-icon.svg" alt="twitter icon"> | ||
| <img src="/img/facebook-icon.svg" alt="Facebook icon"> | ||
| <img src="/img/instagram-icon.svg" alt=" Instagram Logo"> | ||
| </footer> | ||
|
|
||
| </body> | ||
| </html> | ||
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.
It will be great to see the whole semantic HTML tags at the beginning of your code.