Commit 41f3abec authored by Martin Leblanc's avatar Martin Leblanc
Browse files

merging the rebase

parents 9ea3f414 c8b27a86
......@@ -26,6 +26,10 @@ if [[ -d gesso ]]; then
fi
git clone --branch $gesso_version https://git.uwaterloo.ca/drupal-org/gesso.git
if [ "$?" != 0 ]; then
echo "Error: git clone failed"
exit 2;
fi
if [[ $build_option == 1 || $build_option == 3 ]]; then
......@@ -54,6 +58,10 @@ if [[ $build_option == 1 || $build_option == 3 ]]; then
echo "Running npm install ..."
cd gesso
npm install
if [ "$?" != 0 ]; then
echo "Error: npm install failed"
exit 2;
fi
echo "Done npm install."
echo "**************************************************************************************"
echo ""
......@@ -85,6 +93,10 @@ if [[ $build_option == 1 || $build_option == 3 ]]; then
echo "**************************************************************************************"
echo "Running gulp build ..."
gulp build
if [ "$?" != 0 ]; then
echo "Error: gulp build failed"
exit 2;
fi
cd ..
echo "Done running gulp build."
echo "**************************************************************************************"
......
......@@ -111,10 +111,8 @@
.org-ahs .card__title a.pager__link {
color: #000;
}
.org-ahs a.global-site-footer:link,
.org-ahs a.global-site-footer:visited,
.org-ahs a.global-site-footer:active,
.org-ahs .card__title a.global-site-footer:link,
.org-ahs .card__title a.global-site-footer:visited,
.org-ahs .card__title a.global-site-footer:active {
color: #000;
......@@ -230,10 +228,8 @@
.org-art .card__title a.pager__link {
color: #000;
}
.org-art a.global-site-footer:link,
.org-art a.global-site-footer:visited,
.org-art a.global-site-footer:active,
.org-art .card__title a.global-site-footer:link,
.org-art .card__title a.global-site-footer:visited,
.org-art .card__title a.global-site-footer:active {
color: #000;
......@@ -349,10 +345,8 @@
.org-eng .card__title a.pager__link {
color: #000;
}
.org-eng a.global-site-footer:link,
.org-eng a.global-site-footer:visited,
.org-eng a.global-site-footer:active,
.org-eng .card__title a.global-site-footer:link,
.org-eng .card__title a.global-site-footer:visited,
.org-eng .card__title a.global-site-footer:active {
color: #000;
......@@ -468,10 +462,8 @@
.org-env .card__title a.pager__link {
color: #000;
}
.org-env a.global-site-footer:link,
.org-env a.global-site-footer:visited,
.org-env a.global-site-footer:active,
.org-env .card__title a.global-site-footer:link,
.org-env .card__title a.global-site-footer:visited,
.org-env .card__title a.global-site-footer:active {
color: #000;
......@@ -587,10 +579,8 @@
.org-mat .card__title a.pager__link {
color: #000;
}
.org-mat a.global-site-footer:link,
.org-mat a.global-site-footer:visited,
.org-mat a.global-site-footer:active,
.org-mat .card__title a.global-site-footer:link,
.org-mat .card__title a.global-site-footer:visited,
.org-mat .card__title a.global-site-footer:active {
color: #000;
......@@ -706,10 +696,8 @@
.org-sci .card__title a.pager__link {
color: #000;
}
.org-sci a.global-site-footer:link,
.org-sci a.global-site-footer:visited,
.org-sci a.global-site-footer:active,
.org-sci .card__title a.global-site-footer:link,
.org-sci .card__title a.global-site-footer:visited,
.org-sci .card__title a.global-site-footer:active {
color: #000;
......@@ -825,10 +813,8 @@
.org-school .card__title a.pager__link {
color: #000;
}
.org-school a.global-site-footer:link,
.org-school a.global-site-footer:visited,
.org-school a.global-site-footer:active,
.org-school .card__title a.global-site-footer:link,
.org-school .card__title a.global-site-footer:visited,
.org-school .card__title a.global-site-footer:active {
color: #000;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -97,7 +97,6 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
color: $uw-black;
}
&.global-site-footer{
&:link,
&:visited,
&:active{
color: $uw-black;
......
......@@ -4,4 +4,3 @@ details_summary: 'Details summary'
details_description: 'Details description'
details_content: |-
<p>Details content</p>
svg_name: android
\ No newline at end of file
svg_name: android
......@@ -15,4 +15,3 @@ rss_feed: true
feed_icons: false
title_prefix: 'false'
title_suffix: 'false'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment