From 91e80704ab458be827c2d5841219118d0ad9df28 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Tue, 19 Oct 2021 17:57:32 +0000
Subject: [PATCH] ISTWCMS-5035: additional css for catalog search and landing
page
---
js/component_scripts.min.js | 34 +++++++++----------
.../00-config/_design-tokens.artifact.scss | 2 +-
source/_patterns/04-components/card/card.twig | 5 +--
.../04-components/catalog/_catalog.scss | 9 ++++-
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/js/component_scripts.min.js b/js/component_scripts.min.js
index df96c54e..3e2c99ea 100644
--- a/js/component_scripts.min.js
+++ b/js/component_scripts.min.js
@@ -1,3 +1,20 @@
+/**
+ * @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
*/
@@ -373,23 +390,6 @@ 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 d2ef2e77..8e7f094b 100644
--- a/source/_patterns/00-config/_design-tokens.artifact.scss
+++ b/source/_patterns/00-config/_design-tokens.artifact.scss
@@ -503,4 +503,4 @@ $gesso: (
xxl: 96px,
),
gutter-width: 40px,
-);
+);
\ No newline at end of file
diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig
index a325aa84..f6b4f3db 100644
--- a/source/_patterns/04-components/card/card.twig
+++ b/source/_patterns/04-components/card/card.twig
@@ -147,7 +147,8 @@
{% block details_content %}
{% if link_profile %}
- <div class="card__link-profile">Link to Profile:<br />
+ <div class="card__link-profile">
+ <span class="uw-label">Link to Profile:</span>
<a href="{{ link_profile.uri }}">{{ link_profile.title }}</a>
</div>
{% endif %}
@@ -301,7 +302,7 @@
{% block details_content %}
{% for key, tag in catalog_tags %}
<div class="card__catalog-tags card__tags-{{ key }}">
- <strong>{{ key }}:</strong><br />
+ <span class="uw-label">{{ key }}:</span>
{% include "@components/tag-list/tag-list.twig" with {
items: tag
} %}
diff --git a/source/_patterns/04-components/catalog/_catalog.scss b/source/_patterns/04-components/catalog/_catalog.scss
index 6d27dd1f..e3f7cc27 100644
--- a/source/_patterns/04-components/catalog/_catalog.scss
+++ b/source/_patterns/04-components/catalog/_catalog.scss
@@ -40,6 +40,7 @@
}
h2{
font-size: gesso-font-size(3);
+ margin: gesso-spacing(md) 0 gesso-spacing(xs) 0;
span{
font-family:gesso-font-family(primary);
font-size: gesso-font-size(0);
@@ -86,6 +87,7 @@
}
h2{
font-size: gesso-font-size(3);
+ margin: gesso-spacing(md) 0 gesso-spacing(xs) 0;
span{
font-family:gesso-font-family(primary);
font-size: gesso-font-size(0);
@@ -93,7 +95,12 @@
font-size: gesso-font-size(1);
}
}
-
+ }
+ .views-field-title{
+ @extend %hN;
+ @include display-text-style(h2);
+ font-size: gesso-font-size(3);
+ margin: gesso-spacing(md) 0 gesso-spacing(xs) 0;
}
}
}
--
GitLab