commit 96bbf31065b3d7a27816c9344002803619d9e3fc
author Iftekharul Islam <iffy.ryan@ibm.com> Tue Aug 22 13:44:38 2017 -0500
committer Adriana Kobylak <anoo@us.ibm.com> Mon Oct 09 14:13:43 2017 -0500
tree 799b12ed7590c0fe0328ac37aceab45332759617
parent ba556c310594af3daa22bc96abee55af9ce23ab2

Updated master after merge conflicts

Change-Id: Ibea933c20071cc85201420ba1e31fedf9356f55b
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>

app/common/styles/base/mixins.scss

diff --git a/app/common/styles/base/mixins.scss b/app/common/styles/base/mixins.scss
index 79b0f34..6067a0e 100644
--- a/app/common/styles/base/mixins.scss
+++ b/app/common/styles/base/mixins.scss
@@ -36,7 +36,7 @@
 }
 
 @mixin fontCourierBold {
-  font-family: "Courier New", Helvetica, monospace, arial, sans-serif;
+  font-family: "Courier New", Helvetica, arial, sans-serif;
   font-weight: 700;
 }
 

app/common/styles/base/typography.scss

diff --git a/app/common/styles/base/typography.scss b/app/common/styles/base/typography.scss
index 64f5e3c..8dc33c0 100644
--- a/app/common/styles/base/typography.scss
+++ b/app/common/styles/base/typography.scss
@@ -54,4 +54,4 @@
   font-family: "Courier New", Helvetica, arial, sans-serif;
   font-weight: 700;
   margin-bottom: 0;
-}
+}
\ No newline at end of file

app/common/styles/elements/index.scss

diff --git a/app/common/styles/elements/index.scss b/app/common/styles/elements/index.scss
index c9e29d9..677a4ba 100644
--- a/app/common/styles/elements/index.scss
+++ b/app/common/styles/elements/index.scss
@@ -1,15 +1,13 @@
-
 @import "toggle-switch";
 @import "toggle-filter";
 @import "status";
-@import "tags";
 @import "alerts";
 @import "inline-confirm";
 @import "accordion";
 @import "loader";
 @import "content-search";
 @import "paginate";
-@import "thresholds";
+@import "tags";
 @import "export";
 @import "modals";
-@import "quicklinks";
+@import "quicklinks";
\ No newline at end of file