Merge branch 'main' into metadata

taiga-family · Dec 28, 2020 · 6c321c4 · 6c321c4
2 parents 270b089 + bdc32a7
commit 6c321c4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/projects/addon-doc/src/components/page/page.component.ts b/projects/addon-doc/src/components/page/page.component.ts
@@ -26,7 +26,7 @@ export class TuiDocPageComponent {
     header = '';
 
     @Input()
-    packageName = '';
+    package = '';
 
     activeItemIndex = NaN;
 

diff --git a/projects/addon-doc/src/components/page/page.template.html b/projects/addon-doc/src/components/page/page.template.html
@@ -8,9 +8,9 @@ <h1 class="title">
             status="custom"
         ></tui-tag>
         <tui-tag
-            *ngIf="packageName"
+            *ngIf="package"
             class="tag"
-            [value]="packageName"
+            [value]="package"
             [autoColor]="true"
         ></tui-tag>
     </h1>
@@ -48,7 +48,7 @@ <h1 class="title">
     <tui-doc-source-code
         class="source-code"
         [header]="header"
-        [package]="packageName"
+        [package]="package"
     ></tui-doc-source-code>
 </header>
 <div class="content">

diff --git a/projects/core/components/primitive-textfield/primitive-textfield.template.html b/projects/core/components/primitive-textfield/primitive-textfield.template.html
@@ -42,7 +42,7 @@
         [style.paddingLeft.px]="paddingLeft"
         [style.borderRightWidth.px]="paddingRight"
     >
-        <ng-content select="polymorpheus-outlet"></ng-content>
+        <ng-content select="[polymorpheus-outlet]"></ng-content>
     </div>
     <div class="content" tuiPreventDefault="click">
         <div

diff --git a/projects/core/styles/mixins/text.less b/projects/core/styles/mixins/text.less
@@ -30,15 +30,15 @@
 
 //typed text
 .text-body-xl-bold() {
-    .font(19px, 28px, 'bold');
+    .font(19px, 28px, bold);
 }
 
 .text-body-xl() {
-    .font(19px, 28px, 'normal');
+    .font(19px, 28px, normal);
 }
 
 .text-body-l-bold(@type: 1) {
-    .font(17px, 24px, 'bold');
+    .font(17px, 24px, bold);
 
     & when (@type = 2) {
         line-height: 20px;
@@ -50,7 +50,7 @@
 }
 
 .text-body-l(@type: 1) {
-    .font(17px, 24px, 'normal');
+    .font(17px, 24px, normal);
 
     & when (@type = 2) {
         line-height: 20px;
@@ -62,84 +62,84 @@
 }
 
 .text-body-m-bold(@type: 1) {
-    .font(15px, 24px, 'bold');
+    .font(15px, 24px, bold);
 
     & when (@type = 2) {
         line-height: 20px;
     }
 }
 
 .text-body-m(@type: 1) {
-    .font(15px, 24px, 'normal');
+    .font(15px, 24px, normal);
 
     & when (@type = 2) {
         line-height: 20px;
     }
 }
 
 .text-body-s-bold(@type: 1) {
-    .font(13px, 20px, 'bold');
+    .font(13px, 20px, bold);
 
     & when (@type = 2) {
         line-height: 16px;
     }
 }
 
 .text-body-s(@type: 1) {
-    .font(13px, 20px, 'normal');
+    .font(13px, 20px, normal);
 
     & when (@type = 2) {
         line-height: 16px;
     }
 }
 
 .text-body-xs() {
-    .font(11px, 16px, 'normal');
+    .font(11px, 16px, normal);
     letter-spacing: 0.4px;
 }
 
 //tabs,tags, category
 
 .text-caption-l-bold() {
-    .font(13px, 20px, 'bold');
+    .font(13px, 20px, bold);
     letter-spacing: 1px;
     text-transform: uppercase;
 }
 
 .text-caption-l() {
-    .font(13px, 20px, 'normal');
+    .font(13px, 20px, normal);
     letter-spacing: 1px;
     text-transform: uppercase;
 }
 
 .text-caption-bold() {
-    .font(11px, 16px, 'bold');
+    .font(11px, 16px, bold);
     letter-spacing: 1px;
     text-transform: uppercase;
 }
 
 .text-caption() {
-    .font(11px, 16px, 'normal');
+    .font(11px, 16px, normal);
     letter-spacing: 1px;
     text-transform: uppercase;
 }
 
 // mixins fot font properties
-.font(@size, @line-height: 'none', @weight: 'normal', @color: 'none') {
+.font(@size, @line-height: 'none', @weight: normal, @color: 'none') {
     font-weight: @weight;
     font-size: @size;
     font-family: var(--tui-text-font);
 }
 
-.font(@size, @line-height: 'none', @weight: 'normal', @color: 'none') when not (@line-height = 'none') {
+.font(@size, @line-height: 'none', @weight: normal, @color: 'none') when not (@line-height = 'none') {
     line-height: @line-height;
 }
 
-.font(@size, @line-height: 'none', @weight: 'normal', @color: 'none') when not (@color = 'none') {
+.font(@size, @line-height: 'none', @weight: normal, @color: 'none') when not (@color = 'none') {
     color: @color;
 }
 
-.font_heading(@size, @line-height: 'normal') {
+.font_heading(@size, @line-height: normal) {
     font-weight: bold;
     line-height: @line-height;
     font-size: @size;

diff --git a/projects/kit/components/select/select.template.html b/projects/kit/components/select/select.template.html
@@ -24,8 +24,8 @@
     >
         <ng-content></ng-content>
         <div
-            polymorpheus-outlet
             *ngIf="value"
+            polymorpheus-outlet
             class="value"
             automation-id="tui-select__value"
             [content]="computedContent"