Merge branch 'header'

src/app/_modules/form-fields/types/html/single/field-html-single.component.ts

@@ -19,15 +19,15 @@ export class FieldHtmlSingleComponent {
     plugins: 'lists link image paste help wordcount hr',
     toolbar: 'bold italic removeformat | link hr forecolor | bullist numlist outdent indent',
     color_map: [
-      '3E3D40', 'grey-1',
-      '696A6D', 'grey-2',
-      '86898E', 'grey-3',
-      'FCC620', 'yellow-1',
-      'F4B417', 'yellow-2',
-      'F49B1B', 'yellow-3',
-      'BFBFBF', 'grey-4',
-      'E8E8E8', 'grey-5',
-      'F5F4F4', 'grey-6',
+      '0070BA', 'blue-1',
+      '005799', 'blue-2',
+      '004077', 'blue-3',
+      'A1CAE5', 'blue-1',
+      'C0C0C0', 'grey-1',
+      '6C6C6C', 'grey-2',
+      '4D4D4D', 'grey-3',
+      'FFFFFF', 'white',
+      '2D2D2D', 'black',
     ]
   };
 

src/app/_modules/form-fields/types/relation/form-field-relation.component.scss

@@ -6,6 +6,7 @@
   font-size: 20px;
   color: var(--dark-1);
   padding: 8px 12px 8px 16px;
+  background: no-repeat left 16px center / 173px 19px url('~src/assets/images/icons/placeholder.svg');
 
   &:hover{
     border-color: #6C6C6C;
@@ -34,6 +35,8 @@
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
+      width: 100%;
+      background-color: #ffffff;
       p {
         padding: 0;
         overflow: hidden;

src/app/_modules/form-fields/types/relation/single/combobox/combobox-single.component.html

@@ -1,6 +1,6 @@
 <div class="combobox" [class.active]="active">
   <div class="toggle" (click)="toggleActivity()">
-    <div class="caption">{{caption}}</div>
+    <div class="caption" *ngIf="value">{{caption}}</div>
     <div class="filter">
       <input type="text" #searchInput (click)="$event.stopPropagation()" (input)="onInput($event)" (keydown.escape)="active = false" />
     </div>

src/app/_modules/layout/footer/footer.component.scss

@@ -1,4 +1,5 @@
 .footer {
+  margin-top: 120px;
   width: 100%;
   padding: 40px 100px; 
   background-color: var(--blue-3);

src/app/_modules/layout/header/header.component.scss

@@ -78,7 +78,7 @@
       justify-content: normal;
       align-items: stretch;
       align-content: stretch; 
-      padding: 0 calc( (100% - 1440px) / 2);
+      padding: 0 calc( (100% - 1300px) / 2);
       position: relative;
       .logo { 
         width:114px; 

src/app/_modules/pages/page/page.component.scss

@@ -27,10 +27,8 @@
             letter-spacing: 0.76px;
             color: white;
           }
-        }
-        
-      }
-      
+        }        
+      }      
     }
     .left {
       flex-grow: 1;

src/styles.scss

@@ -36,7 +36,7 @@
     border-radius: 12px;
     padding: 12px 24px;
     display: flex;
-    margin-bottom: 24px;
+    margin-bottom: 16px;
     column-gap: 20px;
     button {
       background-position: center;