Skip to content

Commit

Permalink
♻️ Fix website format on smaller screens (#89)
Browse files Browse the repository at this point in the history
<!-- describe the change, why is it needed and what does it accomplish
as per https://ssw.com.au/rules/write-a-good-pull-request/ -->

As per conversation with @tiagov8, the format of the website on smaller
screens was a bit wonky:
1. On mobile, make sure the images are centralized
2. On mobile, make the gap between related text and image to be smaller;
and the gap between different sections to be bigger (so user can clearly
see what image is related to what text)

<!-- Add done video, screenshots as per
https://ssw.com.au/rules/record-a-quick-and-dirty-done-video/-->
<img width="732" alt="image"
src="https://github.com/SSWConsulting/SSW.Dory/assets/41951199/34cba928-28ef-4865-8f50-dd90137d918b">\
**Figure: Image is centralized**

<img width="362" alt="image"
src="https://github.com/SSWConsulting/SSW.Dory/assets/41951199/b374b2bc-d10a-41db-94b7-4253b323678a">\
**Figure: Gap between related text and image smaller; gap between
different sections larger**

<!-- As per rule https://www.ssw.com.au/rules/over-the-shoulder-prs -->
<!-- Getting the PR merged is part of the task - Call someone to review
your changes to get them merged ASAP -->
  • Loading branch information
leahy268 authored Nov 14, 2023
2 parents 507d728 + fd1693d commit bdad01d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
uses: ./.github/workflows/deploy.yml
with:
environment: staging
url: https://staging.sswdory.com
secrets: inherit
needs: build-site

Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
description: "Name of the environment to deploy to"
required: true
type: string
url:
description: "URL of the site"
required: false
type: string

permissions:
id-token: write
Expand All @@ -20,7 +24,9 @@ defaults:
jobs:
deploy-bicep:
runs-on: ubuntu-latest
environment: ${{ inputs.environment }}
environment:
name: ${{ inputs.environment }}
url: ${{ inputs.url }}
outputs:
storageName: ${{steps.deploy-bicep.outputs.websiteStorageAccountName}}
env:
Expand Down
8 changes: 4 additions & 4 deletions content/src/app/marketingCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function MarketingCardText({ title, description }: MarketingCardTextProps) {
<h2 className="title-font leading-tight sm:text-4xl text-3xl mb-4 font-medium text-gray-900">
{title}
</h2>
<h3 className="mb-8 leading-relaxed max-w-xl">{description}</h3>
<h3 className="leading-relaxed max-w-xl">{description}</h3>
</div>
);
}
Expand All @@ -49,15 +49,15 @@ export default function MarketingCard({
}: MarketingCardProps) {
return (
<section className="text-gray-700 body-font">
<div className="container mx-auto flex px-5 py-10 md:flex-row flex-col items-center">
<div className="mr-8 md:w-1/2 mb-10 md:mb-0">
<div className="container mx-auto mb-32 md:mb-0 flex px-5 py-10 md:flex-row flex-col items-center">
<div className="md:mr-8 md:w-1/2 md:mb-0 mb-10">
{reverse ? (
<MarketingCardImage imgURL={imgURL} />
) : (
<MarketingCardText title={title} description={description} />
)}
</div>
<div className="md:w-1/2 w-5/6 mb-10 md:mb-0">
<div className="md:w-1/2 w-5/6 md:mb-0">
{reverse ? (
<MarketingCardText title={title} description={description} />
) : (
Expand Down
2 changes: 1 addition & 1 deletion content/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Home() {
</nav>
<div className="container mx-auto">
<section className="text-gray-700 body-font">
<div className="container mx-auto flex px-5 py-20 items-center justify-center flex-col">
<div className="container mx-auto mb-32 md:mb-0 flex px-5 py-10 items-center justify-center flex-col">
<div className="text-center lg:w-2/3 w-full">
<h1 className="title-font leading-tight sm:text-5xl text-4xl mb-10 font-semibold text-gray-900">
Check out our Github
Expand Down

0 comments on commit bdad01d

Please sign in to comment.