diff --git a/.gitignore b/.gitignore index 102e97e8c..682093b54 100644 --- a/.gitignore +++ b/.gitignore @@ -5,10 +5,5 @@ dune-project cache/* Version.ml /_opam/ -<<<<<<< HEAD /*.pp.ligo -<<<<<<< HEAD **/.DS_Store -======= -**/.DS_Store ->>>>>>> [LIGO-93] redesign profile pics diff --git a/gitlab-pages/website/core/Footer.js b/gitlab-pages/website/core/Footer.js index 4a1fa9bc5..18312c7be 100644 --- a/gitlab-pages/website/core/Footer.js +++ b/gitlab-pages/website/core/Footer.js @@ -24,57 +24,53 @@ class Footer extends React.Component { render() { return ( ); } diff --git a/gitlab-pages/website/pages/en/index.js b/gitlab-pages/website/pages/en/index.js index c4598ed80..8c9cac7de 100644 --- a/gitlab-pages/website/pages/en/index.js +++ b/gitlab-pages/website/pages/en/index.js @@ -106,109 +106,25 @@ class HomeSplash extends React.Component { const langPart = `${language ? `${language}/` : ""}`; const docUrl = doc => `${baseUrl}${docsPart}${langPart}${doc}`; - const SplashContainer = props => ( -
-
-
-
-
-
- PascaLIGO -
-
- CameLIGO -
-
ReasonLIGO (coming soon)
- {/*
Camligo
*/} + const SampleCode = props => ( +
+
+
+
+
+ PascaLIGO
-
-
-
- - 
-                        
-                          // 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)
-                        

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

{siteConfig.tagline}

+

{siteConfig.taglineSub}

+ + Get Started +
@@ -340,23 +246,20 @@ class Index extends React.Component { {[ { 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/edit.svg`, - imageAlign: "top", - title: "Syntax Agnostic" + "Write types, then code, and benefit from the safety coming from type systems.", + image: `${baseUrl}img/strong-type-system.svg`, + title: "Strong Type System" }, { content: - "Write types, then code, and benefit from the safety coming from type systems.", - image: `${baseUrl}img/lightning.svg`, - imageAlign: "top", - 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/syntax-agnostic.svg`, + title: "Syntax Agnostic" }, { content: "With Granary, you can use LIGO as a lib from NodeJS.", - image: `${baseUrl}img/puzzle.svg`, - imageAlign: "top", + image: `${baseUrl}img/easy-integration.svg`, title: "Easy Integration" } ].map(FeatureCard)} @@ -410,8 +313,6 @@ class Index extends React.Component { )); - const pageUrl = page => baseUrl + (language ? `${language}/` : "") + page; - return (
{PartnerShowcase} @@ -443,17 +344,10 @@ 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 0d2780144..0135cc548 100644 --- a/gitlab-pages/website/siteConfig.js +++ b/gitlab-pages/website/siteConfig.js @@ -115,7 +115,6 @@ const siteConfig = { team, /* path to images for header/footer */ - headerIcon: "img/logo.svg", footerIcon: "img/logo.svg", favicon: "img/logo.svg", @@ -140,7 +139,7 @@ const siteConfig = { */ // This copyright info is used in /core/Footer.js and blog RSS/Atom feeds. - copyright: `Copyright © ${new Date().getFullYear()} Marigold`, + copyright: `© ${new Date().getFullYear()} LIGO. All rights reserved.`, highlight: { // Highlight.js theme to use for syntax highlighting in code blocks. diff --git a/gitlab-pages/website/static/css/custom.css b/gitlab-pages/website/static/css/custom.css index bc2877aca..e4884493a 100644 --- a/gitlab-pages/website/static/css/custom.css +++ b/gitlab-pages/website/static/css/custom.css @@ -105,6 +105,36 @@ footnote { font-size: 0.75rem; } +.projectTitle small { + max-width: 700px; + text-align: center; + margin: 0 auto; + margin-top: 0.7em; +} + +.fixedHeaderContainer { + background-color: #ffffff; + color: var(--color-primary-text); +} + +.fixedHeaderContainer a { + color: var(--color-primary-text); +} + +.fixedHeaderContainer .headerWrapper header a:nth-child(2) { + background-color: #EFEFEF; + margin-left: 50px; + padding: 4px 7px; + font-weight: normal; +} + +.fixedHeaderContainer .headerWrapper header h3 { + margin: 0; + color: var(--color-primary-text); + text-decoration: none; +} + + .fixedHeaderContainer header .headerTitleWithLogo { display: none; } @@ -113,8 +143,40 @@ footnote { background: var(--color-primary-text); } +.nav-footer .copyright { + text-align: left; + margin-left: 92px; + margin-top: 3em; + + border-top: 1px solid white; + padding-top: 3em; + margin-right: 92px; +} + +.nav-footer .footer-wrapper { + margin: 0 auto 3em; + max-width: 1080px; +} + +.nav-footer .sitemap { + margin: 0; +} + .navigationSlider .slidingNav { - background: #1a1a1a; + background: white; +} + +.navigationSlider .slidingNav ul { + background: white; + color: var(--color-primary-text) !important; +} + +.navigationSlider .slidingNav ul li > a:focus, +.navigationSlider .slidingNav ul li > a:hover, +.navigationSlider .slidingNav ul li.siteNavItemActive > a, +.navigationSlider .slidingNav ul li.siteNavGroupActive > a { + background-color: white; + color: var(--color-primary-brand) !important; } /** Top Section **/ @@ -459,6 +521,10 @@ body padding: 0 var(--padding-level-1); } +.profileContainer a { + color: var(--color-primary-text); +} + .profileContainer:hover { color: var(--color-primary-brand); } @@ -524,10 +590,6 @@ body background-color: var(--color-light-gray); } -.card:hover { - background-color: var(--color-light-blue); -} - .card-text { text-align: center; } @@ -554,6 +616,16 @@ body border-left: 5px solid var(--color-primary-brand); } +@media only screen and (min-width: 1024px) { + .navigationSlider .slidingNav ul li a { + color: #0D0F33; + } + + .navigationSlider .slidingNav ul li a:hover { + color: #3AA0FF; + } +} + @media (min-width: 560px) and (max-width: 768px) { /** Special rules to reorient feature cards at only one screen size**/ .card { @@ -572,6 +644,10 @@ body .profileContainer { max-width: 30%; } + + .headerWrapper header a:nth-child(2) { + display: none; + } } @media (max-width: 560px) { @@ -588,7 +664,21 @@ body } } +@media (max-width: 735px) { + .nav-footer .sitemap { + max-width: 90%; + margin: 0 auto; + } + + .nav-footer .copyright { + max-width: 90%; + text-align: left; + margin: 3em auto; + } +} + @media only screen and (min-device-width: 360px) and (max-device-width: 736px) { + } @media only screen and (max-width: 1023px) { @@ -607,7 +697,10 @@ body } } -@media only screen and (min-width: 1280px) { +@media only screen and (max-width: 1023px) { + .reactNavSearchWrapper input#search_input_react { + background-color: rgba(0, 0, 0, 0.2); + } } @media only screen and (min-width: 1440px) {