diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 46c150e15..eb3262620 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -16,14 +16,14 @@ Please complete the details below this message # Your Details -- Your Name: -- Your City: -- Your Slack Name: +- Your Name: Zahraa +- Your City: London Turing +- Your Slack Name: Zahraa Tayyar # Homework Details -- Module: -- Week: +- Module: HTML/ CSS 1 +- Week: 2 # Notes diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..6f3a2913e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/css/store.css b/css/store.css new file mode 100644 index 000000000..5fc337541 --- /dev/null +++ b/css/store.css @@ -0,0 +1,113 @@ + +/* main */ + +.main_store { + display: flex; + flex-direction: row; + margin:0; + color:gray; +} + +.store_title { + color: #E14E00; + margin-top:0; +} + +/* Form */ + +.order_form{ + display: flex; + flex-direction: column; + width: 100%; + margin: 7rem; +} + +.input { + border:solid 1.5px gray; + border-radius: 5px; + padding: 1rem; + width:100%; + margin-top: 1rem; +} + +/* Form Divs*/ + +fieldset { + border: none; + display:flex; + gap: 2rem; + width:auto; +} + +.name_section { + display: flex; + flex-direction: row; + justify-content: space-between; + gap: 5rem; + margin-top: 4rem; + margin-bottom: 2rem;; + width: 100%; +} + +.address_section { + display: flex; + flex-direction: column; + margin-bottom: 2rem; + width:100%; +} + +#address { + margin-bottom:2rem; +} + +.location_section { + display: flex; + flex-direction: row; + justify-content: space-between; + gap: 2rem; + width:100%; + margin-bottom: 2rem; +} + +.colour_section { + margin: 2rem 0 7rem 0; +} + +.colour_title { + margin: 2rem 0 1rem 0; +} + +.terms_cond { + display: flex; + flex-direction: row; + justify-content: left; + margin-bottom:3rem; + width: 100%; +} + +.button { + background-color: #E14E00; + padding: 1rem; + justify-content: left; + color: white; + border-radius: 0.2rem;; + border: none; + margin-right: 50%; +} + +/* Radio Styling */ + +/* Checkbox Styling */ + +input [type="checkbox"]:before { + color: #E14E00; + transform: scale(0); +} + +/* image */ + +.store_image1 { + max-width: 100%; + height: 100%; + object-fit: cover; +} \ No newline at end of file diff --git a/css/style.css b/css/style.css index 5cb025cef..3e234109c 100755 --- a/css/style.css +++ b/css/style.css @@ -15,5 +15,159 @@ body { * * - When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' */ + + /* Header */ + + header { + padding: 0; + margin: 0; + align-items: center; + display: flex; + justify-content: space-between; + background-color: #F2F2F2; + } + + .header_logo_container { + max-height: 45px; + width: auto; + margin-left: 7rem; + /* border: 4px solid blue; */ + } + + /* Navigation */ + + .nav_list_container { + display:flex; + flex-direction: row; + /* justify-content:space-between; */ + align-items: center; + list-style: none; + gap: 5rem; + /* float:right; */ + padding-right: 7rem; + color: grey; + } + + .nav_item { + padding: 0.1rem 0; + margin: 0; + color: gray; + } + + .nav_item:hover, + .nac_item:focus { + color: #E14E00; + font-weight: bold; + } + + #navmeetkarma { + font-weight: bold; + } + + /* Main */ + + /* Hero */ + + .hero { + background-image: url(/img/first-background.jpg); + background-size: cover; + background-position: center; + background-repeat: none; + margin-bottom: 10rem; + } + + .introtext { + color: white; + text-align: center; + padding: 24rem; + } + + /* article */ + + .title { + text-align: center; + } + + .main_article{ + display: flex; + flex-direction: row; + justify-content: center; + padding-bottom: 5rem; + } + + .icons { + padding: 5rem; + height: 10rem; + margin: 5rem; + } + + .icon_payg, + .icon_coffee, + .icon_devices { + height: 15rem; + } + + .sep_line { + margin:0 12rem; + opacity: 50%; + } + + /* Home Page Feature */ + + .home_feature { + display:flex; + background-color:#FFE8DE; + } + + .feature_text { + text-align: center; + justify-content: center; + padding: 12rem 20rem 10rem 0; + } + + .feature_image { + height: 35rem; + margin-right: 20rem; + } + + /* Footer */ + + .footer_text { + text-align: center; + padding: 10px; + } + + ul { + list-style: none; + } + + .contact_icon_container { + display:flex; + flex-direction: row; + justify-content: center; + gap: 5px; + padding: 5px; + } + + .contact_icon { + height: 30px; + width: 30px; + border: solid grey; + border-radius: 20px; + padding: 10px; + margin: 0 20px; + } + + .contact_icon:hover { + background-color: #FFE8DE; + border-color: black; + } + + .copyright { + padding: 10px; + text-align: center; + color: gray; + } + \ No newline at end of file diff --git a/index.html b/index.html index 3e742ef04..2aeefaa4d 100755 --- a/index.html +++ b/index.html @@ -15,5 +15,121 @@ +
+
+ + + +
+ +
+ +
+
+
+

Introducing Karma

+

Bring WiFi with you, everywhere you go.

+
+
+

Everyone needs a little Karma

+
+
+ + icon of internet coming from devices + +

Internet for all devices

+
+ +
+ + icon of coffee + +

Boost your productivity

+
+
+ + icon of coffee + +

Pay as You Go

+
+
+
+ + Woman smiling at camera + +

"Wherever I am, I just don't worry about my connection anymore!"

+
+
+ + + + diff --git a/store.html b/store.html new file mode 100644 index 000000000..16c4eeb9c --- /dev/null +++ b/store.html @@ -0,0 +1,147 @@ + + + + + + Karma + + + + + + + + + +
+
+ + + +
+ +
+ +
+
+
+

Order your Karma wifi device today!

+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ Select a colour + + + + +
+
+ + +
+ +
+
+ + woman working on her laptop sitting on a long desk + +
+
+ + + + \ No newline at end of file