From a29b7ae250850806fdc91ae3f0253984028244dd Mon Sep 17 00:00:00 2001 From: zoobestik Date: Wed, 24 Apr 2024 18:49:56 +0200 Subject: [PATCH 1/4] feat(ktl-1396); desktop banner announcement --- assets/images/core-launch.png | Bin 0 -> 8441 bytes static/js/page/api/api.scss | 83 +++++++++++++++++++++++++++++++++- templates/api.html | 40 +++++++++++++--- 3 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 assets/images/core-launch.png diff --git a/assets/images/core-launch.png b/assets/images/core-launch.png new file mode 100644 index 0000000000000000000000000000000000000000..6892cd2e30ea84c7ee91451072c0e02de5412ae8 GIT binary patch literal 8441 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 S>OV=tI|Uh4=vOK8u>S!(`}Ms5 literal 0 HcmV?d00001 diff --git a/static/js/page/api/api.scss b/static/js/page/api/api.scss index 9edb5e161d7..4014c8a8b6c 100644 --- a/static/js/page/api/api.scss +++ b/static/js/page/api/api.scss @@ -322,4 +322,85 @@ $jvm-enrichment: JRE7, JRE8, JUnit, JUnit5, TestNG; .tags__tag.kotlin-version.hidden-version { visibility: hidden; -} \ No newline at end of file +} + +/* ====== */ +#optimize-banner { display: none!important; } + +.api-docs-to-core { + position: relative; + padding: 0; +} + +.api-docs-to-core_closed { display: none; } + +.api-docs-to-core__link { + display: flex; + align-items: stretch; + justify-content: center; + min-height: 52px; + + background: linear-gradient(90.12deg, #7F52FF 23%, #A952FF 34.23%, #9952FF 44.65%, #8952FF 100%); +} + +.api-docs-to-core__link, .api-docs-to-core__link:hover { + color: #fff; + text-decoration: none; +} + +.api-docs-to-core__text { + display: inline-flex; + align-items: center; + background: url("/assets/images/core-launch.png") 24px 2px no-repeat; + background-size: 48px; + padding: 0 2px 0 calc(24px + 48px + 8px); + margin-left: -24px; + + animation-duration: 300ms, 300ms; + animation-delay: 0s, 300ms; + animation-timing-function: ease-in, ease-out; +} +@keyframes rocket-in { + from { + background-position: 24px 2px; + } + + to { + background-position: calc(24px + 48px) -52px; + } +} +@keyframes rocket-out { + from { + background-position: calc(24px - 48px) 52px; + } + + to { + background-position: 24px 2px; + } +} +.api-docs-to-core_hover .api-docs-to-core__text { + animation-name: rocket-in, rocket-out; +} +.page_js_no .api-docs-to-core__close { + display: none; +} + +.api-docs-to-core__close { + position: absolute; + top: 50%; + right: 20px; + transform: translateY(-50%); + display: flex; + align-items: center; + justify-content: center; + background-color: transparent; + border: none; + color: inherit; + cursor: pointer; + height: 52px; + width: 52px; + box-sizing: border-box; +} + +@media (max-width: 704px) { .api-docs-to-core { display: none; } } +@media (min-width: 705px) { .api-docs-to-core-mobile { display: none; } } diff --git a/templates/api.html b/templates/api.html index 34720d9e712..5b3818e73cb 100644 --- a/templates/api.html +++ b/templates/api.html @@ -1,5 +1,13 @@ {% extends 'base.html' %} +{% set docsNavBack={ + "url": "/docs/home.html", + "text": "Kotlin Docs" +} %} + +{% set newDocsLink = site.data["core"].get(request.path) %} +{% if not newDocsLink %}{% set newDocsLink="/api/core/"%}{% endif %} + {% block scripts %} {% endblock %} @@ -8,14 +16,34 @@ {% endblock %} -{% set docsNavBack={ - "url": "/docs/home.html", - "text": "Kotlin Docs" -} %} +{% block top_banner %} +

+ + Try docs with the new design → + + +

+ +{% endblock %} {% block content %} - {% set newDocsLink = site.data["core"].get(request.path) %} - {% if not newDocsLink %}{% set newDocsLink="/api/core/"%}{% endif %}
From 1848db62b7e7e7ea4a72992db6fb70a5233afd83 Mon Sep 17 00:00:00 2001 From: zoobestik Date: Thu, 25 Apr 2024 15:54:40 +0200 Subject: [PATCH 2/4] feat(ktl-1396); mobile banner announcement --- assets/images/core-launch.png | Bin 8441 -> 3100 bytes static/js/page/api/api.scss | 99 ++++++++++++++++++++++++++++++++-- templates/api.html | 38 +++++++++---- 3 files changed, 123 insertions(+), 14 deletions(-) diff --git a/assets/images/core-launch.png b/assets/images/core-launch.png index 6892cd2e30ea84c7ee91451072c0e02de5412ae8..0af20cb18cd68b4e2d0c9c5fde88fc2aead66f27 100644 GIT binary patch literal 3100 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 S>OV=tI|Uh4=vOK8u>S!(`}Ms5 diff --git a/static/js/page/api/api.scss b/static/js/page/api/api.scss index 4014c8a8b6c..df12b8818c4 100644 --- a/static/js/page/api/api.scss +++ b/static/js/page/api/api.scss @@ -332,8 +332,6 @@ $jvm-enrichment: JRE7, JRE8, JUnit, JUnit5, TestNG; padding: 0; } -.api-docs-to-core_closed { display: none; } - .api-docs-to-core__link { display: flex; align-items: stretch; @@ -381,9 +379,6 @@ $jvm-enrichment: JRE7, JRE8, JUnit, JUnit5, TestNG; .api-docs-to-core_hover .api-docs-to-core__text { animation-name: rocket-in, rocket-out; } -.page_js_no .api-docs-to-core__close { - display: none; -} .api-docs-to-core__close { position: absolute; @@ -402,5 +397,99 @@ $jvm-enrichment: JRE7, JRE8, JUnit, JUnit5, TestNG; box-sizing: border-box; } +.api-docs-to-core-mobile { + position: fixed; + left: 50%; + transform: translateX(-50%); + bottom: 12px; + background: linear-gradient(108.46deg, #7F52FF 0%, #A852FF 10.78%, #7F52FF 100%); + border-radius: 8px; + width: 456px; + z-index: 100; + color: #fff; +} + +@media (max-width: 479px) { + .api-docs-to-core-mobile { + left: 12px; + right: 12px; + transform: none; + width: auto; + } +} + +.api-docs-to-core-mobile__text { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + padding: 24px 12px; +} + +.api-docs-to-core-mobile__text::before { + display: block; + content: ''; + background: url("/assets/images/core-launch.png") center center no-repeat; + background-size: 48px; + height: 48px; + width: 48px; +} + +.api-docs-to-core-mobile__controls { + display: flex; + align-items: stretch; + justify-content: center; + flex-wrap: wrap; + border-top: 1px solid rgba(255, 255, 255, 0.2); + min-height: 52px; +} + +.api-docs-to-core__text, .api-docs-to-core-mobile__text { + font-size: 16px; + font-weight: 400; + line-height: 24px; + letter-spacing: 0.0015em; + text-align: center; +} + +.api-docs-to-core-mobile__link, .api-docs-to-core-mobile__link:hover, +.api-docs-to-core-mobile__close, .api-docs-to-core-mobile__close:hover { + flex: 1 0 0; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + padding: 8px; + + background-color: transparent; + border: none; + color: inherit; + cursor: pointer; + text-decoration: none; + + font-size: 13px; + font-weight: 400; + line-height: 20px; + letter-spacing: 0.0045em; +} + +.api-docs-to-core, .api-docs-to-core-mobile { + font-family: "JetBrains Sans", Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Droid Sans", "Helvetica Neue", Arial, sans-serif +} + +.api-docs-to-core-mobile__link:hover, .api-docs-to-core-mobile__close:hover { + background: rgba(255, 255, 255, 0.1); +} + +.api-docs-to-core-mobile__close { + border-left: 1px solid rgba(255, 255, 255, 0.2); + margin-left: -1px; +} + +.api-docs-to-core-closed { + display: none; +} + @media (max-width: 704px) { .api-docs-to-core { display: none; } } @media (min-width: 705px) { .api-docs-to-core-mobile { display: none; } } diff --git a/templates/api.html b/templates/api.html index 5b3818e73cb..761c3455a1b 100644 --- a/templates/api.html +++ b/templates/api.html @@ -19,26 +19,46 @@ {% block top_banner %}

- Try docs with the new design → + Try the revamped Kotlin docs design → -

+
+

Try the revamped Kotlin docs design!

+
+ Let’s go + +
+
{% endblock %} From 9ba66baadab95556cdc233dad36772ef90e25432 Mon Sep 17 00:00:00 2001 From: zoobestik Date: Mon, 29 Apr 2024 12:56:11 +0200 Subject: [PATCH 3/4] fix: enable core api announcement --- templates/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/base.html b/templates/base.html index aec06f0df03..831eac7ef52 100644 --- a/templates/base.html +++ b/templates/base.html @@ -23,6 +23,7 @@ {% set headerDropdownTheme = "light" %} {% endif %} +{% block top_banner %}{% endblock %}
{% ktl_component "header" productWebUrl=data.releases.latest.url hasSearch=True dropdownTheme=headerDropdownTheme currentUrl=headerCurrentUrl %} {% block page_outer_content %} From 11aad3e8912445169f7b83b3f30a30d83b55428f Mon Sep 17 00:00:00 2001 From: zoobestik Date: Mon, 29 Apr 2024 14:24:29 +0200 Subject: [PATCH 4/4] fix: add right font-set for JetBrains Sans --- static/js/page/api/api.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/js/page/api/api.scss b/static/js/page/api/api.scss index df12b8818c4..5564e235437 100644 --- a/static/js/page/api/api.scss +++ b/static/js/page/api/api.scss @@ -475,7 +475,8 @@ $jvm-enrichment: JRE7, JRE8, JUnit, JUnit5, TestNG; } .api-docs-to-core, .api-docs-to-core-mobile { - font-family: "JetBrains Sans", Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Droid Sans", "Helvetica Neue", Arial, sans-serif + font-family: "JetBrains Sans", Inter, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Droid Sans", "Helvetica Neue", Arial, sans-serif; + font-feature-settings: 'ss20'; } .api-docs-to-core-mobile__link:hover, .api-docs-to-core-mobile__close:hover {