Merge pull request #9 from AndreasEngelmark/development

Merge prior to deploy on 2022-05-12

Author: AndreasEngelmark

config/sync/language/da/message.template.os2loop_message_comment_ins.yml

@@ -1,5 +1,5 @@
 text:
   -
-    value: 'Der er en ny kommentar på indlægget <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a>'
+    value: 'Der er en ny kommentar på indlægget: <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a>'
     format: os2loop_message_message
 label: 'Kommentar oprettet'

config/sync/language/da/message.template.os2loop_message_comment_upd.yml

@@ -1,5 +1,5 @@
 text:
   -
-    value: 'En kommentar til indlægget <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a> er blevet ændret'
+    value: 'En kommentar til indlægget: <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a> er blevet ændret'
     format: os2loop_message_message
 label: 'Kommentar redigeret'

config/sync/language/da/message.template.os2loop_message_question_upd.yml

@@ -1,5 +1,5 @@
 text:
   -
-    value: 'Et spørgsmål du følger er blevet ændret <a href="/node/[message:os2loop_message_node_refer:entity:nid]">[message:os2loop_message_node_refer:entity:title]</a>'
+    value: 'Et spørgsmål du følger er blevet ændret: <a href="/node/[message:os2loop_message_node_refer:entity:nid]">[message:os2loop_message_node_refer:entity:title]</a>'
     format: os2loop_message_message
 label: 'Spørgsmål redigeret'

config/sync/message.template.os2loop_message_answer_ins.yml

@@ -9,7 +9,7 @@ label: 'Answer added'
 description: ''
 text:
   -
-    value: 'There is a new answer to the question <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a>'
+    value: 'There is a new answer to the question: <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a>'
     format: os2loop_message_message
 settings:
   'token options':

config/sync/message.template.os2loop_message_comment_ins.yml

@@ -9,7 +9,7 @@ label: 'Comment added'
 description: ''
 text:
   -
-    value: 'There is a new comment on the post <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a>'
+    value: 'There is a new comment on the post: <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a>'
     format: os2loop_message_message
 settings:
   'token options':

config/sync/message.template.os2loop_message_comment_upd.yml

@@ -9,7 +9,7 @@ label: 'Comment edited'
 description: ''
 text:
   -
-    value: 'A comment on the post <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a> has been changed'
+    value: 'A comment on the post: <a href="/node/[message:os2loop_message_node_refer:entity:nid]#comment-[message:os2loop_message_comment_refer:target_id]">[message:os2loop_message_node_refer:entity:title]</a> has been changed'
     format: os2loop_message_message
 settings:
   'token options':

config/sync/message.template.os2loop_message_post_upd.yml

@@ -9,7 +9,7 @@ label: 'Post edited'
 description: ''
 text:
   -
-    value: 'A post you follow has been changed <a href="/node/[message:os2loop_message_node_refer:entity:nid]">[message:os2loop_message_node_refer:entity:title]</a>'
+    value: 'A post you follow has been changed: <a href="/node/[message:os2loop_message_node_refer:entity:nid]">[message:os2loop_message_node_refer:entity:title]</a>'
     format: os2loop_message_message
 settings:
   'token options':

config/sync/message.template.os2loop_message_question_upd.yml

@@ -9,7 +9,7 @@ label: 'Question edited'
 description: ''
 text:
   -
-    value: 'A question you follow has been changed <a href="/node/[message:os2loop_message_node_refer:entity:nid]">[message:os2loop_message_node_refer:entity:title]</a>'
+    value: 'A question you follow has been changed: <a href="/node/[message:os2loop_message_node_refer:entity:nid]">[message:os2loop_message_node_refer:entity:title]</a>'
     format: os2loop_message_message
 settings:
   'token options':

web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss

@@ -12,9 +12,7 @@
 // Components
 @import "mixins.scss";
 @import "helper-classes.scss";
-@import "comment.scss";
 @import "teasers.scss";
-@import "documents.scss";
 @import "fields.scss";
 @import "icons.scss";
 @import "navbar.scss";

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/badge/badge.scss

@@ -1,24 +1,13 @@
 @import "../../signifly-variables/colors.scss";
 
 $content-types-colors: (
-	"os2loop-documents-collection": $tag-blue,
-	"os2loop-documents-document": $tag-green,
-	"os2loop-post": $tag-purple,
-	"os2loop-question": $tag-orange,
+	"collection": $tag-blue,
+	"document": $tag-green,
+	"post": $tag-purple,
+	"question": $tag-orange,
 );
 
 .badge {
-	// TODO: Figure out why this is overridden by standard settings...
-	margin-right: 15px;
-
-	&.user-profile-badge-container {
-		margin-right: 10px;
-
-		&:last-child {
-			margin-right: 0px;
-		}
-	}
-
 	&.badge-primary {
 		color: $loop-green;
 		background-color: $loop-green-200;