Merge pull request #7 from AndreasEngelmark/development

Merge prior to deploy on 2022-05-05

Author: AndreasEngelmark

web/profiles/custom/os2loop/modules/os2loop_subscriptions/templates/os2loop-subscriptions-user.html.twig

@@ -4,12 +4,12 @@
  * Display lists of user subscriptions.
  */
 #}
-<h2 class="h4 mt-3 mt-md-5">{{ 'Content subscriptions'|t }}</h2>
-<div class="mb-3 mb-md-5">
+<h2 class="h4 my-30">{{ 'Content subscriptions'|t }}</h2>
+<div class="os2loop-subscriptions-node mb-30">
   {{ drupal_view('os2loop_subscriptions_node', 'block_1') }}
 </div>
 
-<h2 class="h4">{{ 'Taxonomy term subscriptions'|t }}</h2>
-<div class="mb-3 mb-md-5">
+<h2 class="h4 my-30">{{ 'Taxonomy term subscriptions'|t }}</h2>
+<div class="os2loop-subscription-term">
   {{ drupal_view('os2loop_subscription_term', 'block_1') }}
 </div>

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

@@ -12,5 +12,6 @@
 @import "pagination/pagination.scss";
 @import "form-control/form-control.scss";
 @import "form-check/form-check-custom.scss";
+@import "list-group/list-group-item.scss";
 
 @import "~bootstrap/scss/bootstrap.scss";

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/list-group/list-group-item.scss

@@ -0,0 +1,8 @@
+.list-group-item {
+	.list-group-icon {
+		svg {
+			height: 35px;
+			width: 35px;
+		}
+	}
+}

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/blocks/page-title.scss

@@ -8,7 +8,6 @@
 @import "layout/container-fluid-addition.scss"; // TODO: move this to bootstrap
 
 // blocks
-@import "blocks/page-title.scss";
 @import "blocks/notifications.scss";
 @import "blocks/section.scss";
 @import "blocks/table-of-contents.scss";
@@ -44,3 +43,6 @@
 @import "pages/contact-page.scss";
 @import "pages/document-page.scss";
 @import "pages/document-collection-page.scss";
+
+@import "pages/user-questions.scss";
+@import "pages/user-subscriptions.scss";

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/custom-index.scss

@@ -89,6 +89,7 @@ $svg-icon-map: (
 .icon-list {
 	padding: 0;
 	font-size: 34px;
+	line-height: 1;
 
 	@each $class-name, $svg in $svg-icon-map {
 		&.#{$class-name} {

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/elements/icons.scss

@@ -0,0 +1,22 @@
+.user-questions {
+	.content-wrapper {
+		@extend .block-primary-white, .p-30;
+
+		.views-element-container {
+			@extend .block-primary-gray, .p-30, .mt-30;
+		}
+
+		.views-row {
+			@extend .block-secondary-white, .py-20, .px-30;
+
+			+ .views-row {
+				@extend .mt-20;
+			}
+
+			// TODO: move this to bootstrap-custom
+			.list-group-item {
+				@extend .p-0;
+			}
+		}
+	}
+}

web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/pages/user-questions.scss

@@ -0,0 +1,22 @@
+.user-subscriptions {
+	.content-wrapper {
+		@extend .block-primary-white, .p-30;
+
+		.views-element-container {
+			@extend .block-primary-gray, .p-30;
+		}
+
+		.views-row {
+			@extend .block-secondary-white, .py-20, .px-30;
+
+			+ .views-row {
+				@extend .mt-20;
+			}
+
+			// TODO: move this to bootstrap-custom
+			.list-group-item {
+				@extend .p-0;
+			}
+		}
+	}
+}