-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/sisvietnamvn_main/sisvietnam_backup.dmp b/sisvietnamvn_main/sisvietnam_backup.dmp
index 9e9ed310..8ed7001d 100644
Binary files a/sisvietnamvn_main/sisvietnam_backup.dmp and b/sisvietnamvn_main/sisvietnam_backup.dmp differ
diff --git a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/service/ComponentTemplateService.java b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/service/ComponentTemplateService.java
index 217b6dcc..2dcfc185 100644
--- a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/service/ComponentTemplateService.java
+++ b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/service/ComponentTemplateService.java
@@ -211,9 +211,8 @@ public class ComponentTemplateService {
index++;
}
} else if (posts != null) {
- java.time.format.DateTimeFormatter monthFormatter = java.time.format.DateTimeFormatter.ofPattern("MMM").withZone(java.time.ZoneId.systemDefault());
+ java.time.format.DateTimeFormatter monthFormatter = java.time.format.DateTimeFormatter.ofPattern("MM").withZone(java.time.ZoneId.systemDefault());
java.time.format.DateTimeFormatter dayFormatter = java.time.format.DateTimeFormatter.ofPattern("dd").withZone(java.time.ZoneId.systemDefault());
- java.time.format.DateTimeFormatter timeFormatter = java.time.format.DateTimeFormatter.ofPattern("hh:mm a").withZone(java.time.ZoneId.systemDefault());
for (com.sisvietnamvn.web.domain.Post post : posts) {
String itemHtml = loopBody;
String safeTitle = post.getTitle() != null ? org.springframework.web.util.HtmlUtils.htmlEscape(post.getTitle()) : "";
@@ -243,18 +242,9 @@ public class ComponentTemplateService {
if (post.getEventTime() != null) {
itemHtml = itemHtml.replace("{{eventMonth}}", monthFormatter.format(post.getEventTime()));
itemHtml = itemHtml.replace("{{eventDay}}", dayFormatter.format(post.getEventTime()));
- itemHtml = itemHtml.replace("{{eventTimeStr}}", timeFormatter.format(post.getEventTime()));
} else {
itemHtml = itemHtml.replace("{{eventMonth}}", "");
itemHtml = itemHtml.replace("{{eventDay}}", "");
- itemHtml = itemHtml.replace("{{eventTimeStr}}", "");
- }
-
- if (post.getLocation() != null && !post.getLocation().isEmpty()) {
- String locHtml = "
" + org.springframework.web.util.HtmlUtils.htmlEscape(post.getLocation()) + "
";
- itemHtml = itemHtml.replace("{{locationHtml}}", locHtml);
- } else {
- itemHtml = itemHtml.replace("{{locationHtml}}", "");
}
itemHtml = itemHtml.replace("{{index}}", String.valueOf(index));
diff --git a/sisvietnamvn_main/src/main/resources/static/css/custom.css b/sisvietnamvn_main/src/main/resources/static/css/custom.css
index e3ca8fc9..5f6f9886 100644
--- a/sisvietnamvn_main/src/main/resources/static/css/custom.css
+++ b/sisvietnamvn_main/src/main/resources/static/css/custom.css
@@ -27,8 +27,8 @@
--color-text-light: #ffffff;
/* Typography */
- --font-family-base: 'Open Sans', 'Inter', sans-serif;
- --font-family-heading: 'Lora', 'Georgia', serif;
+ --font-family-base: 'Open Sans', Arial, Helvetica, sans-serif;
+ --font-family-heading: 'Open Sans', Arial, Helvetica, sans-serif;
/* Spacing & Radii */
--spacing-md: 20px;
@@ -39,6 +39,11 @@
/* ==========================================================================
2. Global / Base Overrides
========================================================================== */
+body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+ font-family: var(--font-family-base) !important;
+ font-feature-settings: 'liga' off, 'clig' off !important;
+}
+
[data-component-id="umass_base:tophat"] {
background-color: transparent !important;
}
@@ -528,4 +533,21 @@
.mobile-only {
display: none !important;
}
+ .news-events-section__footer {
+ display: none;
+ }
+ .cc--footer .c--footer {
+ padding: 36px 6.25%;
+ }
}
+
+/* --- Override for 4-column Stats Block --- */
+@media (min-width: 64rem) {
+ .f--field.f--stats-block {
+ grid-template-columns: repeat(4, 1fr) !important;
+ }
+}
+
+.lc--layout-container ol li, .lc--layout-container ul li, .sg-pattern-example ol li, .sg-pattern-example ul li {
+ font-weight: var(--font-weight-extrabold);
+}
\ No newline at end of file
diff --git a/sisvietnamvn_main/src/main/resources/static/upload/sach-dot-quy-ngang.png b/sisvietnamvn_main/src/main/resources/static/upload/sach-dot-quy-ngang.png
index ef0e22d1..938ff87d 100644
Binary files a/sisvietnamvn_main/src/main/resources/static/upload/sach-dot-quy-ngang.png and b/sisvietnamvn_main/src/main/resources/static/upload/sach-dot-quy-ngang.png differ
diff --git a/sisvietnamvn_main/src/main/resources/templates/themes/umass/footer.html b/sisvietnamvn_main/src/main/resources/templates/themes/umass/footer.html
index 671b618b..03ff2c40 100644
--- a/sisvietnamvn_main/src/main/resources/templates/themes/umass/footer.html
+++ b/sisvietnamvn_main/src/main/resources/templates/themes/umass/footer.html
@@ -11,7 +11,7 @@
.sis-footer-custom {
display: flex;
flex-wrap: wrap;
- padding: 40px 20px;
+ padding: 0px 20px;
gap: 60px;
color: #fff;
font-family: var(--font-family-base, 'Inter', sans-serif);
@@ -186,6 +186,57 @@
- 
- 
- 
- 
- 
- 
-
-
+ 
-
-
-
-
-
-
-
-
-
-
-
-
-