@enigmatry/entry-components 1.15.1-preview.17 → 1.15.1-preview.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enigmatry/entry-components",
-  "version": "1.15.1-preview.17",
+  "version": "1.15.1-preview.19",
   "author": "Enigmatry",
   "description": "Enigmatry entry angular material components",
   "homepage": "https://github.com/enigmatry/entry-angular-building-blocks/tree/master/libs/entry-components#readme",

package/styles/modules/typography/_fonts.scss

@@ -1,37 +1,61 @@
 @use 'sass:map';
 
-$font-path: 'assets/fonts/';
+$font-path: '/assets/fonts/';
 $font-sources: (
 	(
-		name: 'OpenSans',
+		name: 'Roboto',
 		style: normal,
-		formats: ('eot', 'woff', 'woff2', 'ttf')
+		formats: ('woff2'),
+		weight: 400
 	),
 	(
-		name: 'OpenSans',
+		name: 'Roboto',
 		style: bold,
-		formats: ('eot', 'woff', 'woff2', 'ttf')
-	),
-	(
-		name: 'Montserrat',
-		style: bold,
-		formats: ('eot', 'woff', 'woff2', 'ttf')
+		formats: ('woff2'),
+		weight: 500
 	)
 );
 
+// $font-sources: (
+// 	(
+// 		name: 'OpenSans',
+// 		style: normal,
+// 		formats: ('eot', 'woff', 'woff2', 'ttf')
+// 	),
+// 	(
+// 		name: 'OpenSans',
+// 		style: bold,
+// 		formats: ('eot', 'woff', 'woff2', 'ttf')
+// 	),
+// 	(
+// 		name: 'Montserrat',
+// 		style: bold,
+// 		formats: ('eot', 'woff', 'woff2', 'ttf')
+// 	)
+// );
+
 @mixin generate-default-font() {
 	@each $font in $font-sources {
 		$name: map.get($font, name);
 		$style: map.get($font, style);
 		$formats: map.get($font, formats);
+		$weight: map.get($font, weight);
 
 		@each $format in $formats {
 			$url: '#{$font-path}#{$name}/#{$name}-#{$style}.#{$format}';
 
 			@font-face {
 				font: {
-					family: '#{$name}-#{$style}';
 					style: '#{$style}';
+		
+					@if $weight {
+						family: '#{$name}';
+						weight: $weight;
+					}
+
+					@else {
+						family: '#{$name}-#{$style}';
+					}
 				}
 				src: url('#{$url}') format('#{$format}');
 			}

package/styles/modules/vendors/angular-material/_typography-generator.scss

@@ -67,6 +67,7 @@
 	$typography: -set-text-groups-for($typography, $body-font, $buttons-font);
 	$typography: -set-typography-group($typography, ('headline-1', 'headline-2', 'headline-3', 'headline-4'), $hero-titles-font);
 	$typography: -set-typography-group($typography, ('headline-5', 'headline-6', 'subtitle-1', 'subtitle-2'), $titles-font);
+	$typography: map.set($typography, 'font-family', '"#{$buttons-font}"');
 
 	@return $typography;
 }
@@ -78,9 +79,10 @@
 }
 
 @function -generate-defaults-from($typography) {
-	$typography: -set-text-groups-for($typography, 'OpenSans-normal', 'OpenSans-bold');
-	$typography: -set-typography-group($typography,('headline-1', 'headline-2', 'headline-3', 
-	'headline-4', 'headline-5', 'headline-6', 'subtitle-1', 'subtitle-2'),'Montserrat-bold');
+	// Return Roboto (default Angular Material's font (for now).
+	// $typography: -set-text-groups-for($typography, 'OpenSans-normal', 'OpenSans-bold');
+	// $typography: -set-typography-group($typography,('headline-1', 'headline-2', 'headline-3', 
+	// 'headline-4', 'headline-5', 'headline-6', 'subtitle-1', 'subtitle-2'),'Montserrat-bold');
 	@return $typography;
 }
 
@@ -93,6 +95,6 @@
 }
 
 @function -set-typography-font($typography, $section, $font) {
-	$typography: map.set($typography, $section, 'font-family', $font);
+	$typography: map.set($typography, $section, 'font-family', '"#{$font}"');
 	@return $typography;
 }

package/styles/partials/core/components/forms/_general.scss

@@ -12,14 +12,14 @@
 	.entry-checkbox {
 		display: block;
 	}
-}
 
-.mat-mdc-form-field {
-	margin-bottom: 20px;
-}
-  
-.mdc-form-field {
-	margin-bottom: 10px;
+	.mat-mdc-form-field {
+		margin-bottom: 20px;
+	}
+	  
+	.mdc-form-field {
+		margin-bottom: 10px;
+	}
 }
 
 .datetimepicker {

package/styles/partials/core/components/tables/_layout.scss

@@ -14,6 +14,10 @@
 	overflow: auto;
 }
 
+.entry-table-content {
+	flex-direction: column;
+}
+
 .entry-table-footer {
 	position: relative;
 	z-index: 1;