From df597a6fa18f2e03125030e01185b637be3786f8 Mon Sep 17 00:00:00 2001 From: bireworld Date: Fri, 22 May 2020 11:14:37 +0100 Subject: [PATCH 1/8] index file update --- week2/2-website/index.html | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/week2/2-website/index.html b/week2/2-website/index.html index 876b59d6..75cb4f18 100644 --- a/week2/2-website/index.html +++ b/week2/2-website/index.html @@ -12,7 +12,57 @@ +
+ + + + +
+
+
+
+

Introducing Karma

+

Bring Wifi with you, everywhere you go.

+
+ +
+
+
+
+
+

Everyone needs a little karma.

+
    +
  • Internet for all devices image
    • +
    Internet for all devices
    +
  • Boost your productivity image
    • +
    Boost your productivity
    +
  • Pay as You Go image
    • +
    Pay as you go
    +
+ +
+
+
+ +
+
+
Join us on
+ +
From c52aa7065271f00870dbd762ef8d9728c2b4ecd5 Mon Sep 17 00:00:00 2001 From: bireworld Date: Fri, 22 May 2020 11:47:59 +0100 Subject: [PATCH 2/8] html update --- week2/2-website/index.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/week2/2-website/index.html b/week2/2-website/index.html index 75cb4f18..fecf9c47 100644 --- a/week2/2-website/index.html +++ b/week2/2-website/index.html @@ -51,18 +51,19 @@

Everyone needs a little karma.

-
+
Join us on
    - - ::before - - ::before -
  • ::before + + +
+ +
© Karma Mobility, Inc.
+
From b5ffa1ce6bd308dcf529ce99a85dbb2ed7e269c0 Mon Sep 17 00:00:00 2001 From: bireworld Date: Fri, 22 May 2020 12:13:20 +0100 Subject: [PATCH 3/8] add comment --- week2/2-website/index.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/week2/2-website/index.html b/week2/2-website/index.html index fecf9c47..41e5910f 100644 --- a/week2/2-website/index.html +++ b/week2/2-website/index.html @@ -4,14 +4,14 @@ Karma - + - +
@@ -26,6 +26,7 @@
+

Introducing Karma

@@ -51,6 +52,7 @@

Everyone needs a little karma.

+
@@ -64,9 +66,5 @@
Join us on
© Karma Mobility, Inc.
- - - - - + From 520b8bde6f95325b82eecb507ad03e96ff9a4537 Mon Sep 17 00:00:00 2001 From: bireworld Date: Sat, 23 May 2020 13:46:47 +0100 Subject: [PATCH 4/8] index update --- week2/2-website/index.html | 111 +++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 47 deletions(-) diff --git a/week2/2-website/index.html b/week2/2-website/index.html index 41e5910f..4b0f164d 100644 --- a/week2/2-website/index.html +++ b/week2/2-website/index.html @@ -1,5 +1,6 @@ + @@ -8,63 +9,79 @@ - + + -
- - - - -
-
- -
-
-

Introducing Karma

-

Bring Wifi with you, everywhere you go.

-
- +
+ +
+ + + + + + +
+ + + + +
+
+ + +

Introducing Karma

+

Bring Wifi with you, everywhere you go.

+
-
-
-
-
+ +
+
+

Everyone needs a little karma.

    -
  • Internet for all devices image
    • +
  • Internet for all devices image
    • Internet for all devices
    -
  • Boost your productivity image
    • +
  • Boost your productivity image
    • Boost your productivity
    -
  • Pay as You Go image
    • +
  • Pay as You Go image +
    • Pay as you go
+
-
-
- -
-
-
-
Join us on
-
    - - -
  • -
- -
© Karma Mobility, Inc.
-
-
- - + + +
+
+ +
+
Join us on
+
    + + +
  • +
+ +
© Karma Mobility, Inc.
+ +
+
+ + + + \ No newline at end of file From 1ca5fbf90a441078250e28c6a5a90670455317b9 Mon Sep 17 00:00:00 2001 From: bireworld Date: Sun, 24 May 2020 11:27:49 +0100 Subject: [PATCH 5/8] index update --- week2/2-website/index.html | 94 ++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 30 deletions(-) diff --git a/week2/2-website/index.html b/week2/2-website/index.html index 4b0f164d..66f69705 100644 --- a/week2/2-website/index.html +++ b/week2/2-website/index.html @@ -18,18 +18,19 @@
- + -
@@ -37,28 +38,41 @@
-
- - -

Introducing Karma

-

Bring Wifi with you, everywhere you go.

-
-
+
+

Introducing Karma

+

Bring Wifi with you, everywhere you go.

+
+

Everyone needs a little karma.

    -
  • Internet for all devices image
    • -
    Internet for all devices
    -
  • Boost your productivity image
    • -
    Boost your productivity
    -
  • Pay as You Go image -
    • -
    Pay as you go
    +
    +
  • Internet for all devices image
    • +
    +
    Internet for all devices
    +
    +
    +
    +
  • Boost your productivity image
    • +
    +
    Boost your productivity
    +
    +
    + +
    +
  • Pay as You Go image +
    • +
    +
    Pay as you go
    +
    +
    +
@@ -66,20 +80,40 @@

Everyone needs a little karma.

+
+
-
-
+ +
Join us on
-
    +
+ + + +
    + + +
  • + +
    • +
+ + + + + -
© Karma Mobility, Inc.
+
© Karma Mobility, Inc.
-
From c6e37cae66f8aa58c2be416ee1ef0400c21698f2 Mon Sep 17 00:00:00 2001 From: bireworld Date: Sun, 24 May 2020 11:29:01 +0100 Subject: [PATCH 6/8] style update --- week2/2-website/css/style.css | 226 +++++++++++++++++++++++++++++++++- 1 file changed, 225 insertions(+), 1 deletion(-) diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css index 5cb025ce..2777ba66 100644 --- a/week2/2-website/css/style.css +++ b/week2/2-website/css/style.css @@ -1,11 +1,235 @@ /* We are using the 'Roboto' font from Google. This has already been added to your HTML header */ - +html{ + height: 100%; + width: 100%; +} body { + width: 100%; font-family: 'Roboto', sans-serif; -webkit-font-smoothing: antialiased; + margin: 0; + padding: 0; + + +} +.parent { + background-color: #ffffff; + margin: 0; + padding: 30px; + height:100%; + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content:center; + +} +.header { + + width: 100%; + display: flex; + flex-direction: row; + align-items: center; + justify-content:center; + border-bottom: 1px solid #DDD; + } +.header .logo{ +margin-right: 150px; +width: 40px; +height: 40px; +} +.nav .nav-menu { + list-style: none; + display: flex; + flex-direction: row; + align-items: center; + justify-content:center; + text-decoration: none; + color: #838994 + +} +.nav-menu li.active { + color: #2c2e31; + font-weight: 500; +} + +.top_content { + /* background-color: #f800db;*/ + background-image: url(../img/first-background.jpg); + background-position: center bottom; + background-repeat: no-repeat; + background-size: cover; + height: 500px; + width: 100%; + margin: inherit; + padding: inherit; + display: flex; + justify-content: center; + +} +.top_content_container{ + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; + +} +.top_content h1{ + + color: white; + text-align: center; + font-family: inherit; + + + + +} +.top_content h3{ + /*padding-left: 12.5rem;*/ + color: white; + text-align: center; + font-weight: 300; + + + + +} +.top_content .btn{ + /*padding-left: 12.5rem;*/ + color: white; + text-align: center; + margin-top: 1.563rem; +} +button{ + + width: 9.688rem; + background-color: #f15a29; + border-color: #f15a29; + text-shadow: none; + border-style: none; + border-radius: 4px; + padding: 1rem 1.5rem; + color: white; + font-size: 1.125rem; + +} +.bottom_content{ + display: flex; + flex-direction: column; + align-items: center; + justify-content:center; + width: 100%; + + +} +.bottom_content h2{ + font-size: 2.75rem; + margin: 1.625rem 0 3.125rem; + font-weight: 100; + +} +.case{ + display: flex; + flex-direction: row; + align-items: center; + justify-content:center; + width: 100%; + list-style: none; +} +.case_list{ + padding: 40px; + margin: 40px; + +} +.caption{ + + text-align: center; + font-size: 1.563rem; +} +.caption h5{ + text-align: center; + padding: 10px; +} +ul .case_list .caption { + /*background-color: lightcoral;*/ + display: block; + + width: 100%; + + +} +hr{ + width: 100%; +} +.footer { + display: flex; + flex-direction: column; + width: 100%; + align-items: center; + justify-content: center; + +} +.footer h5{ + text-align: center; + margin-block-start: 1.67em; + margin-block-end: 1.67em; + margin-inline-start: 0px; + margin-inline-end: 0px; +} +.icons { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + padding: 20px; + margin: 20px; + border: 0; + +} +ul{ + margin-block-start: 1em; + margin-block-end: 1em; + margin-inline-start: 0px; + margin-inline-end: 0px; + padding-inline-start: 40px; + +} +li{ + list-style: none; + padding: 10px; + + +} +.footer .icons > li { + border-radius: 1.25rem; + width: 2.5rem; + height: 2.5rem; + display: inline-block; + margin: 1.25rem 5px; + border: 1px solid #eaebec; + padding: 0.625rem 0; + text-align: center; +} +.footer .twitter { + color: #55acee; +} +.footer .facebook { + color: #4c66a4; +} +.footer .instagram{ + color: #3f729b; +} +.fa { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} /** * Add your custom styles below * From 8dabe815560206ce642d476fb7d092878a326155 Mon Sep 17 00:00:00 2001 From: bireworld Date: Sun, 24 May 2020 22:12:47 +0100 Subject: [PATCH 7/8] final style update --- week2/2-website/css/style.css | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css index 2777ba66..cf1ec1af 100644 --- a/week2/2-website/css/style.css +++ b/week2/2-website/css/style.css @@ -10,9 +10,9 @@ body { -webkit-font-smoothing: antialiased; margin: 0; padding: 0; - - + } +/* flexbox*/ .parent { background-color: #ffffff; margin: 0; @@ -230,6 +230,20 @@ li{ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +/****Media Queries****/ + + + +@media only screen and (min-width:400){ + .nav .nav-menu { + height: 200px; + flex-direction: column; + } + .header .logo{ + margin: 0; + } +} + /** * Add your custom styles below * From 3514b7eec7034d649756e0ea574f65e1a36566f5 Mon Sep 17 00:00:00 2001 From: bireworld Date: Sun, 24 May 2020 22:14:48 +0100 Subject: [PATCH 8/8] final html update --- week2/2-website/index.html | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/week2/2-website/index.html b/week2/2-website/index.html index 66f69705..352e4598 100644 --- a/week2/2-website/index.html +++ b/week2/2-website/index.html @@ -1,6 +1,6 @@ - + @@ -21,16 +21,17 @@ -
    +
    +
      -
    • Meet Karma
      • -
    • How it Works
      • -
    • Store
      • -
    • Blog
      • -
    • Help
      • -
    • Login
      • -
    -
    +
  • Meet Karma
    • +
  • How it Works
    • +
  • Store
    • +
  • Blog
    • +
  • Help
    • +
  • Login
    • +
+