diff --git a/package-lock.json b/package-lock.json index 631d232..de7fae4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "libre-study", - "version": "0.1.13", + "version": "0.1.14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "libre-study", - "version": "0.1.13", + "version": "0.1.14", "dependencies": { "@tauri-apps/api": "^2.11.1", "react": "^19.2.7", diff --git a/package.json b/package.json index 9e960ce..ba67df3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "libre-study", "private": true, - "version": "0.1.13", + "version": "0.1.14", "type": "module", "scripts": { "dev": "vite --host 127.0.0.1", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 437bd2d..fa92be1 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -77,7 +77,7 @@ checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "app" -version = "0.1.13" +version = "0.1.14" dependencies = [ "log", "rusqlite", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b897271..7cc9a59 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "app" -version = "0.1.13" +version = "0.1.14" description = "A Tauri App" authors = ["you"] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 310346e..0b1e343 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "productName": "Libre Study", - "version": "0.1.13", + "version": "0.1.14", "identifier": "org.librestudy.desktop", "build": { "frontendDist": "../dist", diff --git a/src/App.css b/src/App.css index 06c67b9..9c37e01 100644 --- a/src/App.css +++ b/src/App.css @@ -161,12 +161,11 @@ .top-bar { display: grid; - grid-template-columns: minmax(260px, 0.8fr) minmax(420px, 1.1fr) minmax(300px, 0.65fr); - gap: 14px; + grid-template-columns: minmax(760px, 1.42fr) minmax(320px, 0.58fr); + gap: 6px; align-items: end; } -.version-block h1, .study-margin h2, .notes-workspace h2, .strong-focus h4 { @@ -174,12 +173,6 @@ letter-spacing: 0; } -.version-block h1 { - margin-top: 3px; - font-size: 24px; - line-height: 1.15; -} - .eyebrow { color: #657061; font-size: 12px; @@ -240,6 +233,7 @@ textarea:focus-visible { grid-template-columns: minmax(130px, 1.1fr) minmax(130px, 1.3fr) minmax(86px, 0.7fr) minmax(78px, 0.6fr) minmax(120px, 0.9fr); gap: 8px; align-items: end; + max-width: 960px; } .page-controls label { @@ -255,7 +249,7 @@ textarea:focus-visible { .study-desk { display: grid; grid-template-columns: minmax(720px, 1fr); - gap: 16px; + gap: 6px; min-height: 0; } @@ -466,6 +460,17 @@ textarea:focus-visible { gap: 8px; align-items: center; justify-content: space-between; + margin: -6px -6px 2px; + padding: 7px 8px; + border-radius: 5px; + background: #f5efe1; + cursor: pointer; +} + +.margin-section-header:hover, +.margin-section-header:focus-visible { + background: #efe5d0; + outline: none; } .collapse-button, @@ -480,8 +485,10 @@ textarea:focus-visible { } .collapse-button { + flex: 1; padding: 0; text-align: left; + cursor: pointer; } .collapse-button::before { @@ -736,6 +743,34 @@ textarea:focus-visible { text-align: left; } +.notes-quick-panels { + display: grid; + grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); + gap: 8px; + margin-top: auto; +} + +.notes-quick-panels .note-helper { + margin-top: 0; +} + +.note-placeholder { + display: grid; + align-content: center; + gap: 4px; + width: 100%; + padding: 12px; + border-color: #ded6c7; + background: #fbf8ef; + color: #202124; + text-align: left; +} + +.note-placeholder small { + color: #657061; + font-size: 12px; +} + .note-helper strong, .note-helper small { display: block; diff --git a/src/App.tsx b/src/App.tsx index e2baab9..62e7159 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -758,15 +758,32 @@ function App() { return (
-
+
setOriginalCollapsed((current) => !current)} + onKeyDown={(event) => { + if (event.key === 'Enter' || event.key === ' ') { + event.preventDefault() + setOriginalCollapsed((current) => !current) + } + }} + > -
@@ -801,15 +818,32 @@ function App() { return (
-
+
setLinkedCollapsed((current) => !current)} + onKeyDown={(event) => { + if (event.key === 'Enter' || event.key === ' ') { + event.preventDefault() + setLinkedCollapsed((current) => !current) + } + }} + > -
@@ -870,7 +904,7 @@ function App() { - {pageRange} + King James Version - {pageRange} @@ -895,11 +929,21 @@ function App() { {renderLinkedEnglishLine()} {selectedStrongEntry ? (
-
+
setDefinitionCollapsed((current) => !current)} + onKeyDown={(event) => { + if (event.key === 'Enter' || event.key === ' ') { + event.preventDefault() + setDefinitionCollapsed((current) => !current) + } + }} + > @@ -1375,10 +1419,6 @@ function App() { ) : selectedVerse ? ( <>
-
- King James Version -

{pageRange}

-
- +
+ + +
) : null}