Merge pull request #15 from AndreasEngelmark/development

Merge prior to final deploy

Author: AndreasEngelmark

web/profiles/custom/os2loop/modules/os2loop_messages/os2loop_messages.module

@@ -64,11 +64,16 @@ function os2loop_messages_preprocess_field(&$variables) {
     $derivative_id = $views_block->getDerivativeId();
     $derivative_id_exploded = explode('-', $derivative_id);
 
-    if ($derivative_id_exploded[0] === 'os2loop_messages') {
-      $view = Views::getView($derivative_id_exploded[0]);
-      $view->execute($derivative_id_exploded[1]);
+    $base_view_id = $derivative_id_exploded[0];
 
-      $variables['total_rows'] = (string) count($view->result);
+    switch ($base_view_id) {
+      case 'os2loop_messages':
+      case 'os2loop_section_page_user_favourites':
+        $view = Views::getView($base_view_id);
+        $view->execute($derivative_id_exploded[1]);
+
+        $variables['total_rows'] = (string) count($view->result);
+        break;
     }
   }
 }

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

@@ -52,3 +52,4 @@
 @import "pages/user-replies.scss";
 @import "pages/user-messages.scss";
 @import "pages/user-edit.scss";
+@import "pages/user-favourites.scss";

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

@@ -31,4 +31,49 @@ $taxonomy-colors: (
 	.os2loop-highlighted-container {
 		@extend .block-primary-light-green;
 	}
+
+	table.paragraph--type--os2loop-documents-table,
+	table.loop-documents-table {
+		@extend .w-100;
+
+		border-collapse: separate;
+		border-spacing: 0;
+
+		tr th,
+		tr td {
+			border-right: 1px solid $gray-500;
+			border-bottom: 1px solid $gray-500;
+			padding: 12px 20px;
+		}
+
+		tr th:first-child,
+		tr td:first-child {
+			border-left: 1px solid $gray-500;
+		}
+
+		tr th {
+			background: $gray-200;
+			border-top: 1px solid $gray-500;
+		}
+
+		// top-left border-radius
+		tr:first-child th:first-child {
+			border-top-left-radius: $border-radius-sm;
+		}
+
+		// top-right border-radius
+		tr:first-child th:last-child {
+			border-top-right-radius: $border-radius-sm;
+		}
+
+		// bottom-left border-radius
+		tr:last-child td:first-child {
+			border-bottom-left-radius: $border-radius-sm;
+		}
+
+		// bottom-right border-radius
+		tr:last-child td:last-child {
+			border-bottom-right-radius: $border-radius-sm;
+		}
+	}
 }

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

@@ -4,4 +4,10 @@
 	.image-widget {
 		@extend .d-none;
 	}
+
+	div#edit-actions {
+		input + input {
+			@extend .mt-20;
+		}
+	}
 }

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

@@ -0,0 +1,17 @@
+.paragraph.paragraph--type--os2loop-section-page-views-refer--views-blockos2loop-section-page-user-favourites-block-1 {
+	.os2loop-section-page-view-header {
+		@extend .d-inline-flex, .align-items-center;
+
+		.total-row-count {
+			@extend .rounded-circle, .ml-20;
+
+			width: 25px;
+			height: 25px;
+
+			background-color: $gray-500;
+			color: $loop-white;
+
+			text-align: center;
+		}
+	}
+}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/field/field--os2loop-section-page-view-header.html.twig

@@ -42,12 +42,12 @@
 <div class="{{ field_name|clean_class }} mb-20">
   {% for item in items %}
     <h3{{ attributes.addClass('mb-0') }}>
-      {{ item.content }}
+      {{- item.content -}}
     </h3>
   {% endfor %}
   {% if total_rows %}
     <div class="total-row-count">
-      {{ total_rows }}
+      {{- total_rows -}}
     </div>
   {% endif %}
 </div>