diff --git a/src/patterns/01-core/elements/_details.scss b/src/patterns/01-core/elements/_details.scss index ad997fbdde72a0d19031257cbd0007c1269f2428..b4f60b319db68eca02cc04774e50fd3581fb1ac9 100644 --- a/src/patterns/01-core/elements/_details.scss +++ b/src/patterns/01-core/elements/_details.scss @@ -8,7 +8,6 @@ :where(details) { @include uw-no-breakout(); - @include svg-background(mobile-arrow-down); background: var(--gray-2); border: var(--size-xs) solid #bfbfbf; border-bottom:var(--size-xs) solid var(--uw-black-primary); @@ -52,10 +51,10 @@ :where(summary) { @include uw-no-breakout(); @include svg-background(mobile-arrow-down); - background: var(--gray-2); + background-color: var(--gray-2); background-position: right var(--size-2) center; // LTR background-repeat: no-repeat; - background-size: rem(13px); + background-size: 13px; border-radius: var(--radius-1); color: var(--uw-black-primary); cursor: pointer; diff --git a/src/patterns/01-core/mixins/_svg-background.scss b/src/patterns/01-core/mixins/_svg-background.scss index 51016d0a92c1acafbac5d80a83485241a7beaff2..ddd14d05fa331531b0913272ae4770d4e0ef5b31 100644 --- a/src/patterns/01-core/mixins/_svg-background.scss +++ b/src/patterns/01-core/mixins/_svg-background.scss @@ -1,22 +1,16 @@ // @file // SVG background image Mixin - -@mixin svg-background($path) { - background-image: url($path), linear-gradient(transparent, transparent); +@mixin svg-background($image-name, $image-location: '../images/') { + background-image: url($image-location + $image-name + '.svg'), linear-gradient(transparent, transparent); background-repeat: no-repeat; - background-size: 100%; - display: inline-block; + //background-size: 100%; + //display: inline-block; } - -//@mixin svg-background($image-name, $image-location: '../source/images/icons/') { -// background-image: url($image-location + $image-name + '.svg'); -//} -// -//@mixin svg-background-color($image-color, $image-name, $image-location: '../source/images/icons/') { -// background-color: $image-color; -// -webkit-mask: url($image-location + $image-name + '.svg') no-repeat; -// mask: url($image-location + $image-name + '.svg') no-repeat; -// -webkit-mask-size: contain; -// mask-size: contain; -//} +@mixin svg-background-color($image-color, $image-name, $image-location: '../images/') { + background-color: $image-color; + -webkit-mask: url($image-location + $image-name + '.svg') no-repeat; + mask: url($image-location + $image-name + '.svg') no-repeat; + -webkit-mask-size: contain; + mask-size: contain; +} diff --git a/src/patterns/03-layouts/footer/footer.twig b/src/patterns/03-layouts/footer/footer.twig index 141a903069a47e0ff67f5a5100a042de5d708fe5..bba7daf32358d0fb579f753d847df1b832e20b74 100644 --- a/src/patterns/03-layouts/footer/footer.twig +++ b/src/patterns/03-layouts/footer/footer.twig @@ -5,7 +5,7 @@ body: "The standard Lorem Ipsum passage, used since the 1500s<br /><br />Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", site_name: "Faculty of Environment", logo_link: "https://uwaterloo.ca/", - logo_url: "/uw_wcms_gesso/source/images/logos/uwaterloo-logo.svg", + logo_url: "/images/uwaterloo-logo.svg", logo_alt_text: "Faculty of Environment", facebook: "https://www.facebook.com/University.Waterloo" } %} diff --git a/src/patterns/03-layouts/site-footer/site-footer.yml b/src/patterns/03-layouts/site-footer/site-footer.yml index 96b1ebbdb3a351425c8ac40dc6a7c715235e8d04..54ae89b025f038fbe9101380060a2edafebc24fc 100644 --- a/src/patterns/03-layouts/site-footer/site-footer.yml +++ b/src/patterns/03-layouts/site-footer/site-footer.yml @@ -1,7 +1,7 @@ body: "The standard Lorem Ipsum passage, used since the 1500s<br /><br />Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." site_name: "Faculty of Environment" logo_link: "https://uwaterloo.ca" -logo_url: "/uw_wcms_gesso/source/images/logos/uwaterloo-logo.svg" +logo_url: "/images/uwaterloo-logo.svg" logo_alt_text: "Faculty of Health logo" home_link : "#" facebook: "https://www.facebook.com/University.Waterloo"