CountdownBox - minor changes on CatalogProductView

grandnode · Sep 9, 2021 · 5e859ed · 5e859ed
1 parent edc1c7b
commit 5e859ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/Web/Grand.Web/Views/Shared/_CatalogProductListViewVue.cshtml b/src/Web/Grand.Web/Views/Shared/_CatalogProductListViewVue.cshtml
@@ -57,8 +57,8 @@
                             </template>
                             <template v-else>
                                 <div class="d-inline-flex flex-wrap justify-content-center">
-                                    <label class="ended-label">@Loc["ShoppingCart.Auctionends"]:</label>
-                                    <div class="count-date">{{Model.EndTimeLocalTime.Value}}</div>
+                                    <label class="ended-label mb-0">@Loc["ShoppingCart.Auctionends"]:</label>
+                                    <div class="count-date" v-html="new Date(Model.EndTimeLocalTime).toLocaleString()"></div>
                                 </div>
                             </template>
                         </div>

diff --git a/src/Web/Grand.Web/Views/Shared/_CatalogProductViewVue.cshtml b/src/Web/Grand.Web/Views/Shared/_CatalogProductViewVue.cshtml
@@ -56,8 +56,8 @@
                         </template>
                         <template v-else>
                             <div class="d-inline-flex flex-wrap justify-content-center">
-                                <label class="ended-label">@Loc["ShoppingCart.Auctionends"]:</label>
-                                <div class="count-date">{{Model.EndTimeLocalTime.Value}}</div>
+                                <label class="ended-label mb-0">@Loc["ShoppingCart.Auctionends"]:</label>
+                                <div class="count-date" v-html="new Date(Model.EndTimeLocalTime).toLocaleString()"></div>
                             </div>
                         </template>
                     </div>

diff --git a/src/Web/Grand.Web/wwwroot/theme/css/common/common.css b/src/Web/Grand.Web/wwwroot/theme/css/common/common.css
@@ -876,6 +876,9 @@ input:checked ~ .color-container .color::before {
     font-size: 16px;
     font-weight: 500;
 }
+.product-box .countdown-box .count-date {
+    margin: 0 0 0 5px;
+}
 .product-box .rating {
     display: inline-flex;
     align-items: center;

diff --git a/src/Web/Grand.Web/wwwroot/theme/css/common/common.rtl.css b/src/Web/Grand.Web/wwwroot/theme/css/common/common.rtl.css
@@ -981,6 +981,9 @@ input:checked ~ .color-container .color::before {
     content: "/";
     margin: 0 3px;
 }
+.product-box .countdown-box .count-date {
+    margin: 0 5px 0 0;
+}
 .product-box .prices {
     display: inline-flex;
     align-items: flex-end;