diff --git a/.gitignore b/.gitignore index 9053b2cbf..102e97e8c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,10 @@ dune-project cache/* Version.ml /_opam/ +<<<<<<< HEAD /*.pp.ligo -**/.DS_Store \ No newline at end of file +<<<<<<< HEAD +**/.DS_Store +======= +**/.DS_Store +>>>>>>> [LIGO-93] redesign profile pics diff --git a/gitlab-pages/.gitignore b/gitlab-pages/.gitignore index 7dbdd7e15..66c160e49 100644 --- a/gitlab-pages/.gitignore +++ b/gitlab-pages/.gitignore @@ -1,4 +1,5 @@ **/.DS_Store +.DS_Store node_modules diff --git a/gitlab-pages/website/pages/en/index.js b/gitlab-pages/website/pages/en/index.js index 8c9cac7de..c4598ed80 100644 --- a/gitlab-pages/website/pages/en/index.js +++ b/gitlab-pages/website/pages/en/index.js @@ -106,25 +106,109 @@ class HomeSplash extends React.Component { const langPart = `${language ? `${language}/` : ""}`; const docUrl = doc => `${baseUrl}${docsPart}${langPart}${doc}`; - const SampleCode = props => ( -
-
-
-
-
- PascaLIGO + const SplashContainer = props => ( +
+
+
+
+
+
+ PascaLIGO +
+
+ CameLIGO +
+
ReasonLIGO (coming soon)
+ {/*
Camligo
*/}
-
- CameLIGO +
+
+
+ + 
+                        
+                          // 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)
+                          

+                        
+
+ +
+
+
+
+ 
+                      
+                        type storage = int 

+                        

+                        (* variant defining pseudo multi-entrypoint actions *){" "}
+                        

+                        

+                        type action =
| Increment of int
+                        
| Decrement of int
+                        

+                        

+                        let add (a: int) (b: int) : int = a + b

+                        

+                        let subtract (a: int) (b: int) : int = a - b

+                        

+                        (* real entrypoint that re-routes the flow based on the
+                        action provided *)
+                        

+                        

+                        let%entry main (p : action) storage =
 let storage
+                        =
 match p with
+                        
 | Increment n -> add storage n
 | Decrement
+                        n -> subtract storage n
 in (([] : operation list),
+                        storage)
+                        

+                      
+
+
+
ReasonLIGO (coming soon)
@@ -132,22 +216,32 @@ class HomeSplash extends React.Component { {PascalLIGOTab()} {CamelLIGOTab()}
+ + {props.children}
); return ( -
-
-

{siteConfig.tagline}

-

{siteConfig.taglineSub}

- - Get Started - + +
+ + + + + +
@@ -246,20 +340,23 @@ class Index extends React.Component { {[ { content: - "Write types, then code, and benefit from the safety coming from type systems.", - image: `${baseUrl}img/strong-type-system.svg`, - title: "Strong Type System" + "Write in PascaLIGO (pascal-like syntax) or CameLIGO (caml-like syntax). If you know OCaml, you can also add your own syntax.", + image: `${baseUrl}img/edit.svg`, + imageAlign: "top", + title: "Syntax Agnostic" }, { content: - "Write in PascaLIGO (pascal-like syntax) or CameLIGO (caml-like syntax). If you know OCaml, you can also add your own syntax.", - image: `${baseUrl}img/syntax-agnostic.svg`, - title: "Syntax Agnostic" + "Write types, then code, and benefit from the safety coming from type systems.", + image: `${baseUrl}img/lightning.svg`, + imageAlign: "top", + title: "Strong Type System" }, { content: "With Granary, you can use LIGO as a lib from NodeJS.", - image: `${baseUrl}img/easy-integration.svg`, + image: `${baseUrl}img/puzzle.svg`, + imageAlign: "top", title: "Easy Integration" } ].map(FeatureCard)} @@ -313,6 +410,8 @@ class Index extends React.Component { )); + const pageUrl = page => baseUrl + (language ? `${language}/` : "") + page; + return (
{PartnerShowcase} @@ -344,10 +443,17 @@ class Index extends React.Component { )); + const pageUrl = page => baseUrl + (language ? `${language}/` : "") + page; + return ( -
-

Team

-
{showcase}
+
+

Team

+
{showcase}
+ {/* */}
); }; diff --git a/gitlab-pages/website/siteConfig.js b/gitlab-pages/website/siteConfig.js index ab081f669..0d2780144 100644 --- a/gitlab-pages/website/siteConfig.js +++ b/gitlab-pages/website/siteConfig.js @@ -14,7 +14,7 @@ const partners = [ caption: "Nomadic Labs", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: "/img/nomadic-logo.svg", + image: "/img/nomadic-logo.jpg", infoLink: "https://www.nomadic-labs.com/", pinned: true }, @@ -22,7 +22,7 @@ const partners = [ caption: "Tocqueville Group", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: "/img/tq-logo-2.svg", + image: "/img/tq-logo.svg", infoLink: "https://tqgroup.io/", pinned: true }, @@ -30,7 +30,7 @@ const partners = [ caption: "Stove Labs", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: "/img/stove-logo.svg", + image: "/img/stove-logo.png", infoLink: "https://stove-labs.com", pinned: true } @@ -82,8 +82,7 @@ const team = [ const siteConfig = { title: "LIGO", // Title for your website. tagline: - "LIGO is a statically typed high-level smart-contract language that compiles down to Michelson.", - taglineSub: "It seeks to be easy to use, extensible and safe.", + "LIGO is a statically typed high-level smart-contract language that compiles down to Michelson. It seeks to be easy to use, extensible and safe.", url: "https://your-docusaurus-test-site.com", // Your website URL baseUrl: "/", // Base URL for your project */ // For github.io type URLs, you would set the url and baseUrl like: diff --git a/gitlab-pages/website/static/css/custom.css b/gitlab-pages/website/static/css/custom.css index 5a41e4e9f..bc2877aca 100644 --- a/gitlab-pages/website/static/css/custom.css +++ b/gitlab-pages/website/static/css/custom.css @@ -454,10 +454,35 @@ body flex-direction: column; align-items: center; justify-content: center; - width: 20%; + max-width: fit-content; + color: var(--color-primary-text); padding: 0 var(--padding-level-1); } +.profileContainer:hover { + color: var(--color-primary-brand); +} + +.profileImage { + max-height: 195px; + max-width: 195px; + border: var(--color-gray); +} +.profileImage:hover { + box-shadow: 12px 12px 0px var(--color-primary-brand); +} + +.team-container { + display: flex; + flex-direction: row; + justify-content: space-around; + padding: var(--padding-level-1); + flex-wrap: wrap; +} + +@media only screen and (min-device-width: 360px) and (max-device-width: 736px) { +} + .profileContainer p { color: var(--color-primary-text); }