balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup before merging

Browse Source
This commit is contained in:
Matej Sima 2019-06-06 17:59:03 +02:00
parent 12d4f5d0b9
commit 44ecc0a133
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@ -57,7 +57,7 @@ stages:
- printf '' | ocaml - printf '' | ocaml
- opam switch - opam switch
.local-dune-job: local-dune-job:
<<: *before_script <<: *before_script
stage: test stage: test
script: script:
@ -72,7 +72,7 @@ stages:
# paths: # paths:
# - src/ligo/bin/cli.ml # - src/ligo/bin/cli.ml
.local-repo-job: local-repo-job:
<<: *before_script <<: *before_script
stage: test stage: test
script: script:
@ -81,7 +81,7 @@ stages:
#--build-test #--build-test
- opam install -y ligo - opam install -y ligo
.remote-repo-job: remote-repo-job:
<<: *before_script <<: *before_script
stage: test stage: test
script: script:
@ -98,7 +98,7 @@ stages:
- master - master
# Run a docker build without publishing to the registry # Run a docker build without publishing to the registry
.build-current-docker-image: build-current-docker-image:
stage: build_docker stage: build_docker
<<: *docker <<: *docker
<<: *docker_build <<: *docker_build
@ -108,7 +108,7 @@ stages:
# When a MR/PR is merged to dev # When a MR/PR is merged to dev
# take the previous build and publish it to Docker Hub # 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 stage: build_and_deploy_docker
<<: *docker <<: *docker
<<: *docker_build <<: *docker_build
@ -123,7 +123,7 @@ stages:
# in case something gets merged into 'dev' while releasing. # in case something gets merged into 'dev' while releasing.
pages: pages:
<<: *website_build <<: *website_build
# only: only:
# - master - master
# - dev - dev

4
gitlab-pages/website/pages/en/index.js
View File

@ -90,8 +90,8 @@ class HomeSplash extends React.Component {
<div className="inner"> <div className="inner">
<ProjectTitle siteConfig={siteConfig} /> <ProjectTitle siteConfig={siteConfig} />
<PromoSection> <PromoSection>
<Button href={docUrl('setup-installation.html')}>Getting started</Button> <Button href={docUrl('setup-installation.html')}>Get Started</Button>
<Button href={docUrl('contributors/origin.html')}>Contributing</Button> <Button href={docUrl('contributors/origin.html')}>Contribute</Button>
</PromoSection> </PromoSection>
</div> </div>

2
gitlab-pages/website/siteConfig.js
View File

@ -99,7 +99,7 @@ const siteConfig = {
headerLinks: [ headerLinks: [
{doc: 'setup-installation', label: 'Docs'}, {doc: 'setup-installation', label: 'Docs'},
{doc: 'api-cli-commands', label: 'CLI'}, {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: // If you have users set above, you add it here:

31
gitlab-pages/website/static/css/custom.css
View File

@ -57,26 +57,41 @@ ul {
border: 1px solid #B2210C; border: 1px solid #B2210C;
color: #B2210C; color: #B2210C;
} }
/*
dark red: B2210C
*/
.button:hover, .promoSection .buttonWrapper:first-of-type > a.button { .button:hover, .promoSection .buttonWrapper:first-of-type > a.button {
background: #B2210C; background: #B2210C;
color: white; color: white;
} }
blockquote { blockquote {
background-color: rgba(178, 33, 12, 0.7); background-color: rgba(26, 26, 26, 0.6);
border-left: 8px solid #B2210C; border-left: 8px solid rgba(26, 26, 26, 0.7);
color: white; 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 { a {
color: rgba(26, 26, 26, 0.7); color: rgba(12, 12, 12, 0.8);
} }
a:hover { a:hover {
color: rgba(26, 26, 26, 1); color: rgb(12, 12, 12);
} }
.homeContainer .homeWrapper .projectLogo { .homeContainer .homeWrapper .projectLogo {