From 70753a0f49dc70aec38f1e0a080a1944b4339304 Mon Sep 17 00:00:00 2001 From: Jessica Cheng <31293603+JessicaLucindaCheng@users.noreply.github.com> Date: Tue, 8 Feb 2022 18:34:27 -0800 Subject: [PATCH 1/2] Revert "Removed comments unrelated to pr 2672 from variables/_layout.scss (#2724)" This reverts commit 3bc8d503e2d0a19b3a27b8a8196db2309088ea8a. --- _sass/variables/_layout.scss | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/_sass/variables/_layout.scss b/_sass/variables/_layout.scss index 5a63eb6b50..91ce219c4f 100644 --- a/_sass/variables/_layout.scss +++ b/_sass/variables/_layout.scss @@ -12,16 +12,24 @@ $screen-mobile: 480px; * Breakpoint Start and End Declaration * * These are generally used for declaring media queries. - * As an example, if a developer wants to make a media query for - * anything above a tablet, use the variable $bp-tablet-up. For + * As an example, if a developer wants to make a media query for + * anything above a tablet, use the variable $bp-tablet-up. For * anything below a tablet, use $bp-below-tablet. */ + +// Desktop Large $bp-desktop-large-up: '(min-width: #{$screen-desktop-large})'; $bp-below-desktop-large: '(max-width: #{$screen-desktop-large - 1})'; + +// Desktop $bp-desktop-up: '(min-width: #{$screen-desktop})'; $bp-below-desktop: '(max-width: #{$screen-desktop - 1})'; + +// Tablets $bp-tablet-up: '(min-width: #{$screen-tablet})'; $bp-below-tablet: '(max-width: #{$screen-tablet - 1})'; + +// Mobile $bp-mobile-up: '(min-width: #{$screen-mobile})'; $bp-below-mobile: '(max-width: #{$screen-mobile - 1})'; From a26694cf0e421f3576c3f03358b955ce59b602c0 Mon Sep 17 00:00:00 2001 From: Jessica Cheng <31293603+JessicaLucindaCheng@users.noreply.github.com> Date: Tue, 8 Feb 2022 18:34:32 -0800 Subject: [PATCH 2/2] Revert "Update tech dropdown 2397 (#2672)" This reverts commit 9b97a8b7a7ba78c2506df858db3c11b86857bf3f. --- _sass/components/_project-filter.scss | 35 +++------------------------ _sass/variables/_layout.scss | 12 ++------- 2 files changed, 5 insertions(+), 42 deletions(-) diff --git a/_sass/components/_project-filter.scss b/_sass/components/_project-filter.scss index bc05de9a27..165ee6984e 100644 --- a/_sass/components/_project-filter.scss +++ b/_sass/components/_project-filter.scss @@ -7,9 +7,10 @@ a.filter-item { //filter container ul.filter-list { background: $color-pink; - padding-left: 0; - list-style: none; display: grid; + list-style: none; + padding-left: 0; + grid-auto-flow: column; grid-column-gap: 20px; // grid-template-columns: repeat(4, 1fr); // ^ See issue #1997 for more info on why this is commented out and changed to 3 @@ -164,36 +165,6 @@ a.clear-filter-tags { ul.filter-list li ul { width: 105%; padding: 15px; - overflow: auto; - } -} -// tablet down -@media #{$bp-below-tablet} { - #technologies { - height: 370px; - overflow: auto; - } -} - -// tablet up -@media #{$bp-tablet-up} { - #technologies { - display: grid; - grid-auto-flow: column; // flows the data from top to bottom rather than left to right - grid-template-rows: repeat(16, 1fr); // ensures the list is 16 rows - list-style: none; - left: -17em; - width: 718px; - height: 380px; - overflow: auto; - } -} - -// iPad Air to Desktop -@media #{$bp-desktop-up} { - #technologies { - left: -18em; - width: 768px; } } diff --git a/_sass/variables/_layout.scss b/_sass/variables/_layout.scss index 91ce219c4f..5a63eb6b50 100644 --- a/_sass/variables/_layout.scss +++ b/_sass/variables/_layout.scss @@ -12,24 +12,16 @@ $screen-mobile: 480px; * Breakpoint Start and End Declaration * * These are generally used for declaring media queries. - * As an example, if a developer wants to make a media query for - * anything above a tablet, use the variable $bp-tablet-up. For + * As an example, if a developer wants to make a media query for + * anything above a tablet, use the variable $bp-tablet-up. For * anything below a tablet, use $bp-below-tablet. */ - -// Desktop Large $bp-desktop-large-up: '(min-width: #{$screen-desktop-large})'; $bp-below-desktop-large: '(max-width: #{$screen-desktop-large - 1})'; - -// Desktop $bp-desktop-up: '(min-width: #{$screen-desktop})'; $bp-below-desktop: '(max-width: #{$screen-desktop - 1})'; - -// Tablets $bp-tablet-up: '(min-width: #{$screen-tablet})'; $bp-below-tablet: '(max-width: #{$screen-tablet - 1})'; - -// Mobile $bp-mobile-up: '(min-width: #{$screen-mobile})'; $bp-below-mobile: '(max-width: #{$screen-mobile - 1})';