Merge branch 'redesign2' of http://dev.prmsys.net:3001/Rimmon/HyperCube into redesign2

Pages/ModalFiles.razor

@@ -18,8 +18,9 @@
                 <div class="modal__body__container__right modal__body__container__right_blackborder">
                     @foreach (var article in AppData.Articles)
                     {
-                    <p class="modal__files__name"><a>@article.Value.Name</a>
-                        @(article.Value.PublishDate.ToString("dd.MM.yy")) #@article.Value.ID</p>
+                    <p class="modal__files__name">
+                        #@article.Value.ID - <a>@article.Value.Name</a> @article.Value.ID@(article.Value.PublishDate.ToString("dd.MM.yy"))
+                    </p>
                     }
                 </div>
             </div>

Pages/ModalProfile.razor

@@ -44,7 +44,7 @@
                     <p class="modal__profile__text modal__profile__text_mb">@whereFrom</p>
                     <p class="modal__profile__text">@veryfied</p>
                     <p class="modal__profile__text">Статус: @status</p>
-                    <p class="modal__profile__text">Рейтинг: @(string.Join(", ", _account.GetRoleDisplayName()))</p>
+                    <p class="modal__profile__text">Роль: @(string.Join(", ", _account.GetRoleDisplayName()))</p>
                 </div>
             </div>
         </div>

Pages/ModalRules.razor

@@ -16,7 +16,7 @@
                 </div>
                 <div class="modal__body__container__right modal__body__container__right_blackborder">
                     <button class="modal__rules__button btn_orange">Скачать правила</button>
-                    <button class="modal__rules__button btn_orange">Закон РФ</button>
+                    <button class="modal__rules__button btn_orange">White Paper 2DH</button>
                     <button class="modal__rules__button btn_orange">Верифицировать Ваши данные</button>
                 </div>
             </div>

Shared/Sidebar.razor

@@ -14,6 +14,9 @@
                 </a>
             </div>
             <div class="middle-href">
+                <a style="cursor:pointer" title="Рабочий стол" @onclick="@DesktopClick">
+                    <img src="img/desktop.svg" alt="">
+                </a>
                 <a style="cursor:pointer" title="Файлы" @onclick="@FilesClick">
                     <img src="img/files.svg" alt="">
                 </a>

Shared/Sidebar.razor.cs

@@ -58,6 +58,11 @@ namespace HyperCube.Shared
             modalProfile.Open(account);
         }
 
+        void DesktopClick()
+        {
+            NavigationManager.NavigateTo("desktop");
+        }
+
         void FilesClick()
         {
             modalFiles.Open();

wwwroot/css/style.css

@@ -29,7 +29,7 @@
   overflow-y: hidden; }
 
 body {
-    background-color: #afb0b0;
+    background-color: #afb0b0 !important;
     font-weight: normal;
     font-style: normal;
     height: 100%; }
@@ -1137,7 +1137,7 @@ footer {
   .modal__files__type:last-child {
     margin-bottom: 0px; }
 .modal__files__name {
-  text-align: center;
+  text-align: left;
   color: black;
   font-family: 'Bahn';
   font-size: 16px;

wwwroot/img/desktop.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M17,3V2.5C17,1.7,16.3,1,15.5,1h-13C1.7,1,1,1.7,1,2.5V3H17z"/>
+	<path class="st0" d="M12,7.5v6c0,0.3,0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5v-6C14,7.2,13.8,7,13.5,7h-1C12.2,7,12,7.2,12,7.5z"
+		/>
+	<path class="st0" d="M17,4H1v11.5C1,16.3,1.7,17,2.5,17h13c0.8,0,1.5-0.7,1.5-1.5V4z M11,7.5C11,6.7,11.7,6,12.5,6h1
+		C14.3,6,15,6.7,15,7.5v6c0,0.8-0.7,1.5-1.5,1.5h-1c-0.8,0-1.5-0.7-1.5-1.5V7.5z M3.5,7C3.2,7,3,6.8,3,6.5S3.2,6,3.5,6h5
+		C8.8,6,9,6.2,9,6.5S8.8,7,8.5,7H3.5z M3.5,9C3.2,9,3,8.8,3,8.5S3.2,8,3.5,8h5C8.8,8,9,8.2,9,8.5S8.8,9,8.5,9H3.5z M3.5,11
+		C3.2,11,3,10.8,3,10.5S3.2,10,3.5,10h3C6.8,10,7,10.2,7,10.5S6.8,11,6.5,11H3.5z M4.5,12h3C8.3,12,9,12.7,9,13.5S8.3,15,7.5,15h-3
+		C3.7,15,3,14.3,3,13.5S3.7,12,4.5,12z"/>
+</g>
+</svg>