Jelajahi Sumber

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

Rimmon 3 tahun lalu
induk
melakukan
e38751f79f
4 mengubah file dengan 10 tambahan dan 9 penghapusan
  1. 2 4
      Pages/Index.razor
  2. 5 2
      Pages/ModalAssets.razor
  3. 1 1
      Pages/ModalRules.razor
  4. 2 2
      Shared/Sidebar.razor.cs

+ 2 - 4
Pages/Index.razor

@@ -116,15 +116,13 @@
 
 <header class="main-slider">
     <BSCarousel NumberOfItems="@items.Count">
-        <div class="carousel-inner">
-            <BSCarouselIndicators NumberOfItems="@items.Count" />
+        <div class="carousel-inner">            
             @for (int i = 0; i < items.Count; i++)
             {
                 <BSCarouselItem src="@items[i].Source" alt="@items[i].Alt" />
             }
         </div>
-        
-
+        <BSCarouselIndicators NumberOfItems="@items.Count" />
         <BSCarouselControl CarouselDirection="CarouselDirection.Previous" NumberOfItems="@items.Count"/>
         <BSCarouselControl CarouselDirection="CarouselDirection.Next" NumberOfItems="@items.Count"/>
     </BSCarousel>

+ 5 - 2
Pages/ModalAssets.razor

@@ -96,11 +96,14 @@
     [Parameter]
     public RenderFragment Title { get; set; }
 
-    private string elementid = "modal_assets";
+    string elementid = "modal_assets";
 
+    Models.AccountModel _account;
 
-    public void Open()
+
+    public void Open(Models.AccountModel account)
     {
+        _account = account;
         JsRuntime.InvokeVoidAsync("OpenModal", elementid);
     }
 

+ 1 - 1
Pages/ModalRules.razor

@@ -17,7 +17,7 @@
                 <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">White Paper 2DH</button>
-                    <button class="modal__rules__button btn_orange">Верифицировать Ваши данные</button>
+                    <button class="modal__rules__button btn_orange" style="font-size:16px">Верифицировать Ваши данные</button>
                 </div>
             </div>
         </div>

+ 2 - 2
Shared/Sidebar.razor.cs

@@ -84,8 +84,8 @@ namespace HyperCube.Shared
         }
 
         void AssetsClick()
-        {            
-            modalAssets.Open();
+        {
+            modalAssets.Open(_currentAccount);
         }
 
         void ExitClick()