From efb538ac0ac4b70e590dff3c527240570fdba021 Mon Sep 17 00:00:00 2001 From: EdASalazar Date: Thu, 4 May 2023 23:46:17 -0700 Subject: [PATCH 1/4] updated _about.scss --- _sass/components/_about.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_sass/components/_about.scss b/_sass/components/_about.scss index cbf5f38a79..84b9ce0d2c 100644 --- a/_sass/components/_about.scss +++ b/_sass/components/_about.scss @@ -42,6 +42,14 @@ align-content: space-between; } +// Grid displayed differently in Chrome and Firefox +// Defining image height fixes the issue in Firefox + +.grid-2-column > img { + height: 140px; + width: auto +} + // Makes the sticky navigation stick .stick-it { position: fixed; From faa9e85098607f839fd328f4d8f74cf1ef3c78c1 Mon Sep 17 00:00:00 2001 From: EdASalazar Date: Fri, 5 May 2023 00:01:42 -0700 Subject: [PATCH 2/4] deleted unecessary line --- _sass/components/_about.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/_sass/components/_about.scss b/_sass/components/_about.scss index 84b9ce0d2c..d825462af5 100644 --- a/_sass/components/_about.scss +++ b/_sass/components/_about.scss @@ -44,7 +44,6 @@ // Grid displayed differently in Chrome and Firefox // Defining image height fixes the issue in Firefox - .grid-2-column > img { height: 140px; width: auto From 169d526d8c8f6ff111c964b5b130602ae40980d2 Mon Sep 17 00:00:00 2001 From: EdASalazar Date: Tue, 9 May 2023 19:52:04 -0700 Subject: [PATCH 3/4] Updated pull request --- _sass/components/_about.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/_sass/components/_about.scss b/_sass/components/_about.scss index d825462af5..08cbdb8b68 100644 --- a/_sass/components/_about.scss +++ b/_sass/components/_about.scss @@ -38,15 +38,13 @@ grid-template-rows: repeat(4, 1fr); column-gap: 10px; row-gap: 26px; - justify-items: stretch; - align-content: space-between; } // Grid displayed differently in Chrome and Firefox // Defining image height fixes the issue in Firefox .grid-2-column > img { - height: 140px; - width: auto + height: 100%; + max-width: 100%; } // Makes the sticky navigation stick From 715656486ea799ce03f50cf5461564d155b93c39 Mon Sep 17 00:00:00 2001 From: EdASalazar Date: Sat, 13 May 2023 00:43:35 -0700 Subject: [PATCH 4/4] Deleted img height and width for .grid-2-column --- _sass/components/_about.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/_sass/components/_about.scss b/_sass/components/_about.scss index 08cbdb8b68..105b4b492c 100644 --- a/_sass/components/_about.scss +++ b/_sass/components/_about.scss @@ -40,13 +40,6 @@ row-gap: 26px; } -// Grid displayed differently in Chrome and Firefox -// Defining image height fixes the issue in Firefox -.grid-2-column > img { - height: 100%; - max-width: 100%; -} - // Makes the sticky navigation stick .stick-it { position: fixed;