Merge branch 'cis2-ios' of https://github.com/Concordium/concordium.g…

…ithub.io into cis2-ios
Concordium · Oct 9, 2023 · c79f814 · c79f814
2 parents 817e982 + 06d3b10
commit c79f814
Show file tree

Hide file tree

Showing 154 changed files with 4,606 additions and 2,662 deletions.
diff --git a/README.md b/README.md
@@ -285,6 +285,11 @@ Example:
 
  This text appears when the reader clicks on the dropdown element.
 ```
+#### Glossary terms
+
+Enter glossary terms in the glossary.rst if they are not already in the glossary. Pay close attention to the indentation in the glossary.
+
+In the topic where the term is referenced, use the `:term:<my term>` directive when writing a glossary term in the text. If you want to use different text than how the term appears in the glossary, use the following format: `:term:My terms<my term>`.
 
 ### Images
 

diff --git a/public/extra/background-img.png b/public/extra/background-img.png
diff --git a/public/extra/concordium-logo-dark.svg b/public/extra/concordium-logo-dark.svg
diff --git a/public/extra/testnet.html b/public/extra/testnet.html
@@ -14,15 +14,15 @@
 
 <body>
  <div class="logo-container">
- <img class="logo" src="concordium-logo-dark.svg" />
+ <img class="logo" src="/en/_static/concordium-logo.svg" />
  <h1>Documentation</h1>
  <p>The documentation for the Concordium Testnet is now incorporated into the Mainnet documentation.</p>
  <p>The Mainnet documentation can be found <a href="https://developer.concordium.software/en/mainnet/index.html">here</a></p>
  </div>
 
  <style>
  body {
- background: url("background-img.png") no-repeat center center fixed, rgb(240, 240, 240);
+ background: url("/en/_static/background-img.png") no-repeat center center fixed, rgb(240, 240, 240);
  -webkit-background-size: cover;
  -moz-background-size: cover;
  -o-background-size: cover;

diff --git a/public/extra/testnet4.html b/public/extra/testnet4.html
@@ -14,10 +14,10 @@
 
 <body>
  <div class="logo-container">
- <img class="logo" src="/en/_static/concordium-logo-dark.svg" />
+ <img class="logo" src="/en/_static/concordium-logo.svg" />
  <h1>Documentation</h1>
  <p>The documentation for the Concordium Testnet4 is no longer available.</p>
- <p>The Mainnet documentation can be found <a href='/'>here</a></p>
+ <p>The Mainnet documentation can be found <a href="https://developer.concordium.software/en/mainnet/index.html>here</a></p>
  </div>
 
  <style>

diff --git a/requirements.txt b/requirements.txt
@@ -40,3 +40,4 @@ sphinx-tabs
 pydata-sphinx-theme==0.8.1
 sphinx-notfound-page==0.8
 jsx-lexer==1.0.0
+sphinx-tippy==0.4.1
diff --git a/source/_static/background-img.png b/source/_static/background-img.png
diff --git a/source/_static/concordium-logo-dark.svg b/source/_static/concordium-logo-dark.svg
diff --git a/source/_static/concordium-logo-no-text.svg b/source/_static/concordium-logo-no-text.svg