1.15.4

Tweak sidebar width
Remove obsolete styles
2026-03-17 20:08:37 +04:00 · 2026-03-17 20:07:49 +04:00 · 2026-03-17 16:59:54 +04:00 · 2026-03-17 16:55:31 +04:00 · 2026-03-17 16:54:41 +04:00 · 2026-03-17 16:35:10 +04:00
12 changed files with 161 additions and 78 deletions
--- a/app/components/app-menu/about.gjs
+++ b/app/components/app-menu/about.gjs
@@ -14,7 +14,7 @@ import Icon from '#components/icon';
  </div>

  <div class="sidebar-content">
-    <section class="settings-section">
+    <section class="about-section">
      <p>
        <strong>Marco</strong>
        (as in
@@ -41,31 +41,78 @@ import Icon from '#components/icon';
          <span>Open Source</span>
        </summary>
        <div class="details-content">
-          <ul class="link-list">
-            <li>
-              <a
-                href="https://gitea.kosmos.org/raucao/marco"
-                target="_blank"
-                rel="noopener"
-              >
-                Source Code
-              </a>
-              (<a
-                href="https://en.wikipedia.org/wiki/GNU_Affero_General_Public_License"
-                target="_blank"
-                rel="noopener"
-              >AGPL</a>)
-            </li>
-            <li>
-              <a
-                href="https://openstreetmap.org/copyright"
-                target="_blank"
-                rel="noopener"
-              >
-                Map Data © OpenStreetMap
-              </a>
-            </li>
-          </ul>
+          <table>
+            <thead>
+              <tr>
+                <th>Source</th>
+                <th>License</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>
+                  <a
+                    href="https://gitea.kosmos.org/raucao/marco"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    Marco App
+                  </a>
+                </td>
+                <td>
+                  <a
+                    href="https://en.wikipedia.org/wiki/GNU_Affero_General_Public_License"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    <abbr title="GNU Affero General Public License">AGPL</abbr>
+                  </a>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <a
+                    href="https://openstreetmap.org/copyright"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    Map Data
+                  </a>
+                </td>
+                <td>
+                  <a
+                    href="https://opendatacommons.org/licenses/odbl/"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    <abbr
+                      title="Open Data Commons Open Database License"
+                    >ODbL</abbr>
+                  </a>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <a
+                    href="https://github.com/feathericons/feather"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    Feather Icons
+                  </a>
+                </td>
+                <td>
+                  <a
+                    href="https://en.wikipedia.org/wiki/MIT_License"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    <abbr title="MIT License">MIT</abbr>
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
        </div>
      </details>
      <details>
@@ -74,6 +121,30 @@ import Icon from '#components/icon';
          <span>Contribute</span>
        </summary>
        <div class="details-content">
+          <p>
+            <strong>Most impactful:</strong>
+            Add and improve data for points of interest in
+            <a
+              href="https://www.openstreetmap.org"
+              target="_blank"
+              rel="noopener"
+            >OpenStreetMap</a>.
+          </p>
+          <p>
+            <strong>Most appreciated:</strong>
+            Use this app as much as you can and
+            <a
+              href="https://community.remotestorage.io/t/marco-an-unhosted-maps-app/941"
+              target="_blank"
+              rel="noopener"
+            >submit feedback</a>
+            about your experience, problems, feature wishes, etc.
+          </p>
+          <p>
+            <strong>Most supportive:</strong>
+            Tell others about this app, on social media, in blog posts,
+            educational videos, etc.
+          </p>
        </div>
      </details>
    </section>
--- a/app/components/app-menu/index.gjs
+++ b/app/components/app-menu/index.gjs
@@ -17,7 +17,7 @@ export default class AppMenu extends Component {
  }

  <template>
-    <div class="sidebar settings-pane">
+    <div class="sidebar app-menu-pane">
      {{#if (eq this.currentView "menu")}}
        <AppMenuHome @onNavigate={{this.setView}} @onClose={{@onClose}} />

--- a/app/components/place-details.gjs
+++ b/app/components/place-details.gjs
@@ -286,7 +286,7 @@ export default class PlaceDetails extends Component {
          >
            <Icon
              @name="bookmark"
-              @color={{if this.isSaved "currentColor" "#007bff"}}
+              @color={{if this.isSaved "currentColor" "var(--link-color)"}}
            />
            {{if this.isSaved "Saved" "Save"}}
          </button>
@@ -307,7 +307,7 @@ export default class PlaceDetails extends Component {
            title="Edit"
            {{on "click" this.startEditing}}
          >
-            <Icon @name="edit" @color="#007bff" />
+            <Icon @name="edit" @color="var(--link-color)" />
            Edit
          </button>
        {{/if}}
--- a/app/components/places-sidebar.gjs
+++ b/app/components/places-sidebar.gjs
@@ -226,7 +226,7 @@ export default class PlacesSidebar extends Component {
            class="btn btn-outline create-place"
            {{on "click" this.createNewPlace}}
          >
-            <Icon @name="plus" @size={{18}} @color="#007bff" />
+            <Icon @name="plus" @size={{18}} @color="var(--link-color)" />
            Create new place
          </button>
        {{/if}}
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -3,7 +3,9 @@
 :root {
  --default-list-color: #fc3;
  --hover-bg: #f8f9fa;
-  --sidebar-width: 360px;
+  --sidebar-width: 350px;
+  --link-color: #2a7fff;
+  --link-color-visited: #6a4fbf;
 }

 html,
@@ -186,7 +188,7 @@ body {
 }

 .text-primary {
-  color: #007bff;
+  color: var(--link-color);
 }

 .text-danger {
@@ -212,12 +214,12 @@ body {
  overflow: hidden; /* Ensure flex children are contained */
 }

-.settings-pane.sidebar {
+.sidebar.app-menu-pane {
  z-index: 3200; /* Higher than Places Sidebar (3100) */
 }

@media (width <= 768px) {
-  .settings-pane.sidebar {
+  .sidebar.app-menu-pane {
    width: 100%;
    right: 0;
    border-radius: 16px 16px 0 0;
@@ -253,6 +255,10 @@ body {
  overscroll-behavior: contain;
 }

+.app-menu-pane .sidebar-content {
+  padding-top: 0.5rem;
+}
+
 .app-menu {
  list-style: none;
  padding: 0;
@@ -333,13 +339,9 @@ body {
 }

 .sidebar-content details .details-content {
-  padding: 1rem 1.4rem;
+  padding: 0 1.4rem 1rem;
  animation: details-slide-down 0.2s ease-out;
-}
-
-.sidebar-content details .link-list {
-  padding: 0;
-  margin: 0;
+  font-size: 0.9rem;
 }

@keyframes details-slide-down {
@@ -354,14 +356,6 @@ body {
  }
 }

-.sidebar-content details .link-list li {
-  margin-bottom: 0.5rem;
-}
-
-.sidebar-content details .link-list li:last-child {
-  margin-bottom: 0;
-}
-
 .edit-form {
  margin: -1rem;
  margin-bottom: 1rem;
@@ -387,7 +381,7 @@ body {
  border: 1px solid #ddd;
  border-radius: 4px;
  font-family: inherit;
-  font-size: 0.95rem;
+  font-size: 1rem;
  box-sizing: border-box; /* Ensure padding doesn't overflow width */
  color: #333;
  background-color: #fff;
@@ -395,8 +389,8 @@ body {

 .form-control:focus {
  outline: none;
-  border-color: #007bff;
-  box-shadow: 0 0 0 2px rgb(0 123 255 / 10%);
+  border-color: var(--link-color);
+  box-shadow: 0 0 0 2px rgb(42 127 255 / 10%);
 }

 select.form-control {
@@ -425,12 +419,20 @@ select.form-control {
  margin-top: 1rem;
 }

-.settings-section p a {
-  color: #007bff;
+.about-section {
+  margin-bottom: 2rem;
+}
+
+.about-section a {
+  color: var(--link-color);
  text-decoration: none;
 }

-.settings-section p a:hover {
+.about-section a:visited {
+  color: var(--link-color-visited);
+}
+
+.about-section a:hover {
  text-decoration: underline;
 }

@@ -439,7 +441,7 @@ select.form-control {
 }

 .btn-primary {
-  background: #007bff;
+  background: var(--link-color);
  color: white;
  border: none;
  padding: 0.75rem;
@@ -468,7 +470,7 @@ select.form-control {
 }

 .meta-info a {
-  color: #007bff;
+  color: var(--link-color);
  text-decoration: none;
 }

@@ -476,24 +478,34 @@ select.form-control {
  text-decoration: underline;
 }

-.link-list {
-  list-style: none;
-  padding: 0;
-  margin: 0;
+.sidebar-content table {
+  width: 100%;
+  border-collapse: collapse;
 }

-.link-list li {
-  margin-bottom: 0.5rem;
+.sidebar-content table th,
+.sidebar-content table td {
+  padding: 0.5rem 0;
+  text-align: left;
 }

-.link-list a {
-  color: #007bff;
-  text-decoration: none;
-  font-size: 0.95rem;
+.sidebar-content table th {
+  font-size: 0.75rem;
+  font-weight: bold;
+  text-transform: uppercase;
+  color: #898989;
 }

-.link-list a:hover {
-  text-decoration: underline;
+.sidebar-content table td {
+  border-bottom: 1px solid #f9f9f9;
+}
+
+.sidebar-content table tr:last-child td {
+  border-bottom: none;
+}
+
+abbr[title] {
+  text-decoration: underline dotted;
 }

 .places-list {
@@ -612,7 +624,7 @@ select.form-control {
 }

 .btn-blue {
-  background: #007bff;
+  background: var(--link-color);
  color: white;
  border: none;
 }
@@ -1152,7 +1164,7 @@ button.create-place {
 }

 .place-lists-manager input[type='checkbox'] {
-  accent-color: #007bff;
+  accent-color: var(--link-color);
  width: 16px;
  height: 16px;
  cursor: pointer;
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "marco",
-  "version": "1.14.0",
+  "version": "1.15.4",
  "private": true,
  "description": "Unhosted maps app",
  "repository": {
@@ -35,7 +35,7 @@
    "lint:js:fix": "eslint . --fix",
    "start": "vite",
    "test": "vite build --mode development && testem ci --port 0",
-    "preversion": "pnpm test",
+    "preversion": "pnpm lint && pnpm test",
    "version": "pnpm build && git add release/"
  },
  "devDependencies": {
--- a/release/assets/main-BOfcjRke.css
+++ b/release/assets/main-BOfcjRke.css
--- a/release/assets/main-BT0n1kYB.css
+++ b/release/assets/main-BT0n1kYB.css
--- a/release/assets/main-Bzf0iwOa.js
+++ b/release/assets/main-Bzf0iwOa.js
--- a/release/assets/main-GynTgP18.js
+++ b/release/assets/main-GynTgP18.js
--- a/release/assets/modules-4-12-Ymc37fr4.js
+++ b/release/assets/modules-4-12-Ymc37fr4.js
--- a/release/index.html
+++ b/release/index.html
@@ -39,8 +39,8 @@
    <meta name="msapplication-TileColor" content="#F6E9A6">
    <meta name="msapplication-TileImage" content="/icons/icon-144.png">

-  <script type="module" crossorigin src="/assets/main-GynTgP18.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/main-BT0n1kYB.css">
+  <script type="module" crossorigin src="/assets/main-Bzf0iwOa.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/main-BOfcjRke.css">
 </head>
  <body>
 </body>
Author	SHA1	Message	Date
Râu Cao	f7c40095d5	1.15.4 All checks were successful CI / Lint (push) Successful in 50s Details CI / Test (push) Successful in 58s Details	2026-03-17 20:08:37 +04:00
Râu Cao	579892067e	Tweak sidebar width	2026-03-17 20:07:49 +04:00
Râu Cao	48f87f98d6	Remove obsolete styles All checks were successful CI / Lint (push) Successful in 51s Details CI / Test (push) Successful in 57s Details	2026-03-17 16:59:54 +04:00
Râu Cao	3cd1b32af9	1.15.3 All checks were successful CI / Lint (push) Successful in 47s Details CI / Test (push) Successful in 57s Details	2026-03-17 16:55:31 +04:00
Râu Cao	462404b53e	Fix sidebar content padding, class name	2026-03-17 16:54:41 +04:00
Râu Cao	e3147caa90	1.15.2 All checks were successful CI / Lint (push) Successful in 50s Details CI / Test (push) Successful in 59s Details	2026-03-17 16:35:10 +04:00
Râu Cao	7c11fefdb7	Tweak whitespace	2026-03-17 16:34:19 +04:00
Râu Cao	9af6636971	1.15.1 All checks were successful CI / Lint (push) Successful in 47s Details CI / Test (push) Successful in 57s Details	2026-03-17 16:30:18 +04:00
Râu Cao	8ae7fd1fd8	Tweak font sizes All checks were successful CI / Lint (push) Successful in 49s Details CI / Test (push) Successful in 56s Details	2026-03-17 16:25:55 +04:00
Râu Cao	cb3fbade39	Prevent unwanted zoom on iOS All checks were successful CI / Lint (push) Successful in 48s Details CI / Test (push) Successful in 56s Details	2026-03-17 16:17:16 +04:00
Râu Cao	6dfd9765b4	1.15.0 All checks were successful CI / Lint (push) Successful in 53s Details CI / Test (push) Successful in 56s Details	2026-03-17 15:55:15 +04:00
Râu Cao	45eb8f087d	Add linting to preversion script	2026-03-17 15:53:58 +04:00
Râu Cao	3630fae133	Merge pull request 'Improve app menu sidebar, add separate subsections, more content' (#31 ) from feature/app_menu into master All checks were successful CI / Lint (push) Successful in 48s Details CI / Test (push) Successful in 57s Details Reviewed-on: #31	2026-03-17 11:52:42 +00:00
Râu Cao	1116161e93	Add info/links for preferred contributions All checks were successful CI / Lint (pull_request) Successful in 53s Details CI / Test (pull_request) Successful in 56s Details Release Drafter / Update release notes draft (pull_request) Successful in 18s Details	2026-03-17 15:48:11 +04:00
Râu Cao	88eb0ac0c1	WIP About section * Add fold-out sections for additional details * Use table for Open Source info, add licenses * Move link styles to CSS variables	2026-03-17 15:12:29 +04:00