From 22c37da204e5ab49ac446180972787d8532339c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Krakowski?= Date: Tue, 26 Nov 2019 11:13:51 +0100 Subject: [PATCH 1/5] fix(): Add min height of page --- src/_sass/components/_stage.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/_sass/components/_stage.scss b/src/_sass/components/_stage.scss index b2ceadb654..ba715246b5 100644 --- a/src/_sass/components/_stage.scss +++ b/src/_sass/components/_stage.scss @@ -7,6 +7,7 @@ @include breakpoint(large up) { padding-left: 20px; padding-right: 20px; + min-height: calc(100vh - 475px); } &__aside { From 4c145bec63d1bc4955e835ee7f9ca49803d9ad31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Krakowski?= Date: Tue, 26 Nov 2019 11:55:57 +0100 Subject: [PATCH 2/5] fix(): Change min height of full page --- src/404.html | 4 ++-- src/_layouts/catalog.html | 4 ++-- src/_layouts/integration.html | 4 ++-- src/_layouts/main.html | 4 ++-- src/_sass/components/_stage.scss | 1 - src/_sass/pages/_docs.scss | 12 ++++++++++++ 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/404.html b/src/404.html index 4118ed8175..7b5bf0d465 100644 --- a/src/404.html +++ b/src/404.html @@ -5,7 +5,7 @@ ---
-
+
{% include_cached navbar/logo.html %} {% include_cached menu/menu.html %} @@ -45,7 +45,7 @@

The page you were looking for doesn't exist.

-
+
{% include_cached components/footer.html %}
diff --git a/src/_layouts/catalog.html b/src/_layouts/catalog.html index 623c5d5362..2cafe9e8df 100644 --- a/src/_layouts/catalog.html +++ b/src/_layouts/catalog.html @@ -3,7 +3,7 @@ ---
-
+
{% include_cached navbar/logo.html %} @@ -50,7 +50,7 @@

-
+
{% include_cached components/footer.html %}
diff --git a/src/_layouts/integration.html b/src/_layouts/integration.html index e2bc0d2c79..647a77e815 100644 --- a/src/_layouts/integration.html +++ b/src/_layouts/integration.html @@ -3,7 +3,7 @@ ---
-
+
{% include_cached navbar/logo.html %} @@ -95,7 +95,7 @@

-
+
{% include_cached components/footer.html %}
diff --git a/src/_layouts/main.html b/src/_layouts/main.html index 649ae9e1e7..1ce4f86213 100644 --- a/src/_layouts/main.html +++ b/src/_layouts/main.html @@ -3,7 +3,7 @@ ---
-
+
{% include_cached navbar/logo.html %} @@ -22,7 +22,7 @@ {{ content }}
-
+
{% include_cached components/footer.html %}
diff --git a/src/_sass/components/_stage.scss b/src/_sass/components/_stage.scss index ba715246b5..b2ceadb654 100644 --- a/src/_sass/components/_stage.scss +++ b/src/_sass/components/_stage.scss @@ -7,7 +7,6 @@ @include breakpoint(large up) { padding-left: 20px; padding-right: 20px; - min-height: calc(100vh - 475px); } &__aside { diff --git a/src/_sass/pages/_docs.scss b/src/_sass/pages/_docs.scss index 694ed98e45..3c6d99d0ed 100644 --- a/src/_sass/pages/_docs.scss +++ b/src/_sass/pages/_docs.scss @@ -1,4 +1,16 @@ .docs { + display: flex; + flex-direction: column; + min-height: 100vh; + + &__inner { + flex: 1; + } + + &__footer { + flex: 0 1 auto; + } + &__aside { position: relative; z-index: 0; From 6d4589d987f1516765ba6f81eda049df6462d168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Krakowski?= Date: Wed, 27 Nov 2019 12:29:09 +0100 Subject: [PATCH 3/5] fix(): Repair bug on Safari --- src/404.html | 56 +++++++------ src/_layouts/catalog.html | 70 ++++++++-------- src/_layouts/integration.html | 138 ++++++++++++++++--------------- src/_layouts/main.html | 32 +++---- src/_sass/components/_stage.scss | 1 + 5 files changed, 153 insertions(+), 144 deletions(-) diff --git a/src/404.html b/src/404.html index 7b5bf0d465..56803f2202 100644 --- a/src/404.html +++ b/src/404.html @@ -5,43 +5,45 @@ ---
-
-
- {% include_cached navbar/logo.html %} - {% include_cached menu/menu.html %} -
- -
-
- {% include_cached navbar/navbar-mobile.html %} +
+
+
+ {% include_cached navbar/logo.html %} + {% include_cached menu/menu.html %}
-
-
-
-
-

The page you were looking for doesn't exist.

-
-
-

You may have mistyped the address or the page may have moved. Double-check the URL and try again or search the term.

- -
- {% include_cached navbar/search.html placeholder="Enter a search term" mobile="true" %} +
+
+ {% include_cached navbar/navbar-mobile.html %} +
+ +
+
+
+
+

The page you were looking for doesn't exist.

+
+
+

You may have mistyped the address or the page may have moved. Double-check the URL and try again or search the term.

+ +
+ {% include_cached navbar/search.html placeholder="Enter a search term" mobile="true" %} +
-
-
- 404 +
+ 404 +
-
-
+ -
- {% include_cached navbar/nav.html %} +
+ {% include_cached navbar/nav.html %} +
diff --git a/src/_layouts/catalog.html b/src/_layouts/catalog.html index 2cafe9e8df..173d8f1c50 100644 --- a/src/_layouts/catalog.html +++ b/src/_layouts/catalog.html @@ -3,49 +3,51 @@ ---
-
-
- {% include_cached navbar/logo.html %} +
+
+
+ {% include_cached navbar/logo.html %} - {% include_cached menu/menu.html %} -
+ {% include_cached menu/menu.html %} +
-
-
-
- {% include_cached navbar/search.html placeholder="Search the Segment documentation..." %} -
+
+
+
+ {% include_cached navbar/search.html placeholder="Search the Segment documentation..." %} +
- {% include_cached navbar/navbar-mobile.html %} -
+ {% include_cached navbar/navbar-mobile.html %} +
-
-
- {% include_cached components/breadcrumbs.html %} - {%- if page.title -%} -

- {{ page.title }} -

- {%- endif -%} +
+
+ {% include_cached components/breadcrumbs.html %} + {%- if page.title -%} +

+ {{ page.title }} +

+ {%- endif -%} - {% include_cached sidebar/{{ page.integration_type }}-menu-mobile.html %} + {% include_cached sidebar/{{ page.integration_type }}-menu-mobile.html %} -
- {{ content }} -
-
-
-
+
+ {{ content }} +
+ +
+ -
- {% include_cached navbar/nav.html %} +
+ {% include_cached navbar/nav.html %} -
- {% include sidebar/{{ page.integration_type }}-menu.html %} - {% unless page.hide-feedback %} - {% include sidebar/feedback.html %} - {% endunless %} +
+ {% include sidebar/{{ page.integration_type }}-menu.html %} + {% unless page.hide-feedback %} + {% include sidebar/feedback.html %} + {% endunless %} +
diff --git a/src/_layouts/integration.html b/src/_layouts/integration.html index 647a77e815..713d9574fe 100644 --- a/src/_layouts/integration.html +++ b/src/_layouts/integration.html @@ -3,94 +3,96 @@ ---
-
-
- {% include_cached navbar/logo.html %} +
+
+
+ {% include_cached navbar/logo.html %} - {% include menu/menu-{{ page.integration_type }}.html %} -
- -
-
-
- {% include_cached navbar/search.html placeholder="Search the Segment documentation..." %} -
- - {% include_cached navbar/navbar-mobile.html %} + {% include menu/menu-{{ page.integration_type }}.html %}
+
+
+
+ {% include_cached navbar/search.html placeholder="Search the Segment documentation..." %} +
-
-
- {% include components/breadcrumbs.html %} + {% include_cached navbar/navbar-mobile.html %} +
-
- {%- if page.mark -%} -
- -
- {%- endif -%} -
- {%- if page.title -%} -

- {{ page.title }} -

- {%- endif -%} - {%- if page.excerpt -%} -
- {{ page.excerpt | markdownify }} +
+
+ {% include components/breadcrumbs.html %} + +
+ {%- if page.mark -%} +
+
{%- endif -%} +
+ {%- if page.title -%} +

+ {{ page.title }} +

+ {%- endif -%} + + {%- if page.excerpt -%} +
+ {{ page.excerpt | markdownify }} +
+ {%- endif -%} +
-
-
+
- {%- unless page.hide_toc -%} - {% include sidebar/mobile-menu-side.html %} - {%- endunless -%} + {%- unless page.hide_toc -%} + {% include sidebar/mobile-menu-side.html %} + {%- endunless -%} -
-
- {{ content }} +
+
+ {{ content }} - {% if integration_type == destination %} - {% capture integration-foot %}{% include content/integration-foot.md %}{% endcapture %} - {{ integration-foot | markdownify }} - {% endif %} -
+ {% if integration_type == destination %} + {% capture integration-foot %}{% include content/integration-foot.md %}{% endcapture %} + {{ integration-foot | markdownify }} + {% endif %} +
- {% if page.contributors %} - {% include components/avatar.html contributors=page.contributors %} - {% endif %} + {% if page.contributors %} + {% include components/avatar.html contributors=page.contributors %} + {% endif %} - {% include components/feedback.html %} - {% include components/callout.html %} -
- -
-
+ {% include components/feedback.html %} + {% include components/callout.html %} +
+ +
+ -
- {% include_cached navbar/nav.html %} +
+ {% include_cached navbar/nav.html %} -
- {%- unless page.hide_toc -%} -
- {% include sidebar/menu-side.html class="menu-side" anchor_class="menu-side__link" html=content h_min=2 h_max=2 %} -
- {%- endunless -%} +
+ {%- unless page.hide_toc -%} +
+ {% include sidebar/menu-side.html class="menu-side" anchor_class="menu-side__link" html=content h_min=2 h_max=2 %} +
+ {%- endunless -%} - {% if page.related %} - {% include sidebar/related-content.html items=page.related %} - {% endif %} + {% if page.related %} + {% include sidebar/related-content.html items=page.related %} + {% endif %} - {% include sidebar/related-categories.html %} + {% include sidebar/related-categories.html %} - {% unless page.hide-feedback %} - {% include_cached sidebar/feedback.html %} - {% endunless %} + {% unless page.hide-feedback %} + {% include_cached sidebar/feedback.html %} + {% endunless %} +
diff --git a/src/_layouts/main.html b/src/_layouts/main.html index 1ce4f86213..e8cbd29db1 100644 --- a/src/_layouts/main.html +++ b/src/_layouts/main.html @@ -3,23 +3,25 @@ ---
-
-
- {% include_cached navbar/logo.html %} +
+
+
+ {% include_cached navbar/logo.html %} - {% assign currentPage = page.url | downcase | split: "/" %} - {% if currentPage[1] == 'glossary' %} - {% include menu/menu-glossary.html %} - {% elsif currentPage[1] == 'partners' %} - {% include menu/menu-partners.html %} - {% elsif currentPage[1] == 'legal' %} - {% include menu/menu-legal.html %} - {% else %} - {% include menu/menu.html %} - {% endif %} -
+ {% assign currentPage = page.url | downcase | split: "/" %} + {% if currentPage[1] == 'glossary' %} + {% include menu/menu-glossary.html %} + {% elsif currentPage[1] == 'partners' %} + {% include menu/menu-partners.html %} + {% elsif currentPage[1] == 'legal' %} + {% include menu/menu-legal.html %} + {% else %} + {% include menu/menu.html %} + {% endif %} +
- {{ content }} + {{ content }} +