Merge pull request #158 from abpframework/leptonx-theme-changes-155

Leptonx theme changes
abpframework · Dec 29, 2022 · c552749 · c552749
2 parents 127e993 + 12a0aa3
commit c552749
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 13 deletions.
diff --git a/EShopOnAbp.sln b/EShopOnAbp.sln
@@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.CmskitService.HttpApi.Host", "services\cmskit\src\EShopOnAbp.CmskitService.HttpApi.Host\EShopOnAbp.CmskitService.HttpApi.Host.csproj", "{D5B9D5A5-44AA-42F8-867C-95B54780C9DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.Keycloak.DbMigrator", "shared\EShopOnAbp.Keycloak.DbMigrator\EShopOnAbp.Keycloak.DbMigrator.csproj", "{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.Keycloak.DbMigrator", "shared\EShopOnAbp.Keycloak.DbMigrator\EShopOnAbp.Keycloak.DbMigrator.csproj", "{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Payment/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Payment/Default.cshtml
@@ -7,8 +7,8 @@
 
 <div class="row">
 	<div class="col-lg-9">
-		<div class="address-list p-5">
-			<h5 class="mb-5">@L["Payment:SelectAddress"]</h5>
+		<div class="address-list p-1">
+			<h5 class="mb-2">@L["Payment:SelectAddress"]</h5>
 			<abp-row>
 				@foreach (var address in Model.Address)
 				{
@@ -28,8 +28,8 @@
 			</abp-row>
 		</div>
 
-		<div class="payment-list p-5">
-			<h5 class="mb-5">@L["Payment:SelectPaymentMethod"]</h5>
+		<div class="payment-list p-1">
+			<h5 class="mb-2">@L["Payment:SelectPaymentMethod"]</h5>
 			<abp-row>
 				@foreach (var paymentMethod in Model.PaymentMethods)
 				{

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
@@ -121,7 +121,10 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         {
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
-                bundle => { bundle.AddContributors(typeof(CartWidgetStyleContributor)); }
+                bundle => { 
+                    bundle.AddContributors(typeof(CartWidgetStyleContributor));
+					bundle.AddFiles("/global.css");
+				}
             );
         });
 

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenus.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenus.cs
@@ -1,6 +1,6 @@
 namespace EShopOnAbp.PublicWeb.Menus
 {
-    public class EShopOnAbpPublicWebMenus
+    public static class EShopOnAbpPublicWebMenus
     {
         private const string Prefix = "EShopOnAbp.Public";
 

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml
@@ -11,7 +11,7 @@
 @inject IStringLocalizer<EShopOnAbpResource> L
 
 <div class="row">
-    <div id="BasketArea" class="pt-5">
+    <div id="BasketArea">
         @await Component.InvokeAsync(typeof(BasketWidgetViewComponent))
     </div>
 </div>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml
@@ -29,7 +29,7 @@
 
 <div class="row">
     <div class="col-lg-12">
-        <h3 class="pt-5 pb-4 text-center">@pageHeader</h3>
+        <h3 class="pb-4 text-center">@pageHeader</h3>
         <div class="product-list">
             @for (int i = 0; i < Math.Ceiling(Model.Products.Count / (double)productsColumnSize); i++)
             {

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml
@@ -34,14 +34,14 @@
     }
 }
 
-<div class="mt-5 col">
+<div class="col">
     <abp-row>
         <abp-column offset="_9" size="_3">
-            <abp-select suppress-label="true" asp-for="OrderFilter" asp-items="selectList"></abp-select>
+            <abp-select class="card" suppress-label="true" asp-for="OrderFilter" asp-items="selectList"></abp-select>
         </abp-column>
     </abp-row>
 </div>
 
-<div id="UserOrdersArea" class="pt-5">
+<div id="UserOrdersArea">
     @await Component.InvokeAsync(typeof(UserOrderWidgetViewComponent), new {Filter = Model.OrderFilter})
 </div>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Payment.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Payment.cshtml
@@ -11,7 +11,7 @@
 }
 
 <div class="row">
-    <div id="PaymentArea" class="pt-5">
+    <div id="PaymentArea">
         @await Component.InvokeAsync(typeof(PaymentWidgetViewComponent))
     </div>
 </div>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml
@@ -25,6 +25,7 @@
     @section scripts {
     <abp-script src="/client-proxies/basket-proxy.js" />
     <abp-script src="/Pages/index.js" />
+    <abp-script src="/Pages/productDetail.js" />
 }
 
     <div class="container">

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/productDetail.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/productDetail.js
@@ -0,0 +1,4 @@
+(function () {
+    let value = $("[name='commentText']");
+    value.addClass(' card ');
+})();
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Themes/LeptonXLite/Components/Menu/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Themes/LeptonXLite/Components/Menu/Default.cshtml
@@ -0,0 +1,6 @@
+@model Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Themes.LeptonXLite.Components.Menu.MenuViewModel;
+
+@{
+}
+
+
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/global.css b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/global.css
@@ -0,0 +1,5 @@
+.lpx-content-container {
+    margin: 0 !important;
+    z-index: 1100 !important;
+    position: relative !important;
+}