From 23447594ce86a453152a891fcde17197dc763c21 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Tue, 8 Jun 2021 18:25:43 +0000
Subject: [PATCH] removing the test colors and run phpcb
---
css/styles.css | 2 -
js/component_scripts.min.js | 38 ++++++++++---------
.../00-config/_design-tokens.artifact.scss | 2 +-
.../04-components/banners/banners.js | 4 ++
.../card/card--banner/card--banner.md | 2 +-
.../04-components/message/_message.scss | 1 -
.../_patterns/04-components/view/_view.scss | 4 +-
7 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/css/styles.css b/css/styles.css
index 4b2bbd1a..dc9b31b9 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -7966,7 +7966,6 @@ html:not(.js) .uw-tabcontent[role="tabpanel"][hidden] {
margin-right: auto;
max-width: 75rem;
padding: 0 16px;
- background: #b9f1c5;
display: grid;
grid-template-columns: 100%;
padding: 1rem;
@@ -7977,7 +7976,6 @@ html:not(.js) .uw-tabcontent[role="tabpanel"][hidden] {
padding-right: 0; } }
@media (min-width: 63.1875rem) {
.view.view-uw-view-contacts, .view.view-uw-view-profiles, .view.view-taxonomy-term, .view.view-uw-view-blogs, .view.view-uw-view-events, .view.view-uw-view-news-items {
- background: #eeaab0;
gap: 1.5rem;
grid-template-columns: auto 18.75rem; }
.view.view-uw-view-contacts .view-header, .view.view-uw-view-profiles .view-header, .view.view-taxonomy-term .view-header, .view.view-uw-view-blogs .view-header, .view.view-uw-view-events .view-header, .view.view-uw-view-news-items .view-header {
diff --git a/js/component_scripts.min.js b/js/component_scripts.min.js
index c787838a..6939cbb6 100644
--- a/js/component_scripts.min.js
+++ b/js/component_scripts.min.js
@@ -1,3 +1,24 @@
+/**
+ * @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
+ */
+
(function ($, Drupal) {
Drupal.behaviors.cardbanner = {
attach: function (context, settings) {
@@ -325,23 +346,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 1249577c..676c0225 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/banners/banners.js b/source/_patterns/04-components/banners/banners.js
index 9e9a9d7c..d7419fb4 100644
--- a/source/_patterns/04-components/banners/banners.js
+++ b/source/_patterns/04-components/banners/banners.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
(function ($, Drupal) {
Drupal.behaviors.cardbanner = {
attach: function (context, settings) {
diff --git a/source/_patterns/04-components/card/card--banner/card--banner.md b/source/_patterns/04-components/card/card--banner/card--banner.md
index 424f8504..b8c0fb1e 100644
--- a/source/_patterns/04-components/card/card--banner/card--banner.md
+++ b/source/_patterns/04-components/card/card--banner/card--banner.md
@@ -15,4 +15,4 @@ __Variables:__
* autoplay [integer] 1 or 0 to turn on autoplay of banners.
* slide_speed [integer] The speed for the transition of banners.
* style [string] The style to be used for the banners.
- * transition_speed [integer] The speed of the transitions between banners.
\ No newline at end of file
+ * transition_speed [integer] The speed of the transitions between banners.
diff --git a/source/_patterns/04-components/message/_message.scss b/source/_patterns/04-components/message/_message.scss
index 528c8d96..6339da82 100644
--- a/source/_patterns/04-components/message/_message.scss
+++ b/source/_patterns/04-components/message/_message.scss
@@ -94,4 +94,3 @@ $message-warning-border-color: gesso-color(ui, warning, border) !default;
@include svg-background(messages-warning);
}
}
-
diff --git a/source/_patterns/04-components/view/_view.scss b/source/_patterns/04-components/view/_view.scss
index d0f87786..80caa5b7 100644
--- a/source/_patterns/04-components/view/_view.scss
+++ b/source/_patterns/04-components/view/_view.scss
@@ -57,7 +57,7 @@ $sidebar-width: 18.75rem;
// View container for newslanding page.
&.view-uw-view-news-items{
@include uw-contained-width;
- background:$test-color-1;
+ //background:$test-color-1;
display: grid;
grid-template-columns: 100%;
padding: rem(gesso-spacing(sm));
@@ -67,7 +67,7 @@ $sidebar-width: 18.75rem;
.view-header{
display:none;
}
- background:$test-color-2;
+ //background:$test-color-2;
gap: 1.5rem;
grid-template-columns: auto $sidebar-width;
}
--
GitLab