diff --git a/css/styles.css b/css/styles.css index 8927b07f1542823c4053fb3e50d1331015aac3f2..a43258662a9cda9cc91a3a73cc4d81782e8e76af 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 6939cbb6eb72d9cea8cab90d4ccf2bdd5dba077d..bcc0831f754d85c7478248ca37f27ea173313fab 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 676c0225c5478a1db2b562179c10bda4efa8416f..1249577cb3c4c884c2c8bdae2d0f4d50f1b162ac 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 8cda240d26ba573cfd1fbbd0160de36251de4438..81347b6babd644dbaa53a4bcf427040ec410903c 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 80caa5b762a01fb84ca6e927f3b27326e67aadaf..97ac554b612f21c8eda3dc75b4b0b4c2d6433aeb 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 214a804fda8a37aad90b814e81cddc0733c33251..fcde787c6031dd803d98542396ba7b30e65366b1 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: '#'