From 8d4c1388f425ff95e788be5470fd06b07f68d520 Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Thu, 24 Feb 2022 23:09:40 +0700 Subject: [PATCH 01/10] Conflicts with `master` resolved --- _includes/tutorial-content.html | 11 ++++++++++- _layouts/tutorial.html | 3 +++ assets/sass/main.scss | 17 +++++++++++++++++ package-lock.json | 17 +---------------- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/_includes/tutorial-content.html b/_includes/tutorial-content.html index 180505ed92..e5ce1af971 100644 --- a/_includes/tutorial-content.html +++ b/_includes/tutorial-content.html @@ -118,7 +118,7 @@

{% endif %} {% endfor %} - + @@ -174,4 +174,13 @@

{% endif %} + +
+
+ +
+ +
diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html index 67efb88753..c22777001c 100644 --- a/_layouts/tutorial.html +++ b/_layouts/tutorial.html @@ -35,6 +35,9 @@
+ {% if page.community_contribution %} Community contribution ✨ {% endif %} diff --git a/assets/sass/main.scss b/assets/sass/main.scss index e69f27eb21..051a7329c8 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -404,6 +404,23 @@ a { } } +.breadcrumb { + a { + color: #edeaeafa !important; + } +} + +.section { + .container { + .breadcrumb { + a { + color: #000000 !important; + font-weight: 900; + } + } + } +} + .secondary-card-row, .third-card-row, .fourth-card-row, diff --git a/package-lock.json b/package-lock.json index 65127ac891..fe9a29a437 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,23 +1,8 @@ { "name": "kafka-tutorials", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "kafka-tutorials", - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "bulma": "0.7.4" - } - }, - "node_modules/bulma": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.7.4.tgz", - "integrity": "sha512-krG2rP6eAX1WE0sf6O0SC/FUVSOBX4m1PBC2+GKLpb2pX0qanaDqcv9U2nu75egFrsHkI0zdWYuk/oGwoszVWg==" - } - }, "dependencies": { "bulma": { "version": "0.7.4", From ab5eb00fdb089117c91ceaebd4880e2a50e68744 Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Fri, 25 Feb 2022 22:01:27 +0700 Subject: [PATCH 02/10] Code refactored --- _includes/tutorial-content.html | 2 +- _layouts/tutorial.html | 2 +- assets/sass/main.scss | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/_includes/tutorial-content.html b/_includes/tutorial-content.html index e5ce1af971..3b070f4655 100644 --- a/_includes/tutorial-content.html +++ b/_includes/tutorial-content.html @@ -178,7 +178,7 @@

diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html index c22777001c..f6638e2535 100644 --- a/_layouts/tutorial.html +++ b/_layouts/tutorial.html @@ -36,7 +36,7 @@
{% if page.community_contribution %} Community contribution ✨ diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 051a7329c8..423e955b63 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -408,6 +408,9 @@ a { a { color: #edeaeafa !important; } + li { + margin-left: 0; + } } .section { From c28a256d2883aba5b3580fc0c8a1cfc4fe1ae855 Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Fri, 25 Feb 2022 23:21:26 +0700 Subject: [PATCH 03/10] Breadcrumbs also added to use-cases --- _includes/tutorial-content.html | 9 --------- _layouts/recipe.html | 12 +++++++++++- _layouts/tutorial.html | 8 ++++++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/_includes/tutorial-content.html b/_includes/tutorial-content.html index 3b070f4655..a7a47acb66 100644 --- a/_includes/tutorial-content.html +++ b/_includes/tutorial-content.html @@ -174,13 +174,4 @@

{% endif %} - -
-
- -
- -

diff --git a/_layouts/recipe.html b/_layouts/recipe.html index bc8c6d9e44..ddd2a4450d 100644 --- a/_layouts/recipe.html +++ b/_layouts/recipe.html @@ -31,10 +31,12 @@ {% include nav.html %} -
+ {% if page.community_contribution %} Community contribution ✨ {% endif %} @@ -122,6 +124,14 @@
Video walkthrough
{% include contribute-tutorial-lang.html %} {% else %} {% include tutorial-content.html %} +
+
+ +
+ +
{% endif %} {% endif %}
diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html index f6638e2535..558901cbf4 100644 --- a/_layouts/tutorial.html +++ b/_layouts/tutorial.html @@ -263,6 +263,14 @@
Video walkthrough
{% include contribute-tutorial-lang.html %} {% else %} {% include tutorial-content.html %} +
+
+ +
+ +
{% endif %} {% endif %}
From e5dbce3b03afafaaaa3140ff2919f68b37fa3b5b Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Fri, 25 Feb 2022 23:27:20 +0700 Subject: [PATCH 04/10] Code refactored --- _layouts/recipe.html | 2 +- _layouts/tutorial.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/recipe.html b/_layouts/recipe.html index ddd2a4450d..a3d7150643 100644 --- a/_layouts/recipe.html +++ b/_layouts/recipe.html @@ -35,7 +35,7 @@
{% if page.community_contribution %} Community contribution ✨ diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html index 558901cbf4..efab8d972d 100644 --- a/_layouts/tutorial.html +++ b/_layouts/tutorial.html @@ -36,7 +36,7 @@
{% if page.community_contribution %} Community contribution ✨ From 94671d323fad8d52eaa5dbc356a3e13df8a42def Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Fri, 25 Feb 2022 23:31:18 +0700 Subject: [PATCH 05/10] Code updated based on PR review --- _layouts/recipe.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/recipe.html b/_layouts/recipe.html index a3d7150643..5fa135903f 100644 --- a/_layouts/recipe.html +++ b/_layouts/recipe.html @@ -35,7 +35,7 @@
{% if page.community_contribution %} Community contribution ✨ @@ -127,7 +127,7 @@
Video walkthrough
From 3078458a80cafabe45495c5a387edcc5fc452c16 Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Sat, 26 Feb 2022 00:16:37 +0700 Subject: [PATCH 06/10] Code updated based on PR review --- _layouts/recipe.html | 1 - _layouts/tutorial.html | 1 - assets/sass/main.scss | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/_layouts/recipe.html b/_layouts/recipe.html index 5fa135903f..f4be76443e 100644 --- a/_layouts/recipe.html +++ b/_layouts/recipe.html @@ -130,7 +130,6 @@
Video walkthrough
  • < Back to tutorials
    • -
    {% endif %} {% endif %} diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html index efab8d972d..9a4747ad04 100644 --- a/_layouts/tutorial.html +++ b/_layouts/tutorial.html @@ -269,7 +269,6 @@
    Video walkthrough
  • < Back to tutorials
    • -
    {% endif %} {% endif %} diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 423e955b63..188d09f249 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -417,7 +417,7 @@ a { .container { .breadcrumb { a { - color: #000000 !important; + color: $color_black !important; font-weight: 900; } } From c879bd767c7f2ce8134ea527735ffca13ebf441c Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Sat, 26 Feb 2022 00:38:05 +0700 Subject: [PATCH 07/10] Color `lt_Gray` used for anchors inside the breadcrumbs --- assets/sass/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 188d09f249..45b3334776 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -406,7 +406,7 @@ a { .breadcrumb { a { - color: #edeaeafa !important; + color: $color_ltGray !important; } li { margin-left: 0; From 90579e3001adbec0cb474d3fd8b7f0150b749842 Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Sat, 26 Feb 2022 00:45:00 +0700 Subject: [PATCH 08/10] White color used for anchors inside breadcrumbs --- assets/sass/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 45b3334776..f666aab9e9 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -406,7 +406,7 @@ a { .breadcrumb { a { - color: $color_ltGray !important; + color: $color_white !important; } li { margin-left: 0; From 600c719744c5ab1ffa8467d8e1f657fa16bbcd43 Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Sat, 26 Feb 2022 03:40:46 +0700 Subject: [PATCH 09/10] Package-lock file change reverted --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index fe9a29a437..b5ba3a9727 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "kafka-tutorials", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, "dependencies": { "bulma": { From 845ac2223b09e6d12f53fbb8a0a4b09e916a62cf Mon Sep 17 00:00:00 2001 From: bpurkaystha Date: Sat, 26 Feb 2022 03:42:13 +0700 Subject: [PATCH 10/10] Package-lock file change reverted --- package-lock.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package-lock.json b/package-lock.json index b5ba3a9727..65127ac891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,6 +3,21 @@ "version": "1.0.0", "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "kafka-tutorials", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "bulma": "0.7.4" + } + }, + "node_modules/bulma": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.7.4.tgz", + "integrity": "sha512-krG2rP6eAX1WE0sf6O0SC/FUVSOBX4m1PBC2+GKLpb2pX0qanaDqcv9U2nu75egFrsHkI0zdWYuk/oGwoszVWg==" + } + }, "dependencies": { "bulma": { "version": "0.7.4",