ros.grant.common 2.0.1561 → 2.0.1563

package/Shared/Fonts/mrx-icon-font.svg

@@ -291,4 +291,10 @@
 <glyph unicode="&#xea19;" glyph-name="wysiwyg-icons-text-align-right" d="M394.667 448c0 17.673 14.327 32 32 32h469.333c17.673 0 32-14.327 32-32s-14.327-32-32-32h-469.333c-17.673 0-32 14.327-32 32zM96 704c0 17.673 14.327 32 32 32h768c17.673 0 32-14.327 32-32s-14.327-32-32-32h-768c-17.673 0-32 14.327-32 32zM309.333 192c0 17.673 14.327 32 32 32h554.667c17.673 0 32-14.327 32-32s-14.327-32-32-32h-554.667c-17.673 0-32 14.327-32 32z" />
 <glyph unicode="&#xea1a;" glyph-name="wysiwyg-icons-text-italic" d="M462.925 746.667l-106.053-597.333h-79.539l106.473 597.333h79.119zM832 746.667l-316.471-328.614h-142.244l-0.421 65.638h101.001l254.187 262.976h103.949zM646.409 149.333l-176.329 283.076 53.444 65.233 213.367-348.309h-90.483z" />
 <glyph unicode="&#xea1b;" glyph-name="wysiwyg-icons-ul" d="M266.667 448c0 17.673 14.327 32 32 32h597.333c17.673 0 32-14.327 32-32s-14.327-32-32-32h-597.333c-17.673 0-32 14.327-32 32zM266.667 704c0 17.673 14.327 32 32 32h597.333c17.673 0 32-14.327 32-32s-14.327-32-32-32h-597.333c-17.673 0-32 14.327-32 32zM266.667 192c0 17.673 14.327 32 32 32h597.333c17.673 0 32-14.327 32-32s-14.327-32-32-32h-597.333c-17.673 0-32 14.327-32 32zM170.667 704c0-23.564-19.103-42.667-42.667-42.667s-42.667 19.103-42.667 42.667c0 23.564 19.103 42.667 42.667 42.667s42.667-19.103 42.667-42.667zM170.667 448c0-23.565-19.103-42.667-42.667-42.667s-42.667 19.102-42.667 42.667c0 23.565 19.103 42.667 42.667 42.667s42.667-19.102 42.667-42.667zM170.667 192c0-23.565-19.103-42.667-42.667-42.667s-42.667 19.102-42.667 42.667c0 23.565 19.103 42.667 42.667 42.667s42.667-19.102 42.667-42.667z" />
+<glyph unicode="&#xea1c;" glyph-name="wysiwyg-icons-add-column" d="M617.98 418.065c-94.827 0-171.699-76.873-171.699-171.699s76.873-171.699 171.699-171.699c94.827 0 171.699 76.873 171.699 171.699s-76.873 171.699-171.699 171.699zM382.28 246.366c0 130.172 105.528 235.699 235.7 235.699s235.699-105.527 235.699-235.699c0-130.172-105.527-235.699-235.699-235.699s-235.7 105.527-235.7 235.699zM127.656 781.075c0 45.798 37.127 82.925 82.925 82.925h254.622c45.798 0 82.927-37.127 82.927-82.925v-229.161c0-17.673-14.327-31.999-32-31.999s-32 14.326-32 31.999v229.161c0 10.452-8.474 18.925-18.927 18.925h-254.622c-10.452 0-18.925-8.473-18.925-18.925v-636.559c0-10.453 8.473-18.927 18.925-18.927h105.033c17.673 0 32-14.323 32-32 0-17.673-14.327-32-32-32h-105.033c-45.798 0-82.925 37.129-82.925 82.927v636.559zM617.98 354.752c17.673 0 32-14.327 32-32v-152.772c0-17.673-14.327-32-32-32s-32 14.327-32 32v152.772c0 17.673 14.327 32 32 32zM726.366 246.366c0-17.673-14.327-32-32-32h-152.772c-17.677 0-32 14.327-32 32s14.323 32 32 32h152.772c17.673 0 32-14.327 32-32zM484.13 704.688c0 17.673 14.327 32 32 32h254.622c17.673 0 32-14.327 32-32s-14.327-32-32-32h-254.622c-17.673 0-32 14.327-32 32zM793.382 727.316c12.493-12.497 12.493-32.758 0-45.255l-76.39-76.387c-12.497-12.497-32.755-12.497-45.252 0s-12.497 32.758 0 45.255l76.386 76.387c12.497 12.497 32.759 12.497 45.257 0zM671.74 803.703c12.497 12.497 32.755 12.497 45.252 0l76.39-76.387c12.493-12.497 12.493-32.758 0-45.255-12.497-12.497-32.759-12.497-45.257 0l-76.386 76.387c-12.497 12.497-12.497 32.758 0 45.255z" />
+<glyph unicode="&#xea1d;" glyph-name="wysiwyg-icons-add-row" d="M541.129 301.948c0 101.961 82.654 184.619 184.614 184.619s184.614-82.658 184.614-184.619c0-101.956-82.654-184.614-184.614-184.614s-184.614 82.658-184.614 184.614zM725.743 550.565c-137.306 0-248.614-111.308-248.614-248.617 0-137.306 111.309-248.614 248.614-248.614s248.614 111.309 248.614 248.614c0 137.31-111.309 248.617-248.614 248.617zM157.128 821.333c-47.581 0-86.154-38.572-86.154-86.154v-270.77c0-47.582 38.572-86.153 86.154-86.153h243.692c17.673 0 31.999 14.327 31.999 32s-14.326 32-31.999 32h-243.692c-12.235 0-22.154 9.92-22.154 22.153v270.77c0 12.235 9.919 22.154 22.154 22.154h676.925c12.233 0 22.153-9.919 22.153-22.154v-111.692c0-17.673 14.327-32 32-32s32 14.327 32 32v111.692c0 47.581-38.571 86.154-86.153 86.154h-676.925zM612.514 301.948c0-17.673 14.323-32 32-32h162.458c17.677 0 32 14.327 32 32s-14.323 32-32 32h-162.458c-17.677 0-32-14.327-32-32zM725.743 188.719c17.673 0 32 14.327 32 32v162.462c0 17.673-14.327 32-32 32s-32-14.327-32-32v-162.462c0-17.673 14.327-32 32-32zM238.358 442.257c-17.673 0-32-14.327-32-32v-270.771c0-17.673 14.327-32 32-32s32 14.327 32 32v270.771c0 17.673-14.327 32-32 32zM215.731 116.86c12.497-12.497 32.758-12.497 45.255 0l81.231 81.229c12.497 12.497 12.497 32.759 0 45.257s-32.758 12.497-45.255 0l-81.231-81.229c-12.497-12.497-12.497-32.759 0-45.257zM134.5 243.345c-12.497-12.497-12.497-32.759 0-45.257l81.231-81.229c12.497-12.497 32.758-12.497 45.255 0s12.497 32.759 0 45.257l-81.231 81.229c-12.497 12.497-32.758 12.497-45.255 0z" />
+<glyph unicode="&#xea1e;" glyph-name="wysiwyg-icons-column-merge" d="M119.54 780.506v-285.436c0-1.207 0.067-2.402 0.198-3.58 2.976-43.409 39.132-77.696 83.296-77.696h617.932c44.164 0 80.32 34.287 83.294 77.696 0.132 1.178 0.201 2.372 0.201 3.58v285.436c0 46.113-37.385 83.494-83.494 83.494h-617.932c-46.112 0-83.494-37.382-83.494-83.494zM840.461 497.289c0-10.769-8.73-19.494-19.494-19.494h-617.932c-10.766 0-19.494 8.725-19.494 19.494v283.217c0 10.767 8.728 19.494 19.494 19.494h617.932c10.765 0 19.494-8.728 19.494-19.494v-283.217zM872.461 394.185c17.673 0 32-14.327 32-32v-4.429c0-17.677-14.327-32-32-32s-32 14.323-32 32v4.429c0 17.673 14.327 32 32 32zM151.54 394.185c17.673 0 32-14.327 32-32v-4.429c0-17.677-14.327-32-32-32s-32 14.323-32 32v4.429c0 17.673 14.327 32 32 32zM872.461 256.866c17.673 0 32-14.327 32-32v-4.429c0-17.677-14.327-32-32-32s-32 14.323-32 32v4.429c0 17.673 14.327 32 32 32zM151.54 256.866c17.673 0 32-14.327 32-32v-4.429c0-17.677-14.327-32-32-32s-32 14.323-32 32v4.429c0 17.673 14.327 32 32 32zM174.741 109.585c-5.83 6.135-14.068 9.963-23.2 9.963-17.673 0-32-14.327-32-32v-2.214c0-17.673 14.327-32 32-32h2.325c17.673 0 32 14.327 32 32 0 9.694-4.313 18.385-11.125 24.252zM872.461 119.548c17.673 0 32-14.327 32-32v-2.214c0-17.673-14.327-32-32-32h-2.325c-17.673 0-32 14.327-32 32 0 9.694 4.314 18.385 11.123 24.252 5.833 6.135 14.071 9.963 23.202 9.963zM261.399 85.333c0 17.673 14.327 32 32 32h4.651c17.673 0 32-14.327 32-32s-14.327-32-32-32h-4.651c-17.673 0-32 14.327-32 32zM405.583 85.333c0 17.673 14.327 32 31.998 32h4.655c17.673 0 32-14.327 32-32s-14.327-32-32-32h-4.655c-17.671 0-31.998 14.327-31.998 32zM549.769 85.333c0 17.673 14.323 32 32 32h4.651c17.673 0 32-14.327 32-32s-14.327-32-32-32h-4.651c-17.677 0-32 14.327-32 32zM693.952 85.333c0 17.673 14.323 32 32 32h4.651c17.673 0 32-14.327 32-32s-14.327-32-32-32h-4.651c-17.677 0-32 14.327-32 32zM544 342.805c0 17.673-14.327 32-32 32s-32-14.332-32-32.004v-2.479c0-17.673 14.327-32 32-32s32 14.327 32 32v2.483zM544 190.78c0 17.673-14.327 32-32 32s-32-14.332-32-32.004v-2.453c0-17.673 14.327-32 32-32s32 14.332 32 32.004v2.453z" />
+<glyph unicode="&#xea1f;" glyph-name="wysiwyg-icons-column-split" d="M203.034 864h617.932c46.11 0 83.494-37.382 83.494-83.494v-285.436c0-1.207-0.068-2.402-0.201-3.58-2.974-43.409-39.13-77.696-83.294-77.696h-617.932c-44.164 0-80.32 34.287-83.296 77.696-0.131 1.178-0.198 2.372-0.198 3.58v285.436c0 46.113 37.382 83.494 83.494 83.494zM840.461 497.289v283.217c0 10.767-8.73 19.494-19.494 19.494h-276.966v-322.206h276.966c10.765 0 19.494 8.725 19.494 19.494zM480 477.794v322.206h-276.966c-10.766 0-19.494-8.728-19.494-19.494v-283.217c0-10.769 8.728-19.494 19.494-19.494h276.966zM904.461 362.185c0 17.673-14.327 32-32 32s-32-14.327-32-32v-4.429c0-17.677 14.327-32 32-32s32 14.323 32 32v4.429zM183.54 362.185c0 17.673-14.327 32-32 32s-32-14.327-32-32v-4.429c0-17.677 14.327-32 32-32s32 14.323 32 32v4.429zM904.461 224.866c0 17.673-14.327 32-32 32s-32-14.327-32-32v-4.429c0-17.677 14.327-32 32-32s32 14.323 32 32v4.429zM183.54 224.866c0 17.673-14.327 32-32 32s-32-14.327-32-32v-4.429c0-17.677 14.327-32 32-32s32 14.323 32 32v4.429zM151.54 119.548c9.132 0 17.37-3.827 23.2-9.963 6.812-5.867 11.125-14.558 11.125-24.252 0-17.673-14.327-32-32-32h-2.325c-17.673 0-32 14.327-32 32v2.214c0 17.673 14.327 32 32 32zM904.461 87.548c0 17.673-14.327 32-32 32-9.131 0-17.37-3.827-23.202-9.963-6.81-5.867-11.123-14.558-11.123-24.252 0-17.673 14.327-32 32-32h2.325c17.673 0 32 14.327 32 32v2.214zM293.399 117.333c-17.673 0-32-14.327-32-32s14.327-32 32-32h4.651c17.673 0 32 14.327 32 32s-14.327 32-32 32h-4.651zM437.581 117.333c-17.671 0-31.998-14.327-31.998-32s14.327-32 31.998-32h4.655c17.673 0 32 14.327 32 32s-14.327 32-32 32h-4.655zM581.769 117.333c-17.677 0-32-14.327-32-32s14.323-32 32-32h4.651c17.673 0 32 14.327 32 32s-14.327 32-32 32h-4.651zM725.952 117.333c-17.677 0-32-14.327-32-32s14.323-32 32-32h4.651c17.673 0 32 14.327 32 32s-14.327 32-32 32h-4.651zM544 342.805c0 17.673-14.327 32-32 32s-32-14.332-32-32.004v-2.479c0-17.673 14.327-32 32-32s32 14.327 32 32v2.483zM544 190.78c0 17.673-14.327 32-32 32s-32-14.332-32-32.004v-2.453c0-17.673 14.327-32 32-32s32 14.332 32 32.004v2.453z" />
+<glyph unicode="&#xea20;" glyph-name="wysiwyg-icons-fill-color" d="M512 753.246l18.876 18.043-18.876 18.044-18.876-18.044c0 0 0 0 18.876-18.043zM427.11 365.082c-5.479 13.082-21.015 19.443-34.7 14.208-13.686-5.239-20.339-20.092-14.861-33.173 8.464-20.215 18.469-36.493 31.543-50.462 12.998-13.884 28.074-24.461 45.239-34.261 12.655-7.228 29.043-3.281 36.604 8.819 7.561 12.096 3.43 27.763-9.225 34.991-14.485 8.273-24.687 15.774-32.836 24.482-8.077 8.627-15.091 19.46-21.764 35.396zM512 753.246l-18.876 18.043-0.068-0.068-0.149-0.141-0.516-0.498c-0.439-0.427-1.071-1.043-1.882-1.841-1.617-1.596-3.955-3.921-6.903-6.924-5.897-6.003-14.255-14.722-24.256-25.73-19.972-21.989-46.629-53.258-73.332-90.39-52.63-73.185-108.684-173.527-108.684-272.023 0-123.9 105.064-224.341 234.667-224.341s234.667 100.442 234.667 224.341c0 98.496-56.055 198.838-108.685 272.023-26.701 37.132-53.359 68.401-73.331 90.39-10.001 11.008-18.359 19.727-24.256 25.73-2.948 3.002-5.286 5.328-6.903 6.924-0.811 0.798-1.442 1.414-1.882 1.841l-0.516 0.498-0.149 0.141-0.043 0.043c0 0-0.026 0.025-18.901-18.018zM499.657 702.624c4.506 4.959 8.649 9.416 12.343 13.327 3.695-3.911 7.838-8.369 12.343-13.327 19.021-20.939 44.356-50.672 69.649-85.84 51.358-71.414 99.29-160.861 99.29-243.11 0-95.714-81.161-173.308-181.282-173.308s-181.283 77.594-181.283 173.308c0 82.249 47.934 171.696 99.29 243.11 25.293 35.168 50.628 64.901 69.649 85.84z" />
+<glyph unicode="&#xea21;" glyph-name="wysiwyg-icons-palette-color" d="M484.134 643.049c0-30.778-24.947-55.728-55.727-55.728-30.777 0-55.727 24.95-55.727 55.728s24.951 55.728 55.727 55.728c30.78 0 55.727-24.95 55.727-55.728zM316.952 448c30.778 0 55.728 24.951 55.728 55.727 0 30.778-24.95 55.728-55.728 55.728s-55.728-24.95-55.728-55.728c0-30.775 24.95-55.727 55.728-55.727zM649.399 641.125c0-29.716-24.090-53.806-53.807-53.806s-53.807 24.090-53.807 53.806c0 29.716 24.090 53.807 53.807 53.807s53.807-24.090 53.807-53.807zM707.046 451.844c29.717 0 53.807 24.090 53.807 53.807 0 29.714-24.090 53.804-53.807 53.804s-53.807-24.090-53.807-53.804c0-29.717 24.090-53.807 53.807-53.807zM85.333 448c0 235.642 191.025 426.667 426.667 426.667 235.639 0 426.667-191.025 426.667-426.667 0-60.864-17.557-105.357-53.781-133.269-33.779-26.022-77.060-31.898-114.266-33.732-16.418-0.811-33.391-0.858-49.387-0.9l-7.825-0.026c-18.697-0.077-35.994-0.32-52.134-1.719-33.139-2.867-54.43-10.142-67.686-23.398-46.43-46.426-51.354-90.697-48.567-124.314 1.105-13.329 3.234-23.927 5.342-34.419 0.845-4.211 1.685-8.405 2.458-12.749l0.026-0.158c0.947-5.329 2.91-16.388 0.951-27.025-1.161-6.302-4.339-16.26-13.453-24.393-9.506-8.482-20.467-10.564-28.343-10.564-235.642 0-426.667 191.023-426.667 426.667zM512 801.524c-195.246 0-353.524-158.278-353.524-353.524 0-183.053 139.124-333.606 317.402-351.701-1.489 8.555-2.923 18.278-3.75 28.301-4.143 50.014 4.864 117.201 69.739 182.076 31.957 31.957 75.063 41.254 113.101 44.548 19.443 1.685 39.42 1.916 58.142 1.993l8.171 0.026c16.098 0.047 31.159 0.094 45.739 0.811 35.085 1.728 58.441 7.228 73.229 18.62 12.339 9.51 25.276 28.471 25.276 75.328 0 195.246-158.276 353.524-353.523 353.524z" />
 </font></defs></svg>

package/Shared/Styles/Layout/Header/AwardHeader.less

@@ -28,12 +28,12 @@ header.award-headerV2 {
       padding: 2px 20px;
     }
 
-    &-logo {
+    &__logo, &-logo {
       display: flex;
       align-items: center;
       justify-content: center;
 
-      @media (max-width: 1440px) {
+      @media (max-width: 1199px) {
         width: 130px;
 
         svg {
@@ -41,9 +41,13 @@ header.award-headerV2 {
           height: auto;
         }
       }
+      
+      @media (max-width: 991px) {
+        width: 196px;
+      }
 
       @media (max-width: 576px) {
-        width: 100px;
+        width: 110px;
       }
 
       svg {
@@ -64,7 +68,7 @@ header.award-headerV2 {
 
       &_mobile {
         display: none;
-        z-index: 1;
+        z-index: 2;
 
         @media (max-width: 991px) {
           display: flex;
@@ -239,7 +243,7 @@ header.award-headerV2 {
 
     .menu-container {
       padding: 0 !important;
-      z-index: 2;
+      z-index: 3;
 
       .btn-icon__img {
         display: flex !important;
@@ -250,7 +254,8 @@ header.award-headerV2 {
           overflow: hidden;
           white-space: nowrap;
           text-overflow: ellipsis;
-          max-width: 140px;
+          max-width: 120px;
+          padding-right: 5px;
 
           .menu-container__expert_info_role {
             overflow: hidden;

package/Shared/Styles/Modules/IconFont/icon.less

@@ -121,6 +121,30 @@
     }
   }
 
+  &.icon-wysiwyg-icons-add-column:before {
+    content: "\ea1c";
+  }
+
+  &.icon-wysiwyg-icons-add-row:before {
+    content: "\ea1d";
+  }
+
+  &.icon-wysiwyg-icons-column-merge:before {
+    content: "\ea1e";
+  }
+
+  &.icon-wysiwyg-icons-column-split:before {
+    content: "\ea1f";
+  }
+
+  &.icon-wysiwyg-icons-fill-color:before {
+    content: "\ea20";
+  }
+
+  &.icon-wysiwyg-icons-palette-color:before {
+    content: "\ea21";
+  }
+
   &.icon-wysiwyg-icons-code:before {
     content: "\e91b";
   }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1561",
+  "version": "2.0.1563",
   "name": "ros.grant.common",
   "private": false,
   "scripts": {