Skip to content

Commit

Permalink
Merge pull request #166 from mikicvi/main
Browse files Browse the repository at this point in the history
Fix: md editor dividers, dark theme md, title, toolbar, tag contents
  • Loading branch information
andrejilderda authored Jan 19, 2025
2 parents 3ceb57c + 3b3bcc2 commit 6c1f312
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .changeset/soft-flowers-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"joplin-plugin-macos-theme": patch
---

- fix: styling of editor dividers, dark theme, title, toolbar and tag contents
- fix: styling of notebook folder when in all notes or tag view
26 changes: 23 additions & 3 deletions src/scss/components/_components.editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,17 @@
background-color: transparent !important;
}

// title, toolbar, editor - background color -
@media (prefers-color-scheme: dark) {
background-color: #1f1f1f;
}

// remove bg color when no note is selected when search returns no results
> div > div {
background-color: transparent !important;
}

> div > div > div > div {
> div > div > div > div > div {
&:first-child {
// note title
.title-input {
Expand Down Expand Up @@ -487,7 +492,7 @@
}

// markdown editor
> div > div > div > div:not(:first-child) {
> div > div > div > div > div:not(:first-child) {
.editor-toolbar {
&:after {
@include editorDivider();
Expand Down Expand Up @@ -737,6 +742,7 @@
.tag-bar {
> div {
position: relative;
align-items: baseline !important;
}

button {
Expand Down Expand Up @@ -787,12 +793,26 @@
margin-right: 0.8rem !important;
}
}
// prevent overlaying content, space between items
button {
color: var(--g-secondaryLabelColor) !important;
display: contents !important;

&::after {
content: ", ";
white-space: pre;
}

&:last-child::after {
padding-right: 1rem;
content: ""; // remove the comma after the last button
}
}
}
}

// find in note (unused? replaced in the meantime?)
.note-search-bar {
background-color: red !important;
border-top-color: var(--g-gridColor) !important;
padding-left: 0.8rem;
position: relative;
Expand Down

0 comments on commit 6c1f312

Please sign in to comment.