From 024ceab0809100599013bc8e612f3c51cc616361 Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Tue, 14 Nov 2017 14:18:05 -0500
Subject: [PATCH] ISTWCMS-2287: using colour variables for UW colours
---
.../{social-media.scss => _social-media.scss} | 14 +++++++-------
...ooter-menu.scss => _global-footer-menu.scss} | 4 ++--
...eader-menu.scss => _global-header-menu.scss} | 4 ++--
.../{search-button.scss => _search-button.scss} | 6 +++---
.../02-molecules/uw-logo/_uw-logo.scss | 2 +-
.../site/site-footer/_site-footer.scss | 17 +++--------------
.../site/site-header/_site-header.scss | 6 +++---
7 files changed, 21 insertions(+), 32 deletions(-)
rename components/_patterns/01-atoms/09-menu/social-media/{social-media.scss => _social-media.scss} (78%)
rename components/_patterns/02-molecules/menus/global-footer-menu/{global-footer-menu.scss => _global-footer-menu.scss} (92%)
rename components/_patterns/02-molecules/menus/global-header-menu/{global-header-menu.scss => _global-header-menu.scss} (90%)
rename components/_patterns/02-molecules/search-button/{search-button.scss => _search-button.scss} (85%)
diff --git a/components/_patterns/01-atoms/09-menu/social-media/social-media.scss b/components/_patterns/01-atoms/09-menu/social-media/_social-media.scss
similarity index 78%
rename from components/_patterns/01-atoms/09-menu/social-media/social-media.scss
rename to components/_patterns/01-atoms/09-menu/social-media/_social-media.scss
index 24b6fce4..5d9f616e 100644
--- a/components/_patterns/01-atoms/09-menu/social-media/social-media.scss
+++ b/components/_patterns/01-atoms/09-menu/social-media/_social-media.scss
@@ -27,12 +27,12 @@ i.social-media-i {
font-size: 2.02729rem;
border-radius: 3px;
color: #000;
- background-color: #fff;
+ background-color: $uw-white;
}
i.social-media-i:hover {
- color: #ffd54f;
- background-color: black;
+ color: $uw-gold;
+ background-color: $uw-black;
transition-property: color, background-color;
transition-duration: 0.2s;
transition-delay: 0s;
@@ -41,17 +41,17 @@ i.social-media-i:hover {
a.social-media-link {
color: black;
text-decoration: none;
- background-color: white;
+ background-color: $uw-white;
}
a.social-media-link:hover {
- color: #ffd54f;
+ color: $uw-gold;
text-decoration: none;
- background-color: black;
+ background-color: $uw-black;
}
li.social-media-list-item {
list-style-type: none;
- background-color: black;
+ background-color: $uw-black;
margin: 0;
}
diff --git a/components/_patterns/02-molecules/menus/global-footer-menu/global-footer-menu.scss b/components/_patterns/02-molecules/menus/global-footer-menu/_global-footer-menu.scss
similarity index 92%
rename from components/_patterns/02-molecules/menus/global-footer-menu/global-footer-menu.scss
rename to components/_patterns/02-molecules/menus/global-footer-menu/_global-footer-menu.scss
index 8048f04a..6d493d0a 100644
--- a/components/_patterns/02-molecules/menus/global-footer-menu/global-footer-menu.scss
+++ b/components/_patterns/02-molecules/menus/global-footer-menu/_global-footer-menu.scss
@@ -1,5 +1,5 @@
.uw-footer {
- background-color: black;
+ background-color: $uw-black;
font-family: "BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif;
}
@@ -28,7 +28,7 @@
.global-footer-menu li a {
color: #fff;
- text-decoration: white;
+ text-decoration: $uw-white;
padding: 0;
display: block;
text-transform: uppercase;
diff --git a/components/_patterns/02-molecules/menus/global-header-menu/global-header-menu.scss b/components/_patterns/02-molecules/menus/global-header-menu/_global-header-menu.scss
similarity index 90%
rename from components/_patterns/02-molecules/menus/global-header-menu/global-header-menu.scss
rename to components/_patterns/02-molecules/menus/global-header-menu/_global-header-menu.scss
index d0226633..d59dd113 100644
--- a/components/_patterns/02-molecules/menus/global-header-menu/global-header-menu.scss
+++ b/components/_patterns/02-molecules/menus/global-header-menu/_global-header-menu.scss
@@ -1,7 +1,7 @@
.global-menu {
display: block;
text-align: center;
- background-color: black;
+ background-color: $uw-black;
font-family: "BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif;
text-transform: uppercase;
letter-spacing: 0.045rem;
@@ -17,7 +17,7 @@
}
.global-menu li a {
- color: #fff;
+ color: $uw-gold;
text-decoration: none;
}
diff --git a/components/_patterns/02-molecules/search-button/search-button.scss b/components/_patterns/02-molecules/search-button/_search-button.scss
similarity index 85%
rename from components/_patterns/02-molecules/search-button/search-button.scss
rename to components/_patterns/02-molecules/search-button/_search-button.scss
index 755596a3..02c46467 100644
--- a/components/_patterns/02-molecules/search-button/search-button.scss
+++ b/components/_patterns/02-molecules/search-button/_search-button.scss
@@ -1,5 +1,5 @@
#uw-header-search-button {
- background-color: black;
+ background-color: $uw-black;
}
.uw-header--buttons {
@@ -7,7 +7,7 @@
display: block;
width: 100%;
height: 100%;
- background-color: black;
+ background-color: $uw-black;
}
.uw-header--buttons__search {
@@ -23,7 +23,7 @@ a.search-button {
}
a.search-button:hover {
- color: #fdd54f;
+ color: $uw-gold;
}
.fdsu-search-2::before {
diff --git a/components/_patterns/02-molecules/uw-logo/_uw-logo.scss b/components/_patterns/02-molecules/uw-logo/_uw-logo.scss
index 7963859c..3b1b610f 100644
--- a/components/_patterns/02-molecules/uw-logo/_uw-logo.scss
+++ b/components/_patterns/02-molecules/uw-logo/_uw-logo.scss
@@ -1,5 +1,5 @@
.uw-logo-wrapper {
- background-color: black;
+ background-color: $uw-black;
}
.uw-logo {
diff --git a/components/_patterns/03-organisms/site/site-footer/_site-footer.scss b/components/_patterns/03-organisms/site/site-footer/_site-footer.scss
index 463fdea4..73a22b9c 100644
--- a/components/_patterns/03-organisms/site/site-footer/_site-footer.scss
+++ b/components/_patterns/03-organisms/site/site-footer/_site-footer.scss
@@ -1,20 +1,9 @@
footer {
- background-color: #000;
+ background-color: $uw-black;
border: none;
padding: 0;
margin-top: 0;
- clear: both;
- position: relative;
-}
-
-footer {
- background-color: $uw-black;
-}
-
-footer .uw-section--inner {
- max-width: 63.125rem;
- margin-left: auto;
- margin-right: auto;
+ width: 100%;
}
.uw-footer-grid {
@@ -23,7 +12,7 @@ footer .uw-section--inner {
margin-right: auto;
display: grid;
grid-template-columns: auto auto auto;
- grid-template-rows: auto auto auto;
+ grid-template-rows: auto;
}
.uw-footer-grid .footer-1 {
diff --git a/components/_patterns/03-organisms/site/site-header/_site-header.scss b/components/_patterns/03-organisms/site/site-header/_site-header.scss
index b4b152de..9d060d54 100644
--- a/components/_patterns/03-organisms/site/site-header/_site-header.scss
+++ b/components/_patterns/03-organisms/site/site-header/_site-header.scss
@@ -1,12 +1,12 @@
.header {
width: 100%;
- background-color: black;
+ background-color: $uw-black;
padding-top: 0.5rem;
}
#uw-header {
position: relative;
- background-color: #000;
+ background-color: $uw-black;
max-width: 63.125rem;
margin-left: auto;
margin-right: auto;
@@ -48,7 +48,7 @@
}
.uw-header--logo {
- background-color: black;
+ background-color: $uw-black;
}
.uw-header-content ul {
--
GitLab