Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

Zego case study #758

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ jobs:
# public
# functions
# - name: Setup Chrome
# uses: browser-actions/setup-chrome@v0.0.0
# uses: browser-actions/setup-chrome@v1.0.1
# - name: Lighthouse CI
# run: yarn lhci autorun
# env:
Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
public
functions
- name: Setup Chrome
uses: browser-actions/setup-chrome@v0.0.0
uses: browser-actions/setup-chrome@v1.0.1
- name: Testcafe
run: yarn run test:e2e:ui
- name: Upload artifacts
Expand All @@ -270,7 +270,7 @@ jobs:
# DEPLOY #
###############################################################################
deploy:
needs: [testcafe, e2e-lambda, stylelint, eslint, test]
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Get branch
uses: rlespinasse/[email protected]
- name: Remove GitHub deployment
uses: bobheadxi/deployments@v1.3.0
uses: bobheadxi/deployments@v1.4.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
step: delete-env
Expand Down
2 changes: 1 addition & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ const configs = {
options: {
spaceId: CONTENTFUL_SPACE,
accessToken: CONTENTFUL_TOKEN,
environment: 'master',
environment: 'zego',
},
},
'gatsby-source-lever': {
Expand Down
26 changes: 18 additions & 8 deletions src/components/Common/CaseStudyCards/CaseStudyBlocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,24 @@ const TextAndImageBlock = ({
colWidthTwo = [1, 1, 1, 1, 1 / 2],
middleColWidth = null,
colorReverse = false,
}) => (
<>
<Col width={colWidthOne}>{renderText({ text, colorReverse })}</Col>
{text && image && <StyledBreakpointMobilePadding width={[1]} />}
{middleColWidth && <Col width={middleColWidth} />}
<Col width={colWidthTwo}>{renderImage(image)}</Col>
</>
);
reverseOrder = false,
}) => {
const imgEl = renderImage(image);
const txtEl = renderText({ text, colorReverse });

return (
<>
<Col width={reverseOrder ? colWidthTwo : colWidthOne}>
{reverseOrder ? imgEl : txtEl}
</Col>
{text && image && <StyledBreakpointMobilePadding width={[1]} />}
{middleColWidth && <Col width={middleColWidth} />}
<Col width={reverseOrder ? colWidthOne : colWidthTwo}>
{reverseOrder ? txtEl : imgEl}
</Col>
</>
);
};

const TextAndResizedImageBlock = ({ data: { text, image } }) => (
<>
Expand Down
Loading