From 99a9df2dcab5b40b2fd6ee30f39d93a6d973ac87 Mon Sep 17 00:00:00 2001 From: Nathan Biller Date: Wed, 25 Sep 2019 02:01:06 -0400 Subject: [PATCH 1/6] Corrected the overlapping issue of section 3 on section 2 by decreasing the viewport height. --- assets/fresh/partials/_sections.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/fresh/partials/_sections.scss b/assets/fresh/partials/_sections.scss index 763071d..80f3197 100644 --- a/assets/fresh/partials/_sections.scss +++ b/assets/fresh/partials/_sections.scss @@ -61,7 +61,7 @@ Section Styles //Pulled image img.pushed-image { - margin-top: -29vh; + margin-top: -8vh; } //Icon box From 06c4f06613798d9d5883a620bdb80e193cdc9796 Mon Sep 17 00:00:00 2001 From: Nathan Biller Date: Wed, 25 Sep 2019 02:01:06 -0400 Subject: [PATCH 2/6] Corrected the overlapping issue of section 3 on section 2 by decreasing the viewport height. --- assets/fresh/partials/_sections.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/fresh/partials/_sections.scss b/assets/fresh/partials/_sections.scss index 763071d..80f3197 100644 --- a/assets/fresh/partials/_sections.scss +++ b/assets/fresh/partials/_sections.scss @@ -61,7 +61,7 @@ Section Styles //Pulled image img.pushed-image { - margin-top: -29vh; + margin-top: -8vh; } //Icon box From 9af68f14d2e3626fd2e68851fd34ad6858c220dc Mon Sep 17 00:00:00 2001 From: Nathan Biller Date: Wed, 25 Sep 2019 09:35:43 -0400 Subject: [PATCH 3/6] Decreased the vh a bit more so that the medium version had a space between the text and the image. --- assets/fresh/partials/_sections.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/fresh/partials/_sections.scss b/assets/fresh/partials/_sections.scss index 80f3197..75808eb 100644 --- a/assets/fresh/partials/_sections.scss +++ b/assets/fresh/partials/_sections.scss @@ -61,7 +61,7 @@ Section Styles //Pulled image img.pushed-image { - margin-top: -8vh; + margin-top: -5vh; } //Icon box From 89a923f7b6aeec39acf45a2135cc6ba2faeabd9b Mon Sep 17 00:00:00 2001 From: StefMa Date: Wed, 2 Oct 2019 10:42:50 +0200 Subject: [PATCH 4/6] Update now on CI --- .circleci/config.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index acb4db1..0a39470 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,13 +75,8 @@ jobs: - run: name: Install now CLI command: | - apk add wget - wget -q https://github.com/zeit/now-cli/releases/download/15.4.0/now-alpine.gz - apk add gzip - gunzip now-alpine.gz - chmod a+x now-alpine - mv now-alpine /usr/local/bin/now - apk add libstdc++ libgcc + apk add --update npm + npm install -g now@16.3.0 - run: name: Publish to now.sh working_directory: my-site/public From 7ac03f2f5b9d988340cddea52d9ab10340c4d0f6 Mon Sep 17 00:00:00 2001 From: StefMa Date: Wed, 2 Oct 2019 10:46:44 +0200 Subject: [PATCH 5/6] Set some stuff See https://stackoverflow.com/a/52196681: --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a39470..a032734 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,6 +76,7 @@ jobs: name: Install now CLI command: | apk add --update npm + npm config set unsafe-perm true npm install -g now@16.3.0 - run: name: Publish to now.sh From e035ff287bbfe86bf5c1dd9194fd3e341f82321b Mon Sep 17 00:00:00 2001 From: StefMa Date: Fri, 4 Oct 2019 11:25:30 +0200 Subject: [PATCH 6/6] Update alpine --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a032734..7102bbd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: alpine:3.9.2 + - image: alpine:3.10.2 steps: - run: