From 82b11d6947c4dbc9cc81271ea22e591467227a4d Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 2 May 2020 12:11:28 +0200
Subject: [PATCH] Ensure join words are not bold
---
.../darkswarm/controllers/products_controller.js.coffee | 2 +-
app/assets/stylesheets/darkswarm/_shop-filters.css.scss | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 4a654cde10..bc72b597c2 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -84,7 +84,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
).join($scope.filtersJoinWord()) if $scope.activeProperties?
$scope.filtersJoinWord = ->
- $sce.trustAsHtml(" #{t('products_or')} ")
+ $sce.trustAsHtml(" #{t('products_or')} ")
$scope.clearAll = ->
$scope.clearQuery()
diff --git a/app/assets/stylesheets/darkswarm/_shop-filters.css.scss b/app/assets/stylesheets/darkswarm/_shop-filters.css.scss
index 7df689719e..7684aff69a 100644
--- a/app/assets/stylesheets/darkswarm/_shop-filters.css.scss
+++ b/app/assets/stylesheets/darkswarm/_shop-filters.css.scss
@@ -148,6 +148,10 @@
&.applied-taxons, &.applied-properties {
color: $clr-blue;
font-weight: bold;
+
+ .join-word {
+ font-weight: normal;
+ }
}
&.applied-search {