Skip to content
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.

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

Upgrade theme to obsidian 1.0 #168

Conversation

hellerbarde
Copy link
Contributor

No description provided.

@hellerbarde hellerbarde changed the title Feature/upgrade theme to obsidian 1.0 Upgrade theme to obsidian 1.0 Oct 24, 2022
@hellerbarde hellerbarde mentioned this pull request Oct 24, 2022
@inhji
Copy link

inhji commented Oct 25, 2022

@hellerbarde The patch by @pastordan also fixes the squished sidebar buttons, maybe you could incorporate these as well :)

#154 (comment)

@GeorgeGo
Copy link

Am I testing this incorrectly? When using the css file in my themes folder, headers aren't retaining their colors and showing up as default black.

@pastordan
Copy link

pastordan commented Oct 25, 2022 via email

@hellerbarde
Copy link
Contributor Author

hellerbarde commented Oct 25, 2022

@GeorgeGo No, you are correct, that is one of the (many) as-of-yet-unresolved issues. (this is after all a "draft" pull request ;) ) I'm not the original theme developer and I'm not familiar with Obsidian theming, so unless @ceciliamay wants to jump in and push this forward, it'll be somewhat slow going. Additionally, I'll have very limited time this week.

I'll also quickly mention this: while it is much appreciated to have everyone help with snippets, it would be even more useful for you to also identify the place they might need to go in the original code (inside the /scss/ folder.)

@hellerbarde
Copy link
Contributor Author

@inhji Thanks a lot for the suggestion, I'm working on incorporating this. Unfortunately, I don't remember how the side ribbon buttons looked originally, especially on hover. embarrassed

@pastordan
Copy link

@hellerbarde You know that Cecilia's working on an update, yes?

Anyway, I believe this bit:

.workspace-ribbon.mod-left:before {
padding-bottom: 19px;
}

div.side-dock-actions {margin-top: 19px;
}

goes in _side-dock-ribbon.scss

This goes in _tab-header.scss:

.mod-left-split .workspace-tab-header-container-inner, .mod-right-split
.workspace-tab-header-container-inner {
gap: 10px;
}

div.workspace-tab-header {
padding-right: 5px !important;
padding-left: 5px !important;
}

And all of this goes in _md-lists.scss, of course:

.md-bullet-color-muted.theme-light span.cm-formatting.cm-formatting-list,
.md-bullet-color-muted.theme-light span.list-bullet,
.md-bullet-color-muted.theme-light li::marker,
.md-bullet-color-muted.theme-dark span.cm-formatting.cm-formatting-list,
.md-bullet-color-muted.theme-dark span.list-bullet,
.md-bullet-color-muted.theme-dark li::marker,
markdown-rendered.list-bullet, list-bullet {
color: var(--background-secondary);
}

svg.svg-icon.lucide-edit-3 path:first-of-type {
color:  var(--callout-title-background);
}

I had some other stuff for callouts, but that's really just customizing for myself.

@hellerbarde
Copy link
Contributor Author

hellerbarde commented Oct 25, 2022 via email

@GeorgeGo
Copy link

Oh, yeah, I'm aware. I'm just doing this for myself and why not put it out there for y'all.

Greatly appreciate the effort. 🙌

@inhji
Copy link

inhji commented Oct 26, 2022

@GeorgeGo No, you are correct, that is one of the (many) as-of-yet-unresolved issues. (this is after all a "draft" pull request ;) ) I'm not the original theme developer and I'm not familiar with Obsidian theming, so unless @ceciliamay wants to jump in and push this forward, it'll be somewhat slow going. Additionally, I'll have very limited time this week.

I'll also quickly mention this: while it is much appreciated to have everyone help with snippets, it would be even more useful for you to also identify the place they might need to go in the original code (inside the /scss/ folder.)

I'm also not familiar with obsidian themes, but I want to look at the Primary source and see if I can help out. It's just a great theme and I'm missing it. 😄

@merfed
Copy link

merfed commented Oct 28, 2022

I have been looking and for the life of me cannot figure out why when using split panes, the left pane is offset higher than the right. And then oddly over time both sides will ride upwards.

@pastordan
Copy link

pastordan commented Oct 28, 2022 via email

@ceciliamay
Copy link
Collaborator

ceciliamay commented Oct 29, 2022

Hey guys, the new design is a bit challenging with the same reason you guys have mentioned. So I'm pushing all the pull requests to see if these can help! I appreciate all the contributions and the discussion here! I'm also doing a bit of codebase rebuild because I found that some files were a bit all over the place and confusing. I want to open the theme to invite other contributors so that if they want a support a plugin for the theme they can easily do so. I will close and squash this but please feel free to keep the convo going! I'm asking because I'm also rebuilding the README, with a section to explain how to contribute.

I will also be moving the theme to a different owner (Primary Theme org) so it might go missing/broken for a few days - apologies!

@merfed
Copy link

merfed commented Nov 3, 2022

Scrollbar Fix:

Add to _var_global.scss:
--size-2-2: 4px;

Replace in _scrollbars.scss:
body:not(.native-scrollbars) ::-webkit-scrollbar,
body:not(.native-scrollbars) .graph-controls::-webkit-scrollbar {
    visibility: visible;
    width: var(--size-2-2);
    height: var(--size-2-2);
    border-radius: 0;
    display: inherit;
    background: var(--scrollbar-bg);
}

body:not(.native-scrollbars) ::-webkit-scrollbar {
    &-thumb {
        visibility: visible;
        background: var(--scrollbar-thumb-bg);
        border-radius: 0;

        &:active {
            background: var(--scrollbar-active-thumb-bg);
            border-radius: 0;
        }
    }
}

I think the scrollbars were just missing the --- before the var name.

@merfed
Copy link

merfed commented Nov 3, 2022

Fix shifting split panes:

Replace in _resize-handles.scss:

&-vertical > * >,
    &-left-split >,
    &-right-split > {
        & .workspace-leaf-resize-handle {
            width: 3px;
            height: 105%;
            // top: -24px;
            border-color: var(--background-modifier-border);
            transition: var(--duration-fast-2)
                        var(--motion-smooth);

            &:hover {
                width: 4px;
                border-color: var(--background-modifier-border);
                transition: var(--duration-fast-2)
                            var(--motion-smooth);
            }

            &:active {
                width: 5px;
                transition: var(--duration-fast-2)
                            var(--motion-smooth);

                .theme-light & { /* VH for Light Mode */
                    border-color: var(--color-l-gray-50);
                }

                .theme-dark & { /* VH for Dark Mode */
                    border-color: var(--color-d-gray-30);
                }
            }
        }
    }

@SalahAdDin
Copy link

How is this going on?

@gbolo
Copy link

gbolo commented Mar 11, 2023

My fav theme by far, thanks @ceciliamay . I hope it gets 1.0 compatibility.

@ceciliamay ceciliamay marked this pull request as ready for review October 22, 2023 03:50
Copy link
Collaborator

@ceciliamay ceciliamay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushing all current PRs! thank you all for your contributions especially @hellerbarde. looking forward to working with the community more! will update everyone here.

Copy link
Collaborator

@ceciliamay ceciliamay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushing all current PRs! thank you all for your contributions especially @hellerbarde. looking forward to working with the community more! will update everyone here.

Copy link
Collaborator

@ceciliamay ceciliamay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushing all current PRs! thank you all for your contributions especially @hellerbarde. looking forward to working with the community more! will update everyone here.

@ceciliamay ceciliamay closed this Oct 22, 2023
@ceciliamay ceciliamay reopened this Oct 22, 2023
	new file:   manifest.json
	modified:   obsidian.css
	modified:   scss/10_base/_var__dark-mode.scss
	modified:   scss/10_base/_var__global.scss
	modified:   scss/10_base/_var__light-mode.scss
	modified:   scss/20_workspace/_file-explorer.scss
	modified:   scss/20_workspace/_nav-header.scss
	modified:   scss/20_workspace/_side-dock-ribbon.scss
	modified:   scss/20_workspace/_status-bar.scss
	modified:   scss/20_workspace/_tab-content.scss
	modified:   scss/20_workspace/_tab-header.scss
	modified:   scss/20_workspace/_title-bar.scss
	modified:   scss/30_note/_md-aside.scss
	modified:   scss/30_note/_md-blockquotes.scss
	modified:   scss/30_note/_md-callouts.scss
	modified:   scss/30_note/_md-checkboxes.scss
	modified:   scss/30_note/_md-code.scss
	modified:   scss/30_note/_md-embeds.scss
	modified:   scss/30_note/_md-emphasis.scss
	modified:   scss/30_note/_md-find-replace.scss
	modified:   scss/30_note/_md-footnotes.scss
	modified:   scss/30_note/_md-gutter-line.scss
	modified:   scss/30_note/_md-headers.scss
	modified:   scss/30_note/_md-highlighted-search.scss
	modified:   scss/30_note/_md-lists.scss
	modified:   scss/30_note/_md-tags.scss
	modified:   scss/30_note/_md-yaml.scss
	modified:   scss/30_note/_note-header.scss
	modified:   scss/30_note/_typography.scss
	modified:   scss/40_special-features/_alt-checkboxes.scss
	modified:   scss/40_special-features/_custom-icons.scss
	modified:   scss/40_special-features/_md-progress.scss
	modified:   scss/50_ui-components/_buttons.scss
	modified:   scss/50_ui-components/_community-themes-plugins.scss
	modified:   scss/50_ui-components/_dropdowns.scss
	modified:   scss/50_ui-components/_empty-page.scss
	modified:   scss/50_ui-components/_kbd.scss
	modified:   scss/50_ui-components/_modals.scss
	modified:   scss/50_ui-components/_notifications.scss
	modified:   scss/50_ui-components/_popovers.scss
	modified:   scss/50_ui-components/_resize-handles.scss
	modified:   scss/50_ui-components/_scrollbars.scss
	modified:   scss/50_ui-components/_search-input.scss
	modified:   scss/50_ui-components/_sliders.scss
	modified:   scss/50_ui-components/_toggles.scss
	modified:   scss/50_ui-components/_vault-launch-progress.scss
	modified:   scss/60_mobile/_general-mobile.scss
	modified:   scss/60_mobile/_phone-mobile.scss
	modified:   scss/60_mobile/_tablet-mobile.scss
	modified:   scss/70_plugins-core/_backlinks-outgoing.scss
	modified:   scss/70_plugins-core/_graph-view.scss
	modified:   scss/70_plugins-core/_outline.scss
	modified:   scss/70_plugins-core/_slides.scss
	modified:   scss/80_plugins-community/_calendar.scss
	modified:   scss/80_plugins-community/_dataview.scss
	modified:   scss/80_plugins-community/_excalidraw.scss
	modified:   scss/80_plugins-community/_full-calendar.scss
	modified:   scss/80_plugins-community/_hover-editor.scss
	modified:   scss/80_plugins-community/_map-view.scss
	modified:   scss/80_plugins-community/_sliding-panes.scss
	modified:   scss/80_plugins-community/_style-settings__options.scss
	modified:   scss/80_plugins-community/_style-settings__preferences.scss
	modified:   scss/80_plugins-community/_style-settings__styling.scss
	modified:   scss/80_plugins-community/_supercharged-links.scss
	new file:   version-bump.mjs
	new file:   versions.json
@ceciliamay ceciliamay force-pushed the feature/upgrade-theme-to-obsidian-1.0 branch from c665dd6 to 6f42895 Compare October 22, 2023 19:46
@ceciliamay ceciliamay merged commit 053aace into primary-theme:main Oct 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants