Skip to content

fix: Make styles compatible with Joplin 3.1.22 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: Make styles compatible with Joplin 3.1.22 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
802b985
Make userchrome.css compatible with Joplin 3.1.22
personalizedrefrigerator Nov 7, 2024
0b189ce
Fix counters in rendered Markdown
personalizedrefrigerator Nov 7, 2024
9b30251
Attempt to make userchrome.css less reliant on how elements are nested
personalizedrefrigerator Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 49 additions & 15 deletions Dark/userchrome.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
--editor-checkbox-color: lightgrey;
--editor-checkbox-checked-color: #FFCB6B; /* orange */
--editor-selected-text-bgcolor: #0663d3; /* blue */
--editor-katex-macro-color: #ff5370; /* red */
--note-count-label-background-color: #1d2927;
--note-count-label-box-shadow: white;
}
Expand All @@ -31,8 +32,12 @@
/*---------------------------------------------------------------------------*/

/*------ Editor: inline code and codeblocks ---------------------------------*/
pre.CodeMirror-line span[role="presentation"] span.cm-comment {
pre.CodeMirror-line span[role="presentation"] span.cm-comment, /* CM5 */
.cm-line.cm-codeBlock, .cm-editor .cm-line .cm-inlineCode /* CM6 */ {
color: var(--editor-code-color) !important;
background-color: transparent;
border: none;
border-width: 0;
}
/*---------------------------------------------------------------------------*/

Expand All @@ -45,31 +50,40 @@ pre.CodeMirror-line span[role="presentation"] span.cm-comment {
/*---------------------------------------------------------------------------*/

/*------ Editor: text in brackets [ ] ---------------------------------------*/
.cm-link-text {
.cm-link-text, /* CM5 */
.cm-editor .tok-link /* CM6 */ {
color: var(--editor-text-in-brackets-color) !important;
}
/*---------------------------------------------------------------------------*/

/*------ Editor: text/link in parens ( ) ------------ ----------------------*/
.cm-string.cm-url {
.cm-string.cm-url, /* CM5 */
.cm-editor .cm-url, /* CM6: Full URL */
.cm-editor .cm-url > .tok-link, /* CM6: Link */
.cm-editor .cm-url + .tok-link, /* CM6: Left paren ( */
.cm-editor .tok-link:has(+ .cm-url) /* CM6: Right paren ) */ {
color: var(--editor-text-in-parens-color) !important;
opacity: 1;
}
/*---------------------------------------------------------------------------*/

/*------ Editor: strong -----------------------------------------------------*/
.cm-strong {
.cm-strong, /* CM5 */
.cm-editor .tok-strong /* CM6 */ {
color: var(--editor-strong-color) !important;
}
/*---------------------------------------------------------------------------*/

/*------ Editor: italics ----------------------------------------------------*/
.cm-em {
.cm-em, /* CM5 */
.cm-editor .tok-emphasis /* CM6 */ {
color: var(--editor-emphasis-color) !important;
}
/*---------------------------------------------------------------------------*/

/*------ Editor: list elements and checkbox elements ------------------------*/
.cm-variable-2, .cm-variable-3, .cm-keyword {
.cm-variable-2, .cm-variable-3, .cm-keyword, /* CM5 */
.cm-editor .cm-listItem /* CM6 */ {
color: var(--editor-list-element-color) !important;
}
/*---------------------------------------------------------------------------*/
Expand All @@ -78,13 +92,29 @@ pre.CodeMirror-line span[role="presentation"] span.cm-comment {
.cm-meta {
color: var(--editor-checkbox-checked-color) !important;
}
.cm-property {
.cm-property, /* CM5 */
.cm-editor .cm-taskMarker span, /* CM6 */
.cm-editor .cm-taskMarker > .tok-atom /* CM6 */ {
color: var(--editor-checkbox-checked-color) !important;
}
/*---------------------------------------------------------------------------*/

/*------ Editor: Katex containers -------------------------------------------*/
.cm-editor .cm-line.cm-mathBlock, .cm-editor .cm-inlineMath {
color: var(--joplin-color);
}
/*---------------------------------------------------------------------------*/

/*------ Editor: Katex macros -----------------------------------------------*/
.cm-editor .cm-mathBlock .tok-typeName,
.cm-editor .cm-inlineMath .tok-typeName {
color: var(--editor-katex-macro-color); /* Use the editor main text color */
}
/*---------------------------------------------------------------------------*/

/*------ Editor: selected text background color -----------------------------*/
.CodeMirror-selected {
.CodeMirror-selected, /* CM5 */
.cm-selectionBackground /* CM6 */ {
background: var(--editor-selected-text-bgcolor) !important;
}
/*---------------------------------------------------------------------------*/
Expand All @@ -106,11 +136,10 @@ a.list-item {
/*---------------------------------------------------------------------------*/

/*------ Notebook pane: Nicer note count label ------------------------------*/
.note-count-label {
.list-item .note-count-label {
display: flex;
margin: 0 4px 0 auto;
padding: 0 6px;
padding-left: 0;
padding: 0px 6px !important;
background: var(--note-count-label-background-color);
border-radius: 8px;
box-shadow: 0 0 2px var(--note-count-label-box-shadow);
Expand Down Expand Up @@ -138,7 +167,7 @@ a.list-item {

/*------ Remove New notebook button -----------------------------------------*/
/*
#react-root > div > div > div.resizableLayoutItem.rli-root > div.resizableLayoutItem.rli-sideBar > div > div > div:nth-child(1) > div:nth-child(1) > button {
.sidebar-header-container > button {
display: none;
}
*/
Expand Down Expand Up @@ -170,15 +199,15 @@ div.new-note-todo-buttons {

/*------ Remove Code View button --------------------------------------------*/
/*
div.editor-toolbar div button {
div.editor-toolbar button.markdown-active {
display: none !important;
}
*/
/*---------------------------------------------------------------------------*/

/*------ Remove Spellcheck button -------------------------------------------*/
/*
a[title="Spell checker"] {
button[title="Spell checker"] {
display: none;
}
*/
Expand All @@ -188,12 +217,17 @@ a[title="Spell checker"] {
/* .header input { */
input {
border-radius: 14px !important;
border: 1px solid rgb(85, 85, 85);
border: 1px solid rgb(85, 85, 85) !important;
outline: none;
/*
background-color: #888888 !important;
*/
}
/*------ Title input only ---------------------------------------------------*/
input.title-input {
padding: 4px 8px !important;
margin-bottom: 2px;
}
/*---------------------------------------------------------------------------*/

/*------ Attachment pane: make first 2 columns easier to read ---------------*/
Expand Down
4 changes: 3 additions & 1 deletion Dark/userstyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ h1, h2, h3, h4, h5, h6 {
/*---------------------------------------------------------------------------*/

/*------ Headings: Use nested counters --------------------------------------*/
body { counter-reset: h1counter; }
body, #rendered-md {
counter-reset: h1counter 0;
}
h1 { counter-reset: h2counter; }
h2 { counter-reset: h3counter; }
h3 { counter-reset: h4counter; }
Expand Down