Merge branch 'feature/#14-website-prerelease-fixes' into 'dev'

Feature/#14 website prerelease fixes

See merge request ligolang/ligo!28

gitlab-pages/docs/language-basics-entrypoints.md

@@ -1,44 +0,0 @@
----
-id: language-basics-entrypoints
-title: Entrypoints
----
-
-## Defining an entry point
-
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Pascaligo-->
-```Pascal
-function main (const p : int ; const s : int) : (list(operation) * int) is
-  block {skip} with ((nil : list(operation)), s + 1)
-```
-<!--END_DOCUSAURUS_CODE_TABS-->
-
-## Multiple entry points
-
-Multiple entrypoints are currently not supported in Michelson, however with Ligo, you can work that around by using variants.
-
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Pascaligo-->
-```Pascal
-// variant defining pseudo multi-entrypoint actions
-type action is
-| Increment of int
-| Decrement of int
-
-function add (const a : int ; const b : int) : int is
-    block { skip } with a + b
-
-function subtract (const a : int ; const b : int) : int is
-    block { skip } with a - b
-
-// real entrypoint that re-routes the flow based on the action provided
-function main (const p : action ; const s : int) : (list(operation) * int) is
-  block {skip} with ((nil : list(operation)),
-    case p of
-    | Increment n -> add(s, n)
-    | Decrement n -> subtract(s, n)
-    end)
-```
-
-
-<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/language-basics-functions.md

@@ -1,22 +0,0 @@
----
-id: language-basics-functions
-title: Functions
----
-
-## Defining a function
-
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Pascaligo-->
-```Pascal
-// multiply(1, 2) = 2
-function multiply (const a : int ; const b : int) : int is
-    begin
-        const result : int = a * b ;
-    end with result
-
-// add(1, 2) = 3
-function add (const a : int ; const b : int) : int is
-    block { skip } with a + b
-```
-
-<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/language-basics-variables.md

@@ -1,18 +0,0 @@
----
-id: language-basics-variables
-title: Variables
----
-
-## Defining a variable
-
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Pascaligo-->
-```Pascal
-// int
-const four : int = 4;
-
-// string
-const name : string = "John Doe";
-```
-
-<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/language-basics/cheat-sheet.md

@@ -0,0 +1,37 @@
+---
+id: cheat-sheet
+title: Cheat Sheet
+---
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--PascaLIGO-->
+
+|Primitive   	|Example|
+|---	|---|
+|Strings | `"Tezos"`|
+|Characters | `"t"`|
+|Integers | `42`, `7`|
+|Natural numbers | `42n`, `7n`|
+|Unit| `unit`|
+|Boolean|<pre><code>const hasDriversLicense: bool = False;<br/>const adult: bool = True;</code></pre> |
+|Mutez (micro tez)| `42mtz`, `7mtz` |
+|Address | `"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"`, `"KT1JepfBfMSqkQyf9B1ndvURghGsSB8YCLMD"`|
+|Addition |`3 + 4`, `3n + 4n`|
+|Multiplication & Division| `3 * 4`, `3n * 4n`, `10 / 5`, `10n / 5n`|
+|Modulo| `10 mod 3`|
+|Tuples| <pre><code>type name is (string * string);<br/>const winner: name = ("John", "Doe");<br/>const firstName: string = winner.0;<br/>const lastName: string = winner.1;</code></pre>|
+|Types|`type age is int`, `type name is string`  |
+|Includes|```#include "library.ligo"```|
+|Functions (short form)|<pre><code>function add (const a : int ; const b : int) : int is<br/>&nbsp;&nbsp;block { skip } with a + b</code></pre>|
+|Functions (long form)|<pre><code>function add (const a : int ; const b : int) : int is<br/>&nbsp;&nbsp;block { <br/>&nbsp;&nbsp;&nbsp;&nbsp;const result: int = a + b;<br/>&nbsp;&nbsp;} with result</code></pre>|
+|Options|<pre><code>type middleName is option(string);<br/>const middleName : middleName = Some("Foo");<br/>const middleName : middleName = None;</code></pre>|
+|Assignment| ```const age: int = 5;```|
+|Assignment on an existing variable <br/></br>*⚠️ This feature is not supported at the top-level scope, you can use it e.g. within functions. Works for Records and Maps as well.*| ```age := 18;```, ```p.age := 21``` |
+|Annotations| ```("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address)```|
+|Variants|<pre><code>type action is<br/>&#124; Increment of int<br/>&#124; Decrement of int</code></pre>|
+|Variant *(pattern)* matching|<pre><code>const a: action = Increment(5);<br/>case a of<br/>&#124; Increment n -> n + 1<br/>&#124; Decrement n -> n - 1<br/>end</code></pre>|
+|Records|<pre><code>type person is record<br/>&nbsp;&nbsp;age: int ;<br/>&nbsp;&nbsp;name: string ;<br/>end<br/><br/>const john : person = record<br/>&nbsp;&nbsp;age = 18;<br/>&nbsp;&nbsp;name = "John Doe";<br/>end<br/><br/>const name: string = john.name;</code></pre>|
+|Maps|<pre><code>type prices is map(nat, tez);<br/><br/>const prices : prices = map<br/>&nbsp;&nbsp;10n -> 60mtz;<br/>&nbsp;&nbsp;50n -> 30mtz;<br/>&nbsp;&nbsp;100n -> 10mtz;<br/>end<br/><br/>const price: option(tez) = prices[50n];</code></pre>|
+
+
+<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/language-basics/entrypoints.md

@@ -0,0 +1,46 @@
+---
+id: entrypoints
+title: Entrypoints
+---
+
+Entrypoints serve as a gate to our smart contracts. In LIGO each entrypoint is a function that accepts two arguments - first one is the parameter used to invoke the contract, and the second is the current storage of the contract. Each entrypoint has to return a list of operations to apply as a result of the smart contract call, and a new storage value.
+
+> If you don't want to update the storage, don't worry, just re-cycle your last storage value.
+
+## Defining an entry point
+
+Contract below is effectively an empty contract, that takes a `unit` as a parameter, and returns a `unit` as well.
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+function main (const p : unit ; const s : unit) : (list(operation) * unit) is
+  block {skip} with ((nil : list(operation)), s)
+```
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+## Multiple entry points
+
+Multiple entrypoints are currently not supported in Michelson yet, however with Ligo, you can work that around by using variants & pattern matching.
+
+In the example below we have a simple counter contract, that can be either `Increment(int)`-ed, or `Decrement(int)`-ed.
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+// variant defining pseudo multi-entrypoint actions
+type action is
+| Increment of int
+| Decrement of int
+
+// real entrypoint that re-routes the flow based on the action (parameter) provided
+function main (const action: action ; const counter: int) : (list(operation) * int) is
+  block {skip} with ((nil : list(operation)),
+    case action of
+    | Increment number -> counter + number
+    | Decrement number -> counter - number
+    end)
+```
+
+
+<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/language-basics/functions.md

@@ -0,0 +1,43 @@
+---
+id: functions
+title: Functions
+---
+
+## Defining a function
+
+Body of a function consists of two parts, the first part (**`block {}`** or **`begin ... end`**) - normally consists of logic *(flow conditions, variable declarations, etc.)*, and the second part (**`with ...`**) usually defines the return value of your function.
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+const availableSupply: nat = 15n;
+const totalSupply: nat = 100n;
+
+function calculatePrice(const available: nat; const total: nat): nat is
+    begin
+        const price: nat = total / available
+    end with price
+
+const price: nat = calculatePrice(availableSupply, totalSupply);
+```
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+
+### Functions without an explicit body (shorter syntax)
+
+A short hand syntax for the same function as above can inline the price calculation directly into the return statement.
+While this approach can have it's benefits, it can decrease readability.
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+const availableSupply: nat = 15n;
+const totalSupply: nat = 100n;
+
+function calculatePrice(const available: nat; const total: nat): nat is
+    block { skip } with total / available
+
+const price: nat = calculatePrice(availableSupply, totalSupply);
+```
+
+<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/language-basics/operators.md

@@ -1,10 +1,12 @@
 ---
-id: language-basics-operators
+id: operators
 title: Operators
 ---
 
 ## Available operators
 
+> This list is non-exhaustive, more operators will be added in the upcoming LIGO releases.
+
 |Michelson   	|Pascaligo   	|Description |
 |---	|---	|---	|
 | `SENDER` | `sender` | Address that initiated the current transaction

gitlab-pages/docs/language-basics/types.md

@@ -0,0 +1,72 @@
+---
+id: types
+title: Types
+---
+
+## Built-in types
+
+For the list of built-in types, please refer to the [Cheat Sheet](language-basics/cheat-sheet.md). LIGO's type system is built on top of Michelson, but offers a handful of features like type aliasing, or groupping of multiple types into a single powerful type.
+
+## Type aliases
+
+Type aliasing is a great choice when working towards a readable / maintainable smart contract. One well typed variable is worth a thousand words. For example we can choose to *alias* a string, as an animal breed - this will allow us to comunicate our intent with added clarity.
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+type animalBreed is string;
+
+const dogBreed: animalBreed = "Saluki"; 
+```
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+## Defining custom types
+
+### Simple types
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+// accountBalances is a simple type, a map of address <-> tez
+type accountBalances is map(address, tez);
+
+const ledger: accountBalances = map
+    ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx": address) -> 10mtz
+end
+```
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+
+### Composed types
+
+Often our contracts will require complex data structures, which will in turn require a well-typed storage, or functions to work with. LIGO offers a simple way to compose simple types, into larger & more expressive composed types.
+
+In the example below you can see definition of data types for a ledger, that keeps a balance & number of previous transactions for a given account.
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+// alias two types
+type account is address;
+type numberOfTransactions is nat;
+
+// accountData consists of a record with two fields (balance, numberOfTransactions)
+type accountData is record
+    balance: tez;
+    numberOfTransactions: numberOfTransactions;
+end
+// our ledger / accountBalances is a map of account <-> accountData
+type accountBalances is map(account, accountData);
+
+// pseudo-JSON representation of our map 
+// { "tz1...": {balance: 10mtz, numberOfTransactions: 5n} }
+const ledger: accountBalances = map
+    ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx": address) -> record
+      balance = 10mtz;
+      numberOfTransactions = 5n;
+    end
+end
+```
+
+<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/language-basics/variables.md

@@ -0,0 +1,40 @@
+---
+id: variables
+title: Variables
+---
+
+## Defining a variable
+
+Variables in LIGO can be defined in two ways - by using either the `const` or `var` keywords. `const` can be used both at global (top-level) and local scope (within functions/blocks), while `var` can be used for mutable values in the local scope.
+
+
+### Imutable variables using `const`
+
+> ⚠️ Currently const values are mutable as well, however this is something that will change in the upcoming release. For the time being think of `const` as a semantical way to indicate developer intentions.
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+const four: int = 4;
+```
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+### Mutable variables using `var` 
+
+> ⚠️ `var` can't be used in the global scope
+
+<!--DOCUSAURUS_CODE_TABS-->
+<!--Pascaligo-->
+```Pascal
+// won't work, use const for global values instead
+var four: int = 4;
+
+// value of `number` can be mutated within local scope
+function addFour(var number: int): int is
+  block { 
+    number := number + 4;
+  } with number;
+```
+
+<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/docs/setup/editor-support.md

@@ -0,0 +1,8 @@
+---
+id: editor-support
+title: Editor Support
+---
+
+Good editor support is the basic component of proper development experience - currently, we provide support for VSCode via an [extension](https://marketplace.visualstudio.com/items?itemName=Brice.ligo).
+
+Currently the extension supports Pascaligo for syntax highlighting (work in progress). But it aims to support debug, gas optimization, dry run and other relevant features in the near future.

gitlab-pages/docs/setup/installation.md

@@ -1,5 +1,5 @@
 ---
-id: setup-installation
+id: installation
 title: Installation
 ---
 
@@ -32,7 +32,4 @@ ligo --help
 
 ## Manual installation (advanced)
 
-For now, please refer to the steps described in the [Dockerfile](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile).
+For now, please refer to the steps described in the [Dockerfile](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile).
-
-
-

gitlab-pages/website/core/Footer.js

@@ -46,6 +46,12 @@ class Footer extends React.Component {
               rel="noreferrer noopener">
               Tezos Stack Exchange
             </a>
+            <a
+              href="https://discord.gg/9rhYaEt"
+              target="_blank"
+              rel="noreferrer noopener">
+              Discord
+            </a>
           </div>
           <div>
             <h5>More</h5>
@@ -63,7 +69,7 @@ class Footer extends React.Component {
             rel="noreferrer noopener">
             Docusaurus
           </a> by Facebook.
-          <div>Icons made by <a href="https://www.flaticon.com/authors/lucy-g" title="Lucy G">Lucy G</a> from <a href="https://www.flaticon.com/" 			    title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" 			    title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>
+          <div>Icons made by <a href="https://www.freepik.com/" title="Freepik">Freepik</a> & <a href="https://www.flaticon.com/authors/lucy-g" title="Lucy G">Lucy G</a> from <a href="https://www.flaticon.com/" 			    title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" 			    title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>
           {this.props.config.copyright}
         </section>
       </footer>

gitlab-pages/website/pages/en/index.js

@@ -29,8 +29,9 @@ class HomeSplash extends React.Component {
           <div className="tabs">
             <div className="nav-tabs">
               <div id="tab-group-3-tab-4" className="nav-link active" data-group="group_3"
-                data-tab="tab-group-3-content-4">Pascaligo</div>
+                data-tab="tab-group-3-content-4">PascaLIGO</div>
-              <div className="nav-link">Camligo (coming soon)</div>
+              <div className="nav-link" data-group="group_3"
+                data-tab="tab-group-3-content-5">CameLIGO</div>
               <div className="nav-link">Reasonligo (coming soon) </div>
               {/* <div id="tab-group-3-tab-5" className="nav-link" data-group="group_3"
                 data-tab="tab-group-3-content-5">Camligo</div> */}
@@ -45,9 +46,11 @@ class HomeSplash extends React.Component {
               </div>
               <div id="tab-group-3-content-5" className="tab-pane" data-group="group_3" tabIndex="-1">
                 <div>
-                  <span>
+                  <pre>
-                    SOON
+                    <code className="hljs css language-Pascal">
-                  </span>
+                    type storage = int <br/><br/>(* variant defining pseudo multi-entrypoint actions *) <br/><br/>type action =<br/>| Increment of int<br/>| Decrement of int<br/><br/>let add (a: int) (b: int) : int = a + b<br/><br/>let subtract (a: int) (b: int) : int = a - b<br/><br/>(* real entrypoint that re-routes the flow based on the action provided *)<br/><br/>let%entry main (p : action) storage =<br/>  let storage =<br/>    match p with<br/>     | Increment n -> add storage n<br/>     | Decrement n -> subtract storage n<br/>  in (([] : operation list), storage)<br/>
+                    </code>
+                  </pre>
                 </div>
               </div>
             </div>

gitlab-pages/website/pages/en/versions.js

@@ -28,7 +28,7 @@ function Versions(props) {
           <header className="postHeader">
             <h1>{siteConfig.title} Versions</h1>
           </header>
-          <h3 id="latest">Current version (Stable)</h3>
+          <h3 id="latest">Current version</h3>
           <table className="versions">
             <tbody>
               <tr>
@@ -39,7 +39,7 @@ function Versions(props) {
                   <a
                     href={`${siteConfig.baseUrl}${siteConfig.docsUrl}/${
                       props.language ? props.language + '/' : ''
-                    }setup-installation`}>
+                    }setup/installation`}>
                     Documentation
                   </a>
                 </td>
@@ -63,7 +63,7 @@ function Versions(props) {
                   <a
                     href={`${siteConfig.baseUrl}${siteConfig.docsUrl}/${
                       props.language ? props.language + '/' : ''
-                    }next/setup-installation`}>
+                    }next/setup/installation`}>
                     Documentation
                   </a>
                 </td>
@@ -88,7 +88,7 @@ function Versions(props) {
                         <a
                           href={`${siteConfig.baseUrl}${siteConfig.docsUrl}/${
                             props.language ? props.language + '/' : ''
-                          }${version}/setup-installation`}>
+                          }${version}/setup/installation`}>
                           Documentation
                         </a>
                       </td>

gitlab-pages/website/sidebars.json

@@ -1,7 +1,7 @@
 {
   "docs": {
-    "Setup": ["setup-installation"],
+    "Setup": ["setup/installation", "setup/editor-support"],
-    "Language Basics": ["language-basics-variables", "language-basics-functions", "language-basics-entrypoints", "language-basics-operators"],
+    "Language Basics": ["language-basics/cheat-sheet", "language-basics/types", "language-basics/variables", "language-basics/functions", "language-basics/entrypoints", "language-basics/operators"],
     "API": ["api-cli-commands"]
   },
   "contributors-docs": {

gitlab-pages/website/siteConfig.js

@@ -41,40 +41,40 @@ const team = [
     caption: 'Gabriel Alfour',
     // You will need to prepend the image path with your baseUrl
     // if it is not '/', like: '/test-site/img/image.jpg'.
-    image: 'https://thepowerofthedream.org/wp-content/uploads/2015/09/generic-profile-picture-600x600.jpg',
+    image: '/img/user.png',
-    infoLink: '#',
+    infoLink: 'https://gitlab.com/gabriel.alfour',
     pinned: true,
   },
   {
     caption: 'Georges Dupéron',
     // You will need to prepend the image path with your baseUrl
     // if it is not '/', like: '/test-site/img/image.jpg'.
-    image: 'https://thepowerofthedream.org/wp-content/uploads/2015/09/generic-profile-picture-600x600.jpg',
+    image: '/img/user.png',
-    infoLink: '#',
+    infoLink: 'https://gitlab.com/georges.duperon',
     pinned: true,
   },
   {
     caption: 'Christian Rinderknecht',
     // You will need to prepend the image path with your baseUrl
     // if it is not '/', like: '/test-site/img/image.jpg'.
-    image: 'https://thepowerofthedream.org/wp-content/uploads/2015/09/generic-profile-picture-600x600.jpg',
+    image: '/img/christian.jpeg',
-    infoLink: '#',
+    infoLink: 'https://github.com/rinderknecht',
     pinned: true,
   },
   {
     caption: 'Brice Aldrich',
     // You will need to prepend the image path with your baseUrl
     // if it is not '/', like: '/test-site/img/image.jpg'.
-    image: 'https://thepowerofthedream.org/wp-content/uploads/2015/09/generic-profile-picture-600x600.jpg',
+    image: '/img/brice.png',
-    infoLink: '#',
+    infoLink: 'https://github.com/DefinitelyNotAGoat',
     pinned: true,
   },
   {
     caption: 'Matej Sima',
     // You will need to prepend the image path with your baseUrl
     // if it is not '/', like: '/test-site/img/image.jpg'.
-    image: 'https://scontent-frt3-2.xx.fbcdn.net/v/t1.0-9/56644817_2276459725943174_4007605942056124416_n.jpg?_nc_cat=107&_nc_ht=scontent-frt3-2.xx&oh=e8a86a2cfe76798cbdc28a0769ebccb1&oe=5D5423F0',
+    image: '/img/matej.jpg',
-    infoLink: 'https://sk.linkedin.com/in/matejsima',
+    infoLink: 'https://github.com/maht0rz',
     pinned: true,
   },
 ];
@@ -97,7 +97,7 @@ const siteConfig = {
 
   // For no header links in the top nav bar -> headerLinks: [],
   headerLinks: [
-    {doc: 'setup-installation', label: 'Docs'},
+    {doc: 'setup/installation', label: 'Docs'},
     {doc: 'api-cli-commands', label: 'CLI'},
     {doc: 'tutorials/first-smart-contract', label: 'Tutorials'},
     { blog: true, label: 'Blog' },

gitlab-pages/website/static/css/custom.css

@@ -29,36 +29,39 @@
     background: transparent;
 }
 
-.homeContainer .tabs {
+.tabs {
     max-width: 800px;
     margin: 0 auto;
     border-top: none;
     border-bottom: 4px solid #e0e0e0;
 }
 
-.homeContainer .tabs .nav-tabs > div.active {
+.tabs .nav-tabs > div {
-    border-bottom: none;
-}
-
-.homeContainer .tabs .nav-tabs > div {
-    cursor: default;
-    color: #24292e64;
-}
-
-.homeContainer .tabs .nav-tabs > div:first-of-type {
     cursor: pointer;
     color: #24292e;
+    border-bottom: none;
+    padding-bottom: 8px;
+}
+.tab-content {
+    padding-top: 12px;
 }
 
-.homeContainer .tabs .nav-tabs > div.active:first-of-type {
+.tabs .nav-tabs > div.active {
     border-bottom: 4px solid #1A1A1A;
 }
 
-.homeContainer .tab-content {
+
+.homeContainer .tabs .nav-tabs > div:last-of-type {
+    cursor: default;
+    color: #24292e64;
+    border-bottom: none;
+}
+
+.tab-content {
     border-top: 4px solid #e0e0e0;
 }
 
-.homeContainer .nav-tabs {
+.nav-tabs {
     border: none;
     position: relative;
     top: 4px;
@@ -77,11 +80,15 @@
 
 
 blockquote {
-    background-color: rgba(26, 26, 26, 0.6);
+    background-color: rgba(26, 26, 26, 0.3);
-    border-left: 8px solid rgba(26, 26, 26, 0.7);
+    border-left: 8px solid rgba(26, 26, 26, 0.1);
-    color: rgba(255,255,255, 0.8);
+    color: rgba(255,255,255, 1);
 }
 
+blockquote code {
+    opacity: 0.7;
+}
+/* 
 blockquote a {
     color: rgba(255,255,255, 0.8);
     border-bottom: 1px solid rgba(255,255,255, 0.8);
@@ -90,7 +97,7 @@ blockquote a {
 blockquote a:hover {
     color: rgba(255,255,255, 1);
     border-bottom: 1px solid rgba(255,255,255, 1);
-}
+} */
 /* 
 blockquote {
     background-color: rgba(252, 214, 0, 0.687);
@@ -99,11 +106,11 @@ blockquote {
 } */
 
 a {
-    color: rgba(12, 12, 12, 0.8);
+    color: rgba(178, 33, 12, 0.8);
 }
 
 a:hover {
-    color: rgb(12, 12, 12);
+    color: rgba(178, 33, 12, 1);
 }
 
 .homeContainer .homeWrapper .projectLogo {
@@ -178,12 +185,32 @@ a:hover {
     padding-right: 40px;
 }
 
-
-
 .productShowcaseSection.team .logos p {
     padding-top: 0px;
 }
 
+.toc .toggleNav {
+    margin-top: 12px;
+}
+
+.mainContainer {
+    padding-top: 60px;
+}
+
+.tocActive .onPageNav > .toc-headings {
+    padding-top: 24px;
+}
+
+.docsSliderActive #tocToggler {
+    opacity: 0;
+    visibility: hidden;
+}
+
+code {
+    background: rgb(240, 240, 240);
+    color: #444;
+}
+
 @media only screen and (min-device-width: 360px) and (max-device-width: 736px) {
 }
 

gitlab-pages/website/versioned_docs/version-next/language-basics-entrypoints.md

@@ -9,7 +9,7 @@ original_id: language-basics-entrypoints
 <!--DOCUSAURUS_CODE_TABS-->
 <!--Pascaligo-->
 ```Pascal
-function main (const p : int ; const s : int) : (list(operation) * unit) is
+function main (const p : int ; const s : int) : (list(operation) * int) is
   block {skip} with ((nil : list(operation)), s + 1)
 ```
 <!--END_DOCUSAURUS_CODE_TABS-->
@@ -42,4 +42,4 @@ function main (const p : action ; const s : int) : (list(operation) * int) is
 ```
 
 
-<!--END_DOCUSAURUS_CODE_TABS-->
+<!--END_DOCUSAURUS_CODE_TABS-->

gitlab-pages/website/versioned_docs/version-next/setup-installation.md

@@ -1,39 +0,0 @@
----
-id: version-next-setup-installation
-title: Installation
-original_id: setup-installation
----
-
-There are currently two ways to get started with Ligo, both of those will allow you to use the Ligo CLI with your contracts. You can choose to use either the Docker image, or to compile & build the Ligo CLI yourself.
-
-## Dockerized installation (recommended)
-
-> 🐳 You can find instructions on how to install Docker [here](https://docs.docker.com/install/).
-
-Easiest way to use LIGO is through the Docker image available at [Docker Hub](https://hub.docker.com/r/ligolang/ligo). Sources for the image can be found on [Gitlab](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile).
-You can either run the docker image yourself, or you can setup a global ligo executable as shown below.
-
-### Setting up a globally available `ligo` executable
-
-> You can install additional ligo versions by replacing `next` with the required version number
-
-```zsh
-# next (pre-release)
-curl https://gitlab.com/ligolang/ligo/raw/dev/scripts/installer.sh | bash "next"
-
-# e.g. 1.0.0 (stable)
-curl https://gitlab.com/ligolang/ligo/raw/master/scripts/installer.sh | bash "1.0.0"
-```
-
-**Verify your ligo installation by running:**
-```zsh
-ligo --help
-```
-
-
-## Manual installation (advanced)
-
-For now, please refer to the steps described in the [Dockerfile](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile).
-
-
-

gitlab-pages/website/versioned_sidebars/version-next-sidebars.json

@@ -1,13 +1,16 @@
 {
   "version-next-docs": {
     "Setup": [
-      "version-next-setup-installation"
+      "version-next-setup/installation",
+      "version-next-setup/editor-support"
     ],
     "Language Basics": [
-      "version-next-language-basics-variables",
+      "version-next-language-basics/cheat-sheet",
-      "version-next-language-basics-functions",
+      "version-next-language-basics/types",
-      "version-next-language-basics-entrypoints",
+      "version-next-language-basics/variables",
-      "version-next-language-basics-operators"
+      "version-next-language-basics/functions",
+      "version-next-language-basics/entrypoints",
+      "version-next-language-basics/operators"
     ],
     "API": [
       "version-next-api-cli-commands"