From 2a017d9e8ee35fc7a8d0a49f754479c83e0df9ec Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Tue, 8 Jun 2021 18:49:32 +0000
Subject: [PATCH] additional css to remove the overlay:hidden for filters
columns
---
css/styles.css | 8 +++++
js/component_scripts.min.js | 34 +++++++++----------
.../00-config/_design-tokens.artifact.scss | 2 +-
.../_patterns/04-components/card/_card.scss | 10 ++++++
.../_patterns/04-components/view/_view.scss | 1 +
source/_patterns/05-templates/termpage.yml | 13 -------
6 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/css/styles.css b/css/styles.css
index 8927b07f..a4325866 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -3580,6 +3580,13 @@ button {
display: block;
height: 100%;
width: 100%; }
+ .card__media a:focus img {
+ -webkit-filter: grayscale(100%);
+ filter: grayscale(100%);
+ opacity: 0.6;
+ transition: opacity 150ms cubic-bezier(0.4, 0, 1, 1), -webkit-filter;
+ transition: filter, opacity 150ms cubic-bezier(0.4, 0, 1, 1);
+ transition: filter, opacity 150ms cubic-bezier(0.4, 0, 1, 1), -webkit-filter; }
.card__media img {
-webkit-filter: grayscale(0);
filter: grayscale(0);
@@ -8013,6 +8020,7 @@ html:not(.js) .uw-tabcontent[role="tabpanel"][hidden] {
grid-column: 2/3;
height: inherit;
margin: 0;
+ overflow: inherit;
width: 18.75rem; }
.grid .view-filters,
.list .view-filters {
diff --git a/js/component_scripts.min.js b/js/component_scripts.min.js
index 6939cbb6..bcc0831f 100644
--- a/js/component_scripts.min.js
+++ b/js/component_scripts.min.js
@@ -1,20 +1,3 @@
-/**
- * @file
- * Ckeditor Modal.
- */
-
-(function ($, Drupal) {
- if ($.ui && $.ui.dialog) {
- orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
- $.ui.dialog.prototype._allowInteraction = function (event) {
- if ($(event.target).closest('.cke_dialog').length) {
- return true;
- }
- return orig_allowInteraction.apply(this, arguments);
- };
- }
-})(jQuery, Drupal);
-
/**
* @file
*/
@@ -346,6 +329,23 @@ else {
};
})(jQuery);
+/**
+ * @file
+ * Ckeditor Modal.
+ */
+
+(function ($, Drupal) {
+ if ($.ui && $.ui.dialog) {
+ orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
+ $.ui.dialog.prototype._allowInteraction = function (event) {
+ if ($(event.target).closest('.cke_dialog').length) {
+ return true;
+ }
+ return orig_allowInteraction.apply(this, arguments);
+ };
+ }
+})(jQuery, Drupal);
+
/**
* @file
*/
diff --git a/source/_patterns/00-config/_design-tokens.artifact.scss b/source/_patterns/00-config/_design-tokens.artifact.scss
index 676c0225..1249577c 100644
--- a/source/_patterns/00-config/_design-tokens.artifact.scss
+++ b/source/_patterns/00-config/_design-tokens.artifact.scss
@@ -511,4 +511,4 @@ $gesso: (
xxl: 96px,
),
gutter-width: 40px,
-);
+);
\ No newline at end of file
diff --git a/source/_patterns/04-components/card/_card.scss b/source/_patterns/04-components/card/_card.scss
index 8cda240d..81347b6b 100644
--- a/source/_patterns/04-components/card/_card.scss
+++ b/source/_patterns/04-components/card/_card.scss
@@ -93,6 +93,16 @@ $card-padding: rem(gesso-spacing(sm)) !default;
display: block;
height: 100%;
width: 100%;
+ &:focus{
+ img{
+ -webkit-filter: grayscale(100%);
+ filter: grayscale(100%);
+ opacity:0.6;
+ transition:filter ,opacity gesso-duration(shortest) gesso-easing(ease-in);
+ }
+
+
+ }
}
img {
-webkit-filter: grayscale(0);
diff --git a/source/_patterns/04-components/view/_view.scss b/source/_patterns/04-components/view/_view.scss
index 80caa5b7..97ac554b 100644
--- a/source/_patterns/04-components/view/_view.scss
+++ b/source/_patterns/04-components/view/_view.scss
@@ -99,6 +99,7 @@ $sidebar-width: 18.75rem;
grid-column:2/3;
height:inherit;
margin: 0;
+ overflow:inherit;
.grid &,
.list &{
margin-top: 4rem !important;
diff --git a/source/_patterns/05-templates/termpage.yml b/source/_patterns/05-templates/termpage.yml
index 214a804f..fcde787c 100644
--- a/source/_patterns/05-templates/termpage.yml
+++ b/source/_patterns/05-templates/termpage.yml
@@ -558,19 +558,6 @@ footer_menu:
attributes:
class: ''
in_active_trail: false
-social_media:
- menu_tree:
- - text: "Facebook"
- url: "https://www.facebook.com/university.waterloo"
- - text: "Twitter"
- url: "https://twitter.com/uWaterloo"
- - text: "YouTube"
- url: "https://www.youtube.com/user/uwaterloo"
- - text: "Instagram"
- url: "https://www.instagram.com/uofwaterloo/"
- - text: "LinkedIn"
- url: "https://www.linkedin.com/edu/school?id=10875"
-social_media_placement: "global-site-footer"
nav_items:
- text: 'About Psychology'
url: '#'
--
GitLab