tcsenpai/obsidiangarden_netlify
1
0
Fork 0
mirror of https://github.com/tcsenpai/obsidiangarden_netlify.git synced 2025-06-06 04:35:20 +00:00
Code Issues 5 Packages Projects Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
Utsob Roy 2023-02-14 22:28:39 +06:00
parent 54f0c3aabc
commit 8ee09509dd
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/site/_includes/components/filetree.njk
View File

@ -3,13 +3,8 @@
<div x-show="isOpen" style="display:none" class="{{'filelist' if step>0}}">
{%if fileOrFolder.isNote %}
<div @click.stop class="notelink {{ 'active-note' if fileOrFolder.permalink === permalink}}">
<<<<<<< HEAD
{%- if not meta.noteIconsSettings.filetree -%}<i class="fa fa-sticky-note" aria-hidden="true"></i>{%- endif -%}
<a data-note-icon="{{fileOrFolder.noteIcon}}" style="text-decoration: none;" class="filename" href="{{fileOrFolder.permalink}}">{{fileOrFolder.name}} </a>
=======
{%- if not meta.maturitySettings.filetree -%}<i class="fa fa-sticky-note" aria-hidden="true"></i>{%- endif -%}
<a data-maturity="{{fileOrFolder.maturity}}" style="text-decoration: none;" class="filename" href="{{fileOrFolder.permalink}}">{{fileOrFolder.name}} </a>
>>>>>>> d6a8455 (maturity visualization)
</div>
{% elif fileOrFolder.isFolder%}
<div class="folder inner-folder" x-data="{isOpen: $persist(false).as('{{currentPath}}')}" @click.stop="isOpen=!isOpen">

4
src/site/_includes/layouts/note.njk
View File

@ -29,11 +29,7 @@ permalink: "notes/{{ page.fileSlug | slugify }}/"
<main class="content cm-s-obsidian">
<header>
{% if settings.dgShowInlineTitle === true %}
<<<<<<< HEAD
<h1 data-note-icon="{% if noteIcon %}{{noteIcon}}{% else %}{{meta.noteIconsSettings.default}}{% endif %}">{% if title %}{{ title }}{% else %}{{ page.fileSlug }}{% endif %}</h1>
=======
<h1 data-maturity="{% if maturity %}{{maturity}}{% else %}{{meta.maturitySettings.default}}{% endif %}">{% if title %}{{ title }}{% else %}{{ page.fileSlug }}{% endif %}</h1>
>>>>>>> d6a8455 (maturity visualization)
{% endif %}
<div class="header-meta">
{% if settings.dgShowTags === true and tags %}

6
src/site/styles/digital-garden-base.scss
View File

@ -5,16 +5,10 @@
body {
overflow-x: hidden;
<<<<<<< HEAD
--note-icon-1: url(/img/tree-1.svg);
--note-icon-2: url(/img/tree-2.svg);
--note-icon-3: url(/img/tree-3.svg);
--note-icon-fallback: url(/img/default-note-icon.svg);
=======
--maturity-icon-1: url(/img/tree-1.svg);
--maturity-icon-2: url(/img/tree-2.svg);
--maturity-icon-3: url(/img/tree-3.svg);
>>>>>>> e858fa0 (fixes for styles and meta)
}
.content {