69 Commits

Author SHA1 Message Date
SiriusXT
e5cce1b1bc Fix strange underline for zoom button 2024-09-13 22:24:19 +08:00
SiriusXT
ee06db8c8f Fix strange underline for zoom button 2024-09-13 19:10:44 +08:00
Elian Doran
74645e12fc
Merge remote-tracking branch 'origin/develop' into bootstrap 2024-09-12 20:06:31 +03:00
Elian Doran
a4341a5cac
Merge pull request #392 from SiriusXT/Icon_improvements
Icon improvements
2024-09-11 23:56:10 +03:00
Jin
f3b7261748 fix all launcher bar components 2024-09-10 00:45:00 +02:00
Jin
5d579fee68 Upgrade bootstrap from v4 to v5, fix global menu 2024-09-10 00:44:54 +02:00
Nriver
b78ac44e73 Merge remote-tracking branch 'upstream-next/develop' into feature/i18n 2024-08-09 13:36:48 +08:00
Elian Doran
42058034a5
client: Fix redirecting to wrong URL for downloading new version (closes #313) 2024-08-09 00:54:26 +03:00
Nriver
14bdd3819f Merge remote-tracking branch 'upstream-next/develop' into feature/i18n 2024-08-07 16:56:36 +08:00
Elian Doran
80289b8059
client: Fix icon jumping on hover 2024-08-03 21:43:49 +03:00
Elian Doran
96aecf8544
client: Match original size icon slightly 2024-08-03 21:40:07 +03:00
Elian Doran
deb2f389df
client: Use correct color 2024-08-03 21:37:46 +03:00
Elian Doran
ab25778e7e
client: Embed SVG directly 2024-08-03 21:35:16 +03:00
Nriver
8a0fec0a63 add translation for buttons: global menu 2024-08-01 13:54:59 +08:00
Elian Doran
997da1c3bc client: Change URL for checking updates (not testable yet) 2024-07-22 19:40:00 +03:00
Elian Doran
590442b0d5
client,server: Trilium Notes -> TriliumNext Notes (closes #195) 2024-07-14 21:20:42 +03:00
zadam
5c10fc26be Merge branch 'beta'
# Conflicts:
#	package.json
#	src/public/app/layouts/desktop_layout.js
2023-10-20 09:15:48 +02:00
zadam
38db7f9db7 style tweaks #4338 2023-10-19 23:54:36 +02:00
SnnBcd xt
21098be307 Click the button to reset the zoom level 2023-09-01 03:30:39 +00:00
zadam
a154bea016 Merge branch 'master' into next60 2023-04-11 17:02:24 +02:00
zadam
79a6baca6f adjust logo sizing/positioning 2023-03-26 23:23:13 +02:00
Matt
53b4f0e0d5 Add svg icons 2023-03-26 19:29:52 +00:00
zadam
fd8a2d4d92 hide global menu after changing note/context 2023-03-24 09:32:06 +01:00
zadam
400b14e021 removed remnants of dev branch 2023-02-17 16:44:04 +01:00
zadam
42e08284b0 Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js
2023-02-15 23:47:41 +01:00
zadam
cbabaa6b0c move advanced menu slightly below to not overlay the text 2023-02-15 14:49:58 +01:00
zadam
6a6ae359b6 Merge branch 'master' into dev
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
2023-01-17 22:20:10 +01:00
zadam
b567775129 small fixes of steel blue theme 2023-01-17 21:06:30 +01:00
zadam
957640f163 Merge branch 'master' into dev 2023-01-02 22:53:03 +01:00
zadam
115bf0af4d fix button paddings 2023-01-02 21:08:20 +01:00
zadam
d2b906bc1b global menu can open the user guide 2022-12-30 17:41:45 +01:00
zadam
7c98ade72b fix missing doc resources for launchers, closes #3455 2022-12-25 11:58:24 +01:00
zadam
1b24276a4a always use template strings instead of string concatenation 2022-12-21 15:19:05 +01:00
zadam
195c6a4089 backend log improvements 2022-12-15 16:38:05 +01:00
zadam
1b6d0c9bbc global menu improvements 2022-12-14 10:29:14 +01:00
zadam
173b28062e advanced submenu is available in mobile 2022-12-13 22:29:26 +01:00
zadam
2957e1d78a improvements in mobile layout for launchbar 2022-12-12 23:48:34 +01:00
zadam
23322455a3 mobile layout now has launchbar 2022-12-11 22:26:18 +01:00
zadam
5f6a10ef22 options widget work 2022-12-07 15:37:53 +01:00
zadam
aec2c2d5cd appearance options as a special note 2022-12-05 23:57:29 +01:00
zadam
b55c2d3dbc shortcut improvements 2022-12-01 10:03:04 +01:00
zadam
6883b71ce7 shortcut improvements 2022-11-25 15:29:57 +01:00
zadam
70552d58ac global menu styling improvements 2022-11-25 09:21:56 +01:00
zadam
c7bda4d0be global menu ref 2022-11-24 22:59:09 +01:00
zadam
19126b7c6d Merge branch 'master' into next58
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
2022-11-22 20:46:08 +01:00
zadam
b499640db8 use trilium version number in asset paths to avoid caching issues WIP 2022-10-26 23:50:54 +02:00
zadam
c16f7a5e02 Merge branch 'master' into next55
# Conflicts:
#	electron.js
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/widgets/note_tree.js
#	src/services/port.js
2022-10-15 12:09:25 +02:00
zadam
84f72edf1d use button CSS variables in more places 2022-09-18 13:52:19 +02:00
zadam
01a7ed8311 fix zooming in server install 2022-09-15 23:10:54 +02:00
zadam
e7ef1b86cc zoom buttons in main menu, closes #2894 2022-09-14 23:28:29 +02:00