From c3bd32d84709e1f1ad92160596403e8493a07a64 Mon Sep 17 00:00:00 2001 From: harish-sethuraman Date: Thu, 8 Feb 2024 00:17:49 +0530 Subject: [PATCH 1/4] feat: Switch to Ethical Ads --- docs/src/_data/sites/en.yml | 5 +-- docs/src/_includes/components/hero.macro.html | 2 +- docs/src/_includes/layouts/doc.html | 2 +- .../partials/{carbon-ad.html => ads.html} | 12 +++++ .../assets/scss/{carbon-ads.scss => ads.scss} | 45 +++++++++++++++++++ docs/src/assets/scss/styles.scss | 2 +- 6 files changed, 62 insertions(+), 6 deletions(-) rename docs/src/_includes/partials/{carbon-ad.html => ads.html} (51%) rename docs/src/assets/scss/{carbon-ads.scss => ads.scss} (66%) diff --git a/docs/src/_data/sites/en.yml b/docs/src/_data/sites/en.yml index 532630be810..b4322b6b99d 100644 --- a/docs/src/_data/sites/en.yml +++ b/docs/src/_data/sites/en.yml @@ -26,9 +26,8 @@ google_analytics: # Ads #------------------------------------------------------------------------------ -carbon_ads: - serve: CESDV2QM - placement: eslintorg +carbon_ads: false +ethical_ads: true #------------------------------------------------------------------------------ # Shared diff --git a/docs/src/_includes/components/hero.macro.html b/docs/src/_includes/components/hero.macro.html index 3ff0c9c6f80..d71a8680f48 100644 --- a/docs/src/_includes/components/hero.macro.html +++ b/docs/src/_includes/components/hero.macro.html @@ -22,7 +22,7 @@

{{ params.title }}

{% endif %}
- {% include "partials/carbon-ad.html" %} + {% include "partials/ads.html" %}
diff --git a/docs/src/_includes/layouts/doc.html b/docs/src/_includes/layouts/doc.html index 58d8986a5dc..a9ae64e1e99 100644 --- a/docs/src/_includes/layouts/doc.html +++ b/docs/src/_includes/layouts/doc.html @@ -111,7 +111,7 @@

{{ title }}

{% include 'components/docs-toc.html' %}
diff --git a/docs/src/_includes/partials/carbon-ad.html b/docs/src/_includes/partials/ads.html similarity index 51% rename from docs/src/_includes/partials/carbon-ad.html rename to docs/src/_includes/partials/ads.html index c79eba5a679..e71b3585544 100644 --- a/docs/src/_includes/partials/carbon-ad.html +++ b/docs/src/_includes/partials/ads.html @@ -11,3 +11,15 @@ } {% endif %} +{% if site.ethical_ads %} + +
+{% endif %} \ No newline at end of file diff --git a/docs/src/assets/scss/carbon-ads.scss b/docs/src/assets/scss/ads.scss similarity index 66% rename from docs/src/assets/scss/carbon-ads.scss rename to docs/src/assets/scss/ads.scss index bd7ea8e660c..989c5392670 100644 --- a/docs/src/assets/scss/carbon-ads.scss +++ b/docs/src/assets/scss/ads.scss @@ -4,6 +4,15 @@ } } +.docs-ad { + height: 290px; +} + +/* + * Carbon Ads + * https://www.carbonads.net/ + */ + #carbonads * { margin: initial; padding: initial; @@ -113,3 +122,39 @@ font-size: 8px; } } + +/* + * Ethical Ads + */ + + [data-ea-publisher].loaded .ea-content, + [data-ea-type].loaded .ea-content { + background-color: var(--body-background-color) !important; + border: 1px solid var(--border-color) !important; + } + + // [data-ea-publisher].loaded .ea-content a:hover, + // [data-ea-type].loaded .ea-content a:hover { + // text-decoration: none; + // color: var(--link-color); + // } + + [data-ea-publisher].loaded .ea-content a:link, + [data-ea-type].loaded .ea-content a:link { + color: var(--body-text-color) !important; + } + + [data-ea-publisher].loaded .ea-callout a:link, + [data-ea-type].loaded .ea-callout a:link { + color: var(--body-text-color) !important; + } + + .jumbotron [data-ea-publisher].loaded .ea-content a, + .jumbotron [data-ea-type].loaded .ea-content a { + color: #eee; + } + + .jumbotron [data-ea-publisher].loaded .ea-content a:hover, + .jumbotron [data-ea-type].loaded .ea-content a:hover { + color: #ccc; + } diff --git a/docs/src/assets/scss/styles.scss b/docs/src/assets/scss/styles.scss index 8907a6c4bf9..09915d60b4e 100644 --- a/docs/src/assets/scss/styles.scss +++ b/docs/src/assets/scss/styles.scss @@ -30,6 +30,6 @@ @import "components/tabs"; @import "components/resources"; -@import "carbon-ads"; +@import "ads"; @import "utilities"; From 23c65028b502a51be33c7656896687a8e208bab0 Mon Sep 17 00:00:00 2001 From: harish-sethuraman Date: Thu, 8 Feb 2024 00:25:55 +0530 Subject: [PATCH 2/4] chore: run stylelint --- docs/src/assets/scss/ads.scss | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/src/assets/scss/ads.scss b/docs/src/assets/scss/ads.scss index 989c5392670..36cbbb34a75 100644 --- a/docs/src/assets/scss/ads.scss +++ b/docs/src/assets/scss/ads.scss @@ -127,34 +127,34 @@ * Ethical Ads */ - [data-ea-publisher].loaded .ea-content, - [data-ea-type].loaded .ea-content { - background-color: var(--body-background-color) !important; - border: 1px solid var(--border-color) !important; - } - - // [data-ea-publisher].loaded .ea-content a:hover, - // [data-ea-type].loaded .ea-content a:hover { - // text-decoration: none; - // color: var(--link-color); - // } - - [data-ea-publisher].loaded .ea-content a:link, - [data-ea-type].loaded .ea-content a:link { - color: var(--body-text-color) !important; - } - - [data-ea-publisher].loaded .ea-callout a:link, - [data-ea-type].loaded .ea-callout a:link { - color: var(--body-text-color) !important; - } - - .jumbotron [data-ea-publisher].loaded .ea-content a, - .jumbotron [data-ea-type].loaded .ea-content a { - color: #eee; - } - - .jumbotron [data-ea-publisher].loaded .ea-content a:hover, - .jumbotron [data-ea-type].loaded .ea-content a:hover { - color: #ccc; - } +[data-ea-publisher].loaded .ea-content, +[data-ea-type].loaded .ea-content { + background-color: var(--body-background-color) !important; + border: 1px solid var(--border-color) !important; +} + +// [data-ea-publisher].loaded .ea-content a:hover, +// [data-ea-type].loaded .ea-content a:hover { +// text-decoration: none; +// color: var(--link-color); +// } + +[data-ea-publisher].loaded .ea-content a:link, +[data-ea-type].loaded .ea-content a:link { + color: var(--body-text-color) !important; +} + +[data-ea-publisher].loaded .ea-callout a:link, +[data-ea-type].loaded .ea-callout a:link { + color: var(--body-text-color) !important; +} + +.jumbotron [data-ea-publisher].loaded .ea-content a, +.jumbotron [data-ea-type].loaded .ea-content a { + color: #eee; +} + +.jumbotron [data-ea-publisher].loaded .ea-content a:hover, +.jumbotron [data-ea-type].loaded .ea-content a:hover { + color: #ccc; +} From 915a2179192025e7d001d372f5fedbd4aae4d660 Mon Sep 17 00:00:00 2001 From: harish-sethuraman Date: Thu, 8 Feb 2024 11:57:55 +0530 Subject: [PATCH 3/4] chore: review comments --- docs/src/_data/sites/en.yml | 4 +++- docs/src/_includes/components/hero.macro.html | 2 +- docs/src/_includes/layouts/doc.html | 2 +- docs/src/_includes/partials/{ads.html => ad.html} | 0 4 files changed, 5 insertions(+), 3 deletions(-) rename docs/src/_includes/partials/{ads.html => ad.html} (100%) diff --git a/docs/src/_data/sites/en.yml b/docs/src/_data/sites/en.yml index b4322b6b99d..dc90e3dd233 100644 --- a/docs/src/_data/sites/en.yml +++ b/docs/src/_data/sites/en.yml @@ -26,7 +26,9 @@ google_analytics: # Ads #------------------------------------------------------------------------------ -carbon_ads: false +carbon_ads: + serve: "" + placement: "" ethical_ads: true #------------------------------------------------------------------------------ diff --git a/docs/src/_includes/components/hero.macro.html b/docs/src/_includes/components/hero.macro.html index d71a8680f48..5b6ccb38bf4 100644 --- a/docs/src/_includes/components/hero.macro.html +++ b/docs/src/_includes/components/hero.macro.html @@ -22,7 +22,7 @@

{{ params.title }}

{% endif %}
- {% include "partials/ads.html" %} + {% include "partials/ad.html" %}
diff --git a/docs/src/_includes/layouts/doc.html b/docs/src/_includes/layouts/doc.html index a9ae64e1e99..92db212806e 100644 --- a/docs/src/_includes/layouts/doc.html +++ b/docs/src/_includes/layouts/doc.html @@ -111,7 +111,7 @@

{{ title }}

{% include 'components/docs-toc.html' %}
diff --git a/docs/src/_includes/partials/ads.html b/docs/src/_includes/partials/ad.html similarity index 100% rename from docs/src/_includes/partials/ads.html rename to docs/src/_includes/partials/ad.html From 3ab24f9d6aaadd77eeaf300fa68d0feca006b1b3 Mon Sep 17 00:00:00 2001 From: harish-sethuraman Date: Fri, 9 Feb 2024 08:33:52 +0530 Subject: [PATCH 4/4] chore: remove comments --- docs/src/assets/scss/ads.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/src/assets/scss/ads.scss b/docs/src/assets/scss/ads.scss index 36cbbb34a75..4b1b4e84e1b 100644 --- a/docs/src/assets/scss/ads.scss +++ b/docs/src/assets/scss/ads.scss @@ -133,12 +133,6 @@ border: 1px solid var(--border-color) !important; } -// [data-ea-publisher].loaded .ea-content a:hover, -// [data-ea-type].loaded .ea-content a:hover { -// text-decoration: none; -// color: var(--link-color); -// } - [data-ea-publisher].loaded .ea-content a:link, [data-ea-type].loaded .ea-content a:link { color: var(--body-text-color) !important;