From 139faf4eba51c988510126c6a25cb07ecaae7a1c Mon Sep 17 00:00:00 2001 From: ConnorYoh <40631091+ConnorYoh@users.noreply.github.com> Date: Sat, 22 Feb 2025 01:36:55 +0000 Subject: [PATCH] 2299 feature request language selection overhaul (#3017) # Description of Changes Please provide a summary of the changes, including: - UI design of language drop down has changed - too few languages were visible on the drop down - Flags caused controversy - Scaling window due to size required adding some /@media CSS tags in navbar css Closes #(2299) --- ## Checklist ### General - [x ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ x] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ x] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [ x] I have performed a self-review of my own code - [x ] My changes generate no new warnings ### Documentation - [x ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details. --------- Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- HowToAddNewLanguage.md | 4 +- src/main/resources/static/css/navbar.css | 68 +++++- src/main/resources/static/images/flags/az.svg | 8 - src/main/resources/static/images/flags/bg.svg | 1 - src/main/resources/static/images/flags/cn.svg | 1 - src/main/resources/static/images/flags/cz.svg | 1 - src/main/resources/static/images/flags/de.svg | 1 - src/main/resources/static/images/flags/dk.svg | 5 - .../resources/static/images/flags/es-ct.svg | 1 - src/main/resources/static/images/flags/es.svg | 1 - src/main/resources/static/images/flags/eu.svg | 1 - src/main/resources/static/images/flags/fr.svg | 1 - src/main/resources/static/images/flags/gb.svg | 1 - src/main/resources/static/images/flags/gr.svg | 1 - src/main/resources/static/images/flags/hr.svg | 1 - src/main/resources/static/images/flags/hu.svg | 1 - src/main/resources/static/images/flags/id.svg | 1 - src/main/resources/static/images/flags/ie.svg | 7 - src/main/resources/static/images/flags/in.svg | 1 - src/main/resources/static/images/flags/ir.svg | 219 ------------------ src/main/resources/static/images/flags/it.svg | 1 - src/main/resources/static/images/flags/jp.svg | 1 - src/main/resources/static/images/flags/kr.svg | 1 - src/main/resources/static/images/flags/nl.svg | 1 - src/main/resources/static/images/flags/no.svg | 1 - src/main/resources/static/images/flags/pl.svg | 1 - .../resources/static/images/flags/pt_br.svg | 1 - .../resources/static/images/flags/pt_pt.svg | 1 - src/main/resources/static/images/flags/ro.svg | 1 - src/main/resources/static/images/flags/rs.svg | 1 - src/main/resources/static/images/flags/ru.svg | 1 - src/main/resources/static/images/flags/sa.svg | 1 - src/main/resources/static/images/flags/se.svg | 1 - src/main/resources/static/images/flags/si.svg | 18 -- src/main/resources/static/images/flags/sk.svg | 1 - src/main/resources/static/images/flags/th.svg | 1 - src/main/resources/static/images/flags/tr.svg | 1 - src/main/resources/static/images/flags/tw.svg | 1 - src/main/resources/static/images/flags/ua.svg | 1 - src/main/resources/static/images/flags/us.svg | 1 - src/main/resources/static/images/flags/vn.svg | 11 - .../templates/fragments/languageEntry.html | 7 + .../templates/fragments/languages.html | 83 +++---- .../resources/templates/fragments/navbar.html | 2 +- 44 files changed, 117 insertions(+), 348 deletions(-) delete mode 100644 src/main/resources/static/images/flags/az.svg delete mode 100644 src/main/resources/static/images/flags/bg.svg delete mode 100644 src/main/resources/static/images/flags/cn.svg delete mode 100644 src/main/resources/static/images/flags/cz.svg delete mode 100644 src/main/resources/static/images/flags/de.svg delete mode 100644 src/main/resources/static/images/flags/dk.svg delete mode 100644 src/main/resources/static/images/flags/es-ct.svg delete mode 100644 src/main/resources/static/images/flags/es.svg delete mode 100644 src/main/resources/static/images/flags/eu.svg delete mode 100644 src/main/resources/static/images/flags/fr.svg delete mode 100644 src/main/resources/static/images/flags/gb.svg delete mode 100644 src/main/resources/static/images/flags/gr.svg delete mode 100644 src/main/resources/static/images/flags/hr.svg delete mode 100644 src/main/resources/static/images/flags/hu.svg delete mode 100644 src/main/resources/static/images/flags/id.svg delete mode 100644 src/main/resources/static/images/flags/ie.svg delete mode 100644 src/main/resources/static/images/flags/in.svg delete mode 100644 src/main/resources/static/images/flags/ir.svg delete mode 100644 src/main/resources/static/images/flags/it.svg delete mode 100644 src/main/resources/static/images/flags/jp.svg delete mode 100755 src/main/resources/static/images/flags/kr.svg delete mode 100644 src/main/resources/static/images/flags/nl.svg delete mode 100644 src/main/resources/static/images/flags/no.svg delete mode 100644 src/main/resources/static/images/flags/pl.svg delete mode 100644 src/main/resources/static/images/flags/pt_br.svg delete mode 100644 src/main/resources/static/images/flags/pt_pt.svg delete mode 100644 src/main/resources/static/images/flags/ro.svg delete mode 100644 src/main/resources/static/images/flags/rs.svg delete mode 100644 src/main/resources/static/images/flags/ru.svg delete mode 100644 src/main/resources/static/images/flags/sa.svg delete mode 100644 src/main/resources/static/images/flags/se.svg delete mode 100644 src/main/resources/static/images/flags/si.svg delete mode 100644 src/main/resources/static/images/flags/sk.svg delete mode 100644 src/main/resources/static/images/flags/th.svg delete mode 100644 src/main/resources/static/images/flags/tr.svg delete mode 100644 src/main/resources/static/images/flags/tw.svg delete mode 100644 src/main/resources/static/images/flags/ua.svg delete mode 100644 src/main/resources/static/images/flags/us.svg delete mode 100644 src/main/resources/static/images/flags/vn.svg create mode 100644 src/main/resources/templates/fragments/languageEntry.html diff --git a/HowToAddNewLanguage.md b/HowToAddNewLanguage.md index 16d457f7..c1fb7c12 100644 --- a/HowToAddNewLanguage.md +++ b/HowToAddNewLanguage.md @@ -11,14 +11,12 @@ Fork Stirling-PDF and create a new branch out of `main`. Then add a reference to the language in the navbar by adding a new language entry to the dropdown: - Edit the file: [languages.html](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/templates/fragments/languages.html) -- Add a flag SVG file to: [flags directory](https://github.com/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/static/images/flags) -Any SVG flags are fine; most of the current ones were sourced from [here](https://flagicons.lipis.dev/). If your language isn't represented by a flag, choose a similar one, such as Saudi Arabia's flag for Arabic. For example, to add Polish, you would add: ```html - icon Polski +
``` The `data-bs-language-code` is the code used to reference the file in the next step. diff --git a/src/main/resources/static/css/navbar.css b/src/main/resources/static/css/navbar.css index a985fa1a..e1d2ad49 100644 --- a/src/main/resources/static/css/navbar.css +++ b/src/main/resources/static/css/navbar.css @@ -83,6 +83,55 @@ vertical-align: middle; } + +.scalable-languages-container { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); /* Auto-fill columns, with a minimum width of 180px */ +} + +html[dir="ltr"] .lang-dropdown-item-wrapper { + border-right: 2px solid var(--md-nav-color-on-seperator); +} + +html[dir="rtl"] .lang-dropdown-item-wrapper { + border-left: 2px solid var(--md-nav-color-on-seperator); +} + +/* Responsive adjustments */ +@media (min-width: 1200px){ + .lang_dropdown-mw{ + min-width: 800px + } +} + +@media (max-width: 600px) { + .scalable-languages-container { + grid-template-columns: repeat(2, 1fr); + } + + .scalable-languages-container .lang-dropdown-item-wrapper:nth-child(2n) { + border: 0px + } +} + +@media (min-width: 601px) and (max-width: 900px) { + .scalable-languages-container { + grid-template-columns: repeat(3, 1fr); + } + .scalable-languages-container .lang-dropdown-item-wrapper:nth-child(3n) { + border: 0px +} +} +@media (min-width: 901px) { + .scalable-languages-container { + grid-template-columns: repeat(4, 1fr); + } + + .scalable-languages-container .lang-dropdown-item-wrapper:nth-child(4n) { + border: 0px + } +} + .dropdown-item .icon-text { text-wrap: wrap; word-break: break-word; @@ -173,6 +222,7 @@ span.icon-text::after { .scrollable-y { overflow-y: scroll; height: 190px; + overscroll-behavior: contain; } .scrollable-y::-webkit-scrollbar { @@ -291,20 +341,34 @@ span.icon-text::after { } /* Dropdown open on hover */ -.dropdown-menu { +html[dir="ltr"] .dropdown-menu { padding-top: 0.5rem; top: auto; left: auto; right: 0; } -.dropdown-menu[data-bs-popper] { +html[dir="rtl"] .dropdown-menu { + padding-top: 0.5rem; + top: auto; + left: 0; + right: auto; +} + +html[dir="ltr"] .dropdown-menu[data-bs-popper] { top: auto; left: auto; right: 0; margin-top: 0 !important; } +html[dir="rtl"] .dropdown-menu[data-bs-popper] { + top: auto; + left: 0; + right: auto; + margin-top: 0 !important; +} + .dropdown-menu-wrapper { padding: 1.5rem 0; border-radius: 1rem; diff --git a/src/main/resources/static/images/flags/az.svg b/src/main/resources/static/images/flags/az.svg deleted file mode 100644 index 35575221..00000000 --- a/src/main/resources/static/images/flags/az.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/static/images/flags/bg.svg b/src/main/resources/static/images/flags/bg.svg deleted file mode 100644 index 8f51e0b1..00000000 --- a/src/main/resources/static/images/flags/bg.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/cn.svg b/src/main/resources/static/images/flags/cn.svg deleted file mode 100644 index d941bcd8..00000000 --- a/src/main/resources/static/images/flags/cn.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/cz.svg b/src/main/resources/static/images/flags/cz.svg deleted file mode 100644 index dfc56f28..00000000 --- a/src/main/resources/static/images/flags/cz.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/de.svg b/src/main/resources/static/images/flags/de.svg deleted file mode 100644 index 9ec0846c..00000000 --- a/src/main/resources/static/images/flags/de.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/dk.svg b/src/main/resources/static/images/flags/dk.svg deleted file mode 100644 index 563277f8..00000000 --- a/src/main/resources/static/images/flags/dk.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/static/images/flags/es-ct.svg b/src/main/resources/static/images/flags/es-ct.svg deleted file mode 100644 index 275de1c9..00000000 --- a/src/main/resources/static/images/flags/es-ct.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/es.svg b/src/main/resources/static/images/flags/es.svg deleted file mode 100644 index aa686b62..00000000 --- a/src/main/resources/static/images/flags/es.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/eu.svg b/src/main/resources/static/images/flags/eu.svg deleted file mode 100644 index 9d72c54f..00000000 --- a/src/main/resources/static/images/flags/eu.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/fr.svg b/src/main/resources/static/images/flags/fr.svg deleted file mode 100644 index bf088aea..00000000 --- a/src/main/resources/static/images/flags/fr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/gb.svg b/src/main/resources/static/images/flags/gb.svg deleted file mode 100644 index 12256010..00000000 --- a/src/main/resources/static/images/flags/gb.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/gr.svg b/src/main/resources/static/images/flags/gr.svg deleted file mode 100644 index 1b38f529..00000000 --- a/src/main/resources/static/images/flags/gr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/hr.svg b/src/main/resources/static/images/flags/hr.svg deleted file mode 100644 index 515dd26f..00000000 --- a/src/main/resources/static/images/flags/hr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/hu.svg b/src/main/resources/static/images/flags/hu.svg deleted file mode 100644 index 8f3de064..00000000 --- a/src/main/resources/static/images/flags/hu.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/id.svg b/src/main/resources/static/images/flags/id.svg deleted file mode 100644 index 2d908da1..00000000 --- a/src/main/resources/static/images/flags/id.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/ie.svg b/src/main/resources/static/images/flags/ie.svg deleted file mode 100644 index 049be14d..00000000 --- a/src/main/resources/static/images/flags/ie.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/main/resources/static/images/flags/in.svg b/src/main/resources/static/images/flags/in.svg deleted file mode 100644 index 8c9991e8..00000000 --- a/src/main/resources/static/images/flags/in.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/ir.svg b/src/main/resources/static/images/flags/ir.svg deleted file mode 100644 index 8c6d5162..00000000 --- a/src/main/resources/static/images/flags/ir.svg +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/static/images/flags/it.svg b/src/main/resources/static/images/flags/it.svg deleted file mode 100644 index f9864d70..00000000 --- a/src/main/resources/static/images/flags/it.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/jp.svg b/src/main/resources/static/images/flags/jp.svg deleted file mode 100644 index 1084a660..00000000 --- a/src/main/resources/static/images/flags/jp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/kr.svg b/src/main/resources/static/images/flags/kr.svg deleted file mode 100755 index 1f753a76..00000000 --- a/src/main/resources/static/images/flags/kr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/nl.svg b/src/main/resources/static/images/flags/nl.svg deleted file mode 100644 index 6554f56b..00000000 --- a/src/main/resources/static/images/flags/nl.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/no.svg b/src/main/resources/static/images/flags/no.svg deleted file mode 100644 index 4a520cd6..00000000 --- a/src/main/resources/static/images/flags/no.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/pl.svg b/src/main/resources/static/images/flags/pl.svg deleted file mode 100644 index 7a50bf2c..00000000 --- a/src/main/resources/static/images/flags/pl.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/pt_br.svg b/src/main/resources/static/images/flags/pt_br.svg deleted file mode 100644 index c1e87dd1..00000000 --- a/src/main/resources/static/images/flags/pt_br.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/pt_pt.svg b/src/main/resources/static/images/flags/pt_pt.svg deleted file mode 100644 index 241fdd2c..00000000 --- a/src/main/resources/static/images/flags/pt_pt.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/ro.svg b/src/main/resources/static/images/flags/ro.svg deleted file mode 100644 index 80d68ba9..00000000 --- a/src/main/resources/static/images/flags/ro.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/rs.svg b/src/main/resources/static/images/flags/rs.svg deleted file mode 100644 index 9683e934..00000000 --- a/src/main/resources/static/images/flags/rs.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/ru.svg b/src/main/resources/static/images/flags/ru.svg deleted file mode 100644 index 154117a9..00000000 --- a/src/main/resources/static/images/flags/ru.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/sa.svg b/src/main/resources/static/images/flags/sa.svg deleted file mode 100644 index 914338b4..00000000 --- a/src/main/resources/static/images/flags/sa.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/se.svg b/src/main/resources/static/images/flags/se.svg deleted file mode 100644 index fa00d407..00000000 --- a/src/main/resources/static/images/flags/se.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/si.svg b/src/main/resources/static/images/flags/si.svg deleted file mode 100644 index 1bbdd94f..00000000 --- a/src/main/resources/static/images/flags/si.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/static/images/flags/sk.svg b/src/main/resources/static/images/flags/sk.svg deleted file mode 100644 index 813381da..00000000 --- a/src/main/resources/static/images/flags/sk.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/th.svg b/src/main/resources/static/images/flags/th.svg deleted file mode 100644 index 7e67ea6b..00000000 --- a/src/main/resources/static/images/flags/th.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/tr.svg b/src/main/resources/static/images/flags/tr.svg deleted file mode 100644 index 87b5e9f2..00000000 --- a/src/main/resources/static/images/flags/tr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/tw.svg b/src/main/resources/static/images/flags/tw.svg deleted file mode 100644 index 86084de2..00000000 --- a/src/main/resources/static/images/flags/tw.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/ua.svg b/src/main/resources/static/images/flags/ua.svg deleted file mode 100644 index 51eacf09..00000000 --- a/src/main/resources/static/images/flags/ua.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/us.svg b/src/main/resources/static/images/flags/us.svg deleted file mode 100644 index 06858149..00000000 --- a/src/main/resources/static/images/flags/us.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/static/images/flags/vn.svg b/src/main/resources/static/images/flags/vn.svg deleted file mode 100644 index 7e4bac8f..00000000 --- a/src/main/resources/static/images/flags/vn.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/main/resources/templates/fragments/languageEntry.html b/src/main/resources/templates/fragments/languageEntry.html new file mode 100644 index 00000000..410b6a6c --- /dev/null +++ b/src/main/resources/templates/fragments/languageEntry.html @@ -0,0 +1,7 @@ + +
+ + +
+ diff --git a/src/main/resources/templates/fragments/languages.html b/src/main/resources/templates/fragments/languages.html index 50d73f3a..939e5ad6 100644 --- a/src/main/resources/templates/fragments/languages.html +++ b/src/main/resources/templates/fragments/languages.html @@ -1,42 +1,43 @@ - icon Български - icon العربية - icon Català - icon 简体中文 - icon 繁體中文 - icon བོད་ཡིག - icon Azərbaycan Dili - icon Dansk - icon Deutsch - icon English (GB) - icon English (US) - icon Euskara - icon Español - icon Français - icon Indonesia - icon Irish - icon Italiano - icon Nederlands - icon پارسی - icon Polski - icon Português (BR) - icon Português (PT) - icon Romanian - icon Slovensky - icon Slovenian - icon Svenska - icon Türkçe - icon Русский - icon 한국어 - icon 日本語 - icon Ελληνικά - icon Hungarian - icon हिन्दी - icon Srpski - icon Українська - icon Česky - icon Hrvatski - icon Norsk - icon ไทย - icon Tiếng Việt - +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 403a8df3..09160ee2 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -143,7 +143,7 @@
-
+