-
-
Notifications
You must be signed in to change notification settings - Fork 619
NW6 | Pedram Amani | HTML-CSS | Module Project | Week 1,2,4 #640
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
pedram-am
wants to merge
12
commits into
CodeYourFuture:master
Choose a base branch
from
pedram-am:NW6/Karma/PedramAmani
base: master
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 6 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
902b2fc
Initial attempt (header): logo added, navbar added
pedram-am 878c532
Main:background img added,icons added,texts added.
pedram-am 614c525
Footer: icons added, texts added.
pedram-am 3f8ee82
Header styling: done
pedram-am de8a37e
Main body styling: done.
pedram-am d46f5cd
Footer styling:done - header,main,footer:completed
pedram-am 64c97a9
New section with img, txt&btn added to index.html
pedram-am 10856b6
store.html file created, img added.
pedram-am e4a0a39
New store page and form added, 2 pages connected
pedram-am e2f8ed9
Media queries used for index.html page
pedram-am d6c3e44
Media queries used for store.html page
pedram-am 817b755
Hamburger menu added. Both pages are responsive.
pedram-am 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
Binary file not shown.
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,3 @@ | ||
| { | ||
| "liveServer.settings.port": 5501 | ||
| } |
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,19 +1,160 @@ | ||
|
|
||
| /* We are using the 'Roboto' font from Google. This has already been added to your HTML header */ | ||
| /* 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; | ||
| 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 | ||
| * - Be organized, 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' | ||
| */ | ||
|
|
||
| body { | ||
| margin: 40px; | ||
| } | ||
|
|
||
| .header, | ||
| .main, | ||
| .footer { | ||
| margin: 10px; | ||
| } | ||
|
|
||
| /* Header styles */ | ||
|
|
||
| .header { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| padding-left: 150px; | ||
| padding-right: 150px; | ||
| } | ||
|
|
||
| .header-logo { | ||
| max-width: 30px; | ||
| height: auto; | ||
| } | ||
|
|
||
| .nav-list { | ||
| list-style: none; | ||
| display: flex; | ||
| margin: o; | ||
| padding: 0; | ||
| } | ||
|
|
||
| .nav-item { | ||
| margin-right: 50px; | ||
| } | ||
|
|
||
| .nav-item:last-child { | ||
| margin-right: 0; | ||
| } | ||
|
|
||
| .nav-link { | ||
| text-decoration: none; | ||
| color: gray; | ||
| } | ||
| .nav-link:hover { | ||
| color: orange; | ||
| } | ||
|
|
||
| #black-text { | ||
| color: black; | ||
| } | ||
| #black-text:hover { | ||
| color: orange; | ||
| } | ||
|
|
||
| /* Main styles */ | ||
|
|
||
| .main { | ||
| text-align: center; | ||
| border-bottom: 2px solid lightgray; | ||
| } | ||
|
|
||
| .xx-large-text { | ||
| font-size: 5em; | ||
| } | ||
|
|
||
| .large-text { | ||
| font-size: 3em; | ||
| } | ||
|
|
||
| .x-large-text { | ||
| font-size: 4em; | ||
| } | ||
|
|
||
| .with-img-background { | ||
| background-image: url("../img/first-background.jpg"); | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| background-size: cover; | ||
| background-position: center; | ||
| background-repeat: no-repeat; | ||
| height: 100vh; | ||
| } | ||
|
|
||
| .content { | ||
| color: white; | ||
| } | ||
|
|
||
| .button { | ||
| background-color: orangered; | ||
| font-size: 2em; | ||
| border-radius: 5px; | ||
| border: 0; | ||
| padding: 15px 30px; | ||
| } | ||
|
|
||
| .icons { | ||
| width: 150px; | ||
| height: 150px; | ||
| padding-left: 100px; | ||
| padding-right: 100px; | ||
| } | ||
|
|
||
| .with-three-icons { | ||
| margin-top: 150px; | ||
| margin-bottom: 50px; | ||
| } | ||
|
|
||
| .the-three-icons { | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .icons-texts { | ||
| margin-left: 30px; | ||
| margin-right: 30px; | ||
| } | ||
|
|
||
| #p { | ||
| font-size: 2em; | ||
| } | ||
|
|
||
| /* Footer styles */ | ||
|
|
||
| .footer { | ||
| text-align: center; | ||
| } | ||
|
|
||
| .footer-items { | ||
| margin: 10px; | ||
| } | ||
|
|
||
| .footer-icons { | ||
| max-width: 20px; | ||
| height: auto; | ||
| margin: 5px; | ||
| border-radius: 50%; | ||
| border: 1px lightgrey solid; | ||
| padding: 10px; | ||
| } | ||
| .footer-text-grey { | ||
| color: grey; | ||
| } | ||
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,19 +1,115 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> | ||
| <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> | ||
|
|
||
| <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 --> | ||
|
|
||
| </body> | ||
| <header class="header"> | ||
| <img src="img/karma-logo.svg" alt="Logo for Karma" class="header-logo" /> | ||
|
|
||
| <nav class="nav"> | ||
| <ul class="nav-list"> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#" id="black-text">Meet Karma</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">How it Works</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Store</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Blog</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Help</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Login</a> | ||
| </li> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
|
|
||
| <main class="main"> | ||
| <div class="with-img-background"> | ||
| <div class="content"> | ||
| <p class="xx-large-text">Introducing Karma</p> | ||
| <p class="large-text">Bring WiFi with you, everywhere you go.</p> | ||
| <button class="button">Learn More</button> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="with-three-icons"> | ||
| <p class="x-large-text">Everyone needs a little Karma.</p> | ||
| <div class="the-three-icons"> | ||
| <div class="icons-texts"> | ||
| <img | ||
| src="img/icon-devices.svg" | ||
| alt="Icon for devices" | ||
| class="icons" | ||
| /> | ||
| <p id="p">Internet for all devices</p> | ||
| </div> | ||
| <div class="icons-texts"> | ||
| <img | ||
| src="img/icon-coffee.svg" | ||
| alt="Icon for coffee" | ||
| class="icons" | ||
| /> | ||
| <p id="p">Boost your productivity</p> | ||
| </div> | ||
| <div class="icons-texts"> | ||
| <img | ||
| src="img/icon-refill.svg" | ||
| alt="Icon for refill" | ||
| class="icons" | ||
| /> | ||
| <p id="p">Pay as You Go</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </main> | ||
|
|
||
| <footer class="footer"> | ||
| <small class="footer-items">Join us on</small> | ||
| <div class="footer-icons-container footer-items"> | ||
| <img | ||
| src="img/twitter-icon.svg" | ||
| alt="Icon for Twitter" | ||
| class="footer-icons" | ||
| /> | ||
| <img | ||
| src="img/facebook-icon.svg" | ||
| alt="Icon for Facebook" | ||
| class="footer-icons" | ||
| /> | ||
| <img | ||
| src="img/instagram-icon.svg" | ||
| alt="Icon for Instagram" | ||
| class="footer-icons" | ||
| /> | ||
| </div> | ||
| <small class="footer-text-grey footer-items" | ||
| >© Karma Mobility, Inc.</small | ||
| > | ||
| </footer> | ||
| </body> | ||
| </html> |
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.
Adding a margin on the entire body affects the image from filling the sides of the screen, can you remove this margin and apply it to appropriate elements