diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a039ab23..f6e6b62ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ stages: - printf '' | ocaml - opam switch -.local-dune-job: +local-dune-job: <<: *before_script stage: test script: @@ -72,7 +72,7 @@ stages: # paths: # - src/ligo/bin/cli.ml -.local-repo-job: +local-repo-job: <<: *before_script stage: test script: @@ -81,7 +81,7 @@ stages: #--build-test - opam install -y ligo -.remote-repo-job: +remote-repo-job: <<: *before_script stage: test script: @@ -98,7 +98,7 @@ stages: - master # Run a docker build without publishing to the registry -.build-current-docker-image: +build-current-docker-image: stage: build_docker <<: *docker <<: *docker_build @@ -108,7 +108,7 @@ stages: # When a MR/PR is merged to dev # take the previous build and publish it to Docker Hub -.build-and-publish-latest-docker-image: +build-and-publish-latest-docker-image: stage: build_and_deploy_docker <<: *docker <<: *docker_build @@ -123,7 +123,7 @@ stages: # in case something gets merged into 'dev' while releasing. pages: <<: *website_build - # only: - # - master - # - dev + only: + - master + - dev diff --git a/gitlab-pages/website/pages/en/index.js b/gitlab-pages/website/pages/en/index.js index e7e9210f4..832ff325e 100644 --- a/gitlab-pages/website/pages/en/index.js +++ b/gitlab-pages/website/pages/en/index.js @@ -90,8 +90,8 @@ class HomeSplash extends React.Component {
- - + +
diff --git a/gitlab-pages/website/siteConfig.js b/gitlab-pages/website/siteConfig.js index fd2f70e59..c5e4cce0e 100644 --- a/gitlab-pages/website/siteConfig.js +++ b/gitlab-pages/website/siteConfig.js @@ -99,7 +99,7 @@ const siteConfig = { headerLinks: [ {doc: 'setup-installation', label: 'Docs'}, {doc: 'api-cli-commands', label: 'CLI'}, - {doc: 'contributors/origin', label: 'Contributing'}, + {doc: 'contributors/origin', label: 'Contribute'}, ], // If you have users set above, you add it here: diff --git a/gitlab-pages/website/static/css/custom.css b/gitlab-pages/website/static/css/custom.css index c764688ae..cb2018b8d 100644 --- a/gitlab-pages/website/static/css/custom.css +++ b/gitlab-pages/website/static/css/custom.css @@ -57,26 +57,41 @@ ul { border: 1px solid #B2210C; color: #B2210C; } -/* -dark red: B2210C -*/ + .button:hover, .promoSection .buttonWrapper:first-of-type > a.button { background: #B2210C; color: white; } + blockquote { - background-color: rgba(178, 33, 12, 0.7); - border-left: 8px solid #B2210C; - color: white; + background-color: rgba(26, 26, 26, 0.6); + border-left: 8px solid rgba(26, 26, 26, 0.7); + color: rgba(255,255,255, 0.8); } +blockquote a { + color: rgba(255,255,255, 0.8); + border-bottom: 1px solid rgba(255,255,255, 0.8); +} + +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); + border-left-color: rgba(240, 210, 37, 1); + color: rgba(0, 0, 0, 0.632); +} */ + a { - color: rgba(26, 26, 26, 0.7); + color: rgba(12, 12, 12, 0.8); } a:hover { - color: rgba(26, 26, 26, 1); + color: rgb(12, 12, 12); } .homeContainer .homeWrapper .projectLogo {