-
-
Notifications
You must be signed in to change notification settings - Fork 620
NW5-Khadar-M-Dagal-Karma-Project #441
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
khmdagal
wants to merge
16
commits into
CodeYourFuture:master
Choose a base branch
from
khmdagal:master
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 all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
0aefe49
create-header-and-navLinks
khmdagal 81f51de
Add main-and-sections
khmdagal c57d78b
Add separation comment
khmdagal 6f8820e
Add button background
khmdagal 329f171
Fix the background image size
khmdagal 715b151
Remove top margin of logo
khmdagal f401c37
Change the margin of the body
khmdagal 1bf3f77
Change the background image
khmdagal 6a7f9b8
Add new section in HTML and style
khmdagal cf5405e
Build Store page and new section in karma page
khmdagal 1433bbb
Add comments of the style sheet
khmdagal 978115b
Fix get-karam-btn
khmdagal bccd928
Give same name radio-button so it could be check one only
khmdagal f4dd925
Fix color radios-button requirements
khmdagal 97f0621
Fix city options to be required
khmdagal f7d09e9
Add fieldset and legend tags and changed width of the picture
khmdagal 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,222 @@ | ||
|
|
||
| /* 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' | ||
| */ | ||
| /* --------below this line is the header section-------------------------------------------------- */ | ||
| header { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| } | ||
| .navigation { | ||
| margin-right: 9%; | ||
| padding: 10px; | ||
| } | ||
|
|
||
| #logo-image-id { | ||
| align-self: flex-start; | ||
| width: 2%; | ||
| margin-left: 3%; | ||
| } | ||
| /* --------above this line is the header section-------------------------------------------------- */ | ||
|
|
||
| /* --------below this line is the main section--------------------------------------------------- */ | ||
| /* The main section has two sub-sections 1. background image, h1 title, paragraph and button. | ||
| 2. second sub-section is h2 title, services images */ | ||
|
|
||
| .backgroundImage-and-title { | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| text-align: center; | ||
| color: white; | ||
| background-image: url(/img/first-background.jpg); | ||
| background-size: cover; | ||
| width: 100%; | ||
| height: 350px; | ||
| } | ||
|
|
||
| .learn-more-btn, | ||
| .btn { | ||
| background-color: rgb(232, 178, 78); | ||
| border: none; | ||
| border-radius: 3px; | ||
| padding: 5px; | ||
| color: white; | ||
| } | ||
| /* ---------------above this line is first sub-section of the main section--------------- */ | ||
|
|
||
| /* ---------------below this line is second sub-section of the main section--------------- */ | ||
| .product-section { | ||
| text-align: center; | ||
| } | ||
| .sub-product-container { | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
| .product-image { | ||
| width: 30%; | ||
| } | ||
| /* ---------------above this line is second sub-section of the main section--------------- */ | ||
|
|
||
| /* */ | ||
| .connection_coverage { | ||
| display: flex; | ||
| } | ||
|
|
||
| .image_for_homepage_feature { | ||
| width: 400px; | ||
| height: 200px; | ||
| } | ||
|
|
||
| .go_karma_today_section { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| width: 100%; | ||
| background: rgba(224, 99, 58, 0.1); | ||
| } | ||
| /* got Karma button */ | ||
| .Go_karma_btn{ | ||
| color: white; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| /* ---------------below this line is the footer------------------------------------------- */ | ||
| footer { | ||
| display: block; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .footer-socialMedia-image { | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
| .socialMedia-image { | ||
| width: 2%; | ||
| } | ||
|
|
||
|
|
||
| /* ----------------------------------------------------------------------- */ | ||
| /* -----------this section is store page--------- */ | ||
|
|
||
| /* main section, this code helps the form and picture layout side-by-side */ | ||
| .store_body { | ||
| font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, | ||
| Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; | ||
| height: 100%; | ||
| } | ||
| /* store header */ | ||
| .store_header{ | ||
| height: 50px; | ||
| } | ||
|
|
||
| /* form and picture section */ | ||
| .store_main_section { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| height: initial; | ||
| } | ||
|
|
||
| /* this is form container */ | ||
| .form_container { | ||
| display: flex; | ||
| width: 100%; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| /* form */ | ||
| .order_form { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 30px; | ||
| width: 370px; | ||
| } | ||
| /* Names section */ | ||
| .firstAndSecondNames_container { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| } | ||
| .div_for_firstName, | ||
| .div_for_lastName { | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| /* Address section */ | ||
| .addressOneAndTwo { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: flex-start; | ||
| } | ||
|
|
||
| /* picture */ | ||
| .picture_of_girl_in_office_desk { | ||
| width: 500px; | ||
| height: inherit; | ||
| left: 739px; | ||
| top: 90px; | ||
|
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. Better to use em or rem units if possible |
||
| border: solid; | ||
| } | ||
|
|
||
| .color_options { | ||
| display: flex; | ||
| gap: 20px; | ||
| } | ||
|
|
||
| .city_postcode_container { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| } | ||
| .div_for_cities_option, | ||
| .div_for_postcode { | ||
| display: flex; | ||
| flex-direction: column; | ||
| width: 50%; | ||
| } | ||
| #id_for_postcode { | ||
| width: 20%; | ||
| } | ||
| /* this helps the size of the input field and the city options */ | ||
| .input_field { | ||
| height: 25px; | ||
| border-radius: 4px; | ||
| } | ||
| #cities { | ||
| border-width: 2px; | ||
| } | ||
| /* terms link and the title color */ | ||
| .h1_color, | ||
| .terms_and_condition_link { | ||
| color: red; | ||
| } | ||
|
|
||
| /* title font weight and size */ | ||
| .title_font { | ||
| font-weight: 500; | ||
| font-size: 30px; | ||
| } | ||
|
|
||
| .address1, | ||
| .address2 { | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
| .order_btn { | ||
| align-self: flex-start; | ||
| padding: 10px; | ||
| width: 150px; | ||
| background-color: green; | ||
| } | ||
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,19 +1,94 @@ | ||
| <!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> | ||
| <header class="header"> | ||
|
khmdagal marked this conversation as resolved.
|
||
| <img | ||
| src="/img/karma-logo.svg" | ||
| id="logo-image-id" | ||
| class="logo-image" | ||
| alt="image_of_logo" | ||
| /> | ||
| <nav class="navigation"> | ||
|
khmdagal marked this conversation as resolved.
|
||
| <a href="#" class="nav-links">Meet Karma</a> | ||
| <a href="#" class="nav-links">How it Works</a> | ||
| <a href="/store.html" class="nav-links">Store</a> | ||
| <a href="#" class="nav-links">Blog</a> | ||
| <a href="#" class="nav-links">Help</a> | ||
| <a href="#" class="nav-links">Logic</a> | ||
| </nav> | ||
| </header> | ||
|
|
||
| <!-- 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 --> | ||
| <main class="main-section"> | ||
| <section class="backgroundImage-and-title"> | ||
|
khmdagal marked this conversation as resolved.
|
||
| <div class="intro"> | ||
| <h1 class="title">Introducing Karma</h1> | ||
| <p class="intro-paragraph">Bring WiFi with you, everywhere you go</p> | ||
| <button class="learn-more-btn btn">Learn more</button> | ||
| </div> | ||
| </section> | ||
|
|
||
| </body> | ||
| <section class="product-section"> | ||
|
khmdagal marked this conversation as resolved.
|
||
| <h2>Everyone needs a little Karma</h2> | ||
| <div class="sub-product-container"> | ||
| <div class="individual-product-container"> | ||
| <img src="/img/icon-devices.svg" class="product-image" alt="image_of_devices"/> | ||
| <p>Internet for all devices</p> | ||
| </div> | ||
|
|
||
| <div class="individual-product-container"> | ||
| <img src="/img/icon-coffee.svg" class="product-image" alt="image_of_coffee_cup"/> | ||
| <p>Boost your productivity</p> | ||
| </div> | ||
|
|
||
| <div class="individual-product-container"> | ||
| <img src="/img/icon-refill.svg" class="product-image" alt="image_of_fuel"/> | ||
| <p>Pay as You Go</p> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <section class="connection_coverage"> | ||
|
khmdagal marked this conversation as resolved.
|
||
| <img class="image_for_homepage_feature" src="/level-2/homepage-feature.png"> | ||
| <div class="go_karma_today_section"> | ||
| <p>"Where I am, I just don't worry about my connection anymore"</p> | ||
| <button class="Go_karma_btn btn"><a class="Go_karma_btn" href="/store.html">Get Karma today</a></button> | ||
| </div> | ||
| </section> | ||
|
|
||
| </main> | ||
|
|
||
| <footer class="footer"> | ||
|
khmdagal marked this conversation as resolved.
|
||
| <p class="footer-paragraph">Join us on</p> | ||
| <div class="footer-socialMedia-image"> | ||
| <img | ||
| src="/img/twitter-icon.svg" | ||
| class="socialMedia-image" | ||
| alt="logo_of_twitter" | ||
| /> | ||
| <img src="/img/facebook-icon.svg" class="socialMedia-image" alt="logo_of_facebook"/> | ||
| <img | ||
| src="/img/instagram-icon.svg" | ||
| class="socialMedia-image" | ||
| alt="logo_of_instagram" | ||
| /> | ||
| </div> | ||
| <p>©️Karma Mobility.Inc</p> | ||
| </footer> | ||
| </body> | ||
| </html> | ||
Oops, something went wrong.
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.
These comments are brillant!