Merge remote-tracking branch 'upstream/main' into sync-20231108-1

AxisCommunications · Nov 8, 2023 · 4bcfa8c · 4bcfa8c
2 parents d0aebac + 91fbb47
commit 4bcfa8c
Show file tree

Hide file tree

Showing 1,181 changed files with 115,178 additions and 18 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org/"
 # here are only used for local development. Update the versions when needed to
 # match GitHub Pages, see https://pages.github.com/versions for more info.
 gem "github-pages", "~> 228"
-gem "just-the-docs", "~> 0.6.0"
+gem "just-the-docs", "~> 0.7.0"
diff --git a/README.md b/README.md
@@ -1,13 +1,10 @@
-# ACAP version 4 SDK Documentation
+# ACAP SDK Documentation
 
-Welcome to the AXIS Camera Application Platform (ACAP) version 4 SDK
-[documentation](https://axiscommunications.github.io/acap-documentation), which
-is built with [GitHub pages](https://pages.github.com/).
+Welcome to the AXIS Camera Application Platform (ACAP) SDK [documentation](https://axiscommunications.github.io/acap-documentation), which is built with [GitHub pages](https://pages.github.com/).
 
 ## Contribute
 
-Have you found an error, want to ask a question or give a suggestion? Then
-continue to the [Contributing](./CONTRIBUTING.md) page for more information.
+Have you found an error, want to ask a question or give a suggestion? Then continue to the [Contributing](./CONTRIBUTING.md) page for more information.
 
 ## Copyright
 

diff --git a/_config.yml b/_config.yml
@@ -4,10 +4,11 @@
 # ------------------------------------------------------------------------------
 # Site settings
 
-title: ACAP version 4 SDK Documentation
+title: ACAP SDK Documentation
 description: >
-  ACAP version 4 SDK Documentation contains two types of SDKs;
-  a Native SDK and a Computer Vision SDK
+  ACAP SDK Documentation contains three types of SDKs; the Native SDK and the
+  Computer Vision SDK from ACAP version 4, as well as the SDK from ACAP version
+  3.
 
 url: https://axiscommunications.github.io # The base hostname & protocol
 baseurl: /acap-documentation # The subpath of your site
@@ -65,7 +66,7 @@ color_scheme: axis
 # Launch GitHub link on top in new web browser tab
 aux_links_new_tab: true
 aux_links:
-  "ACAP version 4 SDK documentation on GitHub":
+  "ACAP SDK documentation on GitHub":
     - //github.com/AxisCommunications/acap-documentation
 
 search_enabled: true

diff --git a/_layouts/acap_sdk_version_3.html b/_layouts/acap_sdk_version_3.html
@@ -0,0 +1,12 @@
+---
+layout: page
+---
+
+<body class="acap-sdk-version-3">
+
+  <blockquote>
+    This page contains information relating to an older version of ACAP. See <a href="{{ '/' | absolute_url }}">here</a> for the latest version.
+  </blockquote>
+
+  {{ content }}
+</body>
diff --git a/_sass/color_schemes/axis-colors.scss b/_sass/color_schemes/axis-colors.scss
@@ -16,9 +16,10 @@ $color-warm-gray-03: #e6e3e0;
 $color-warm-gray-04: #d8cfc6;
 $color-warm-gray-05: #9a8b7d;
 
+$color-gray-01: #e6e5e5;
+$color-gray-02: #cccccc;
+$color-gray-04: #8c8c8c;
 $color-gray-05: #666666;
 $color-gray-06: #555555;
 $color-gray-07: #444444;
 $color-gray-08: #333333;
-
-
diff --git a/_sass/color_schemes/axis.scss b/_sass/color_schemes/axis.scss
@@ -24,12 +24,12 @@ $link-color: $color-brand-08;
 // Left menu changes
 
 // Axis logo
-.side-bar .site-header{
+.side-bar .site-header {
   background-color: $white;
 }
 
 // Keep the left menu items as text color
-.side-bar .site-nav .nav-list .nav-list-item .nav-list-link{
+.side-bar .site-nav .nav-list .nav-list-item .nav-list-link {
   color: $color-text-01;
 }
 
@@ -55,3 +55,9 @@ $link-color: $color-brand-08;
     border-left-color: $color-brand-01;
   }
 }
+
+// Older ACAP SDK versions
+
+.acap-sdk-version-3 {
+  background-color: $color-gray-01;
+}