Merge pull request #111 from browneyedsoul/develop

Refactor no-bullet mode styles and add develop auto-sync workflow

Author: browneyedsoul

.github/workflows/sync-develop-with-main.yml

@@ -0,0 +1,68 @@
+name: Sync develop with main
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+
+concurrency:
+  group: sync-develop-with-main
+  cancel-in-progress: true
+
+jobs:
+  sync-develop:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure git identity
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Rebase develop onto main when main is 1 commit ahead
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          MAIN_REF="origin/main"
+          DEVELOP_REF="origin/develop"
+
+          if ! git show-ref --verify --quiet "refs/remotes/${DEVELOP_REF}"; then
+            echo "develop branch not found on origin. Skipping."
+            exit 0
+          fi
+
+          # Merge commit check: parent count >= 2
+          parent_count=$(git rev-list --parents -n 1 "${MAIN_REF}" | awk '{print NF-1}')
+          main_ahead=$(git rev-list --count "${DEVELOP_REF}..${MAIN_REF}")
+          develop_ahead=$(git rev-list --count "${MAIN_REF}..${DEVELOP_REF}")
+
+          echo "parent_count=${parent_count}"
+          echo "main_ahead=${main_ahead}"
+          echo "develop_ahead=${develop_ahead}"
+
+          if [[ "${parent_count}" -lt 2 ]]; then
+            echo "Latest main commit is not a merge commit. Skipping."
+            exit 0
+          fi
+
+          if [[ "${main_ahead}" -ne 1 ]]; then
+            echo "main is not exactly 1 commit ahead of develop. Skipping."
+            exit 0
+          fi
+
+          if [[ "${develop_ahead}" -ne 0 ]]; then
+            echo "develop has unique commits. Skipping to avoid history rewrite/force-push."
+            exit 0
+          fi
+
+          git checkout -B develop "${DEVELOP_REF}"
+          git rebase "${MAIN_REF}"
+          git push origin develop:develop

packages/no-bullet-editor-mode/public/manifest.json

@@ -7,7 +7,7 @@
   "version": {
     "major": 0,
     "minor": 7,
-    "patch": 4
+    "patch": 5
   },
   "theme": [],
   "enableOnMobile": true,

packages/no-bullet-editor-mode/src/scss/snippet.scss

@@ -10,9 +10,10 @@
 .hierarchy-editor--ltr {
   .TreeNode,
   .TreeNode--list {
-    margin-left: 1.55rem;
+    margin-left: 1rem;
   }
 }
+
 %rmvTag {
   .hierarchy-editor__tag-bar__tag {
     background-color: transparent !important;
@@ -24,50 +25,58 @@
     }
   }
 }
-.node-card-item:before {
-  margin-left: unset;
+
+@mixin hiddenChildrenTriangle($left, $color) {
+  content: "";
+  display: block;
+  position: relative;
+  left: $left;
+  width: 0;
+  height: 0;
+  border-top: 0.35rem solid transparent;
+  border-left: 0.35rem solid $color;
+  border-bottom: 0.35rem solid transparent;
+  border-radius: 25px;
+  pointer-events: none;
+}
+
+@mixin visibleBulletCore($color) {
+  .perfect-circle__inner {
+    visibility: visible;
+    .rem-bullet__core {
+      fill: $color;
+    }
+  }
+}
+
+@mixin relativeLeft($left) {
+  position: relative;
+  left: $left;
 }
 
-@mixin Nobullet($nobullet-triangle, $nobullet-quote-bg, $nobullet-quote-border) {
+@mixin nobullet($nobullet-triangle, $nobullet-quote-bg, $nobullet-quote-border) {
   .rn-rem-icon-bullet.rn-rem-bullet--hidden-children {
     &::after {
-      content: "";
-      display: block;
-      position: relative;
-      left: 1.6rem;
-      width: 0;
-      height: 0;
-      border-top: 0.35rem solid transparent;
-      border-left: 0.35rem solid $nobullet-triangle;
-      border-bottom: 0.35rem solid transparent;
-      border-radius: 25px;
-      pointer-events: none;
+      @include hiddenChildrenTriangle(1rem, $nobullet-triangle);
     }
   }
+
   .perfect-circle.rn-rem-bullet--hidden-children {
     &::after {
-      content: "";
-      display: block;
-      position: relative;
-      left: 1.6rem;
-      width: 0;
-      height: 0;
-      border-top: 0.35rem solid transparent;
-      border-left: 0.35rem solid $nobullet-triangle;
-      border-bottom: 0.35rem solid transparent;
-      border-radius: 25px;
-      pointer-events: none;
+      @include hiddenChildrenTriangle(1.5rem, $nobullet-triangle);
     }
   }
+
   [data-rem-container-tags~="quote"] {
     left: 1.5rem !important;
     background: $nobullet-quote-bg;
     border-left: 4px solid $nobullet-quote-border;
     width: calc(100% - 1.75rem);
+
     .rn-quote-content {
-      // margin-left: 1.5rem;
       --rn-quote-offset: unset !important;
       border-left: unset;
+
       .toggle-collapse-button {
         left: 1rem;
         background-color: unset !important;
@@ -79,41 +88,35 @@
       > [data-rem-tags~="bulletlist"] {
         margin-left: 1rem;
         @extend %rmvTag;
-        .perfect-circle__inner {
-          visibility: visible;
-          .rem-bullet__core {
-            fill: $nobullet-triangle;
-          }
-        }
+        @include visibleBulletCore($nobullet-triangle);
       }
     }
+
     [data-rem-container-tags~="bulletlists"] {
       @extend %rmvTag;
+
       .tree-node--children {
         .rem {
           margin-left: 1rem;
+
           .rn-bullet-container {
             left: unset;
           }
+
           .perfect-circle {
-            .perfect-circle__inner {
-              visibility: visible;
-              .rem-bullet__core {
-                fill: $nobullet-triangle;
-              }
-            }
+            @include visibleBulletCore($nobullet-triangle);
           }
         }
+
         .toggle-collapse-button {
           left: unset;
         }
+
         .tree-node--parent {
           .rem {
-            .perfect-circle {
-              &.rn-rem-bullet--hidden-children {
-                &::after {
-                  display: none;
-                }
+            .perfect-circle.rn-rem-bullet--hidden-children {
+              &::after {
+                display: none;
               }
             }
           }
@@ -122,13 +125,9 @@
     }
   }
 }
-@include Nobullet(var(--nobullet-triangle), var(--nobullet-quote-bg), var(--nobullet-quote-border));
+@include nobullet(var(--nobullet-triangle), var(--nobullet-quote-bg), var(--nobullet-quote-border));
 .dark {
-  @include Nobullet(var(--nobullet-triangle-dark), var(--nobullet-quote-bg-dark), var(--nobullet-quote-border-dark));
-}
-
-@mixin scaleTransform($scale) {
-  transform: scale($scale);
+  @include nobullet(var(--nobullet-triangle-dark), var(--nobullet-quote-bg-dark), var(--nobullet-quote-border-dark));
 }
 
 $scaling-values: (
@@ -143,37 +142,51 @@ $scaling-values: (
       .rn-bullet-container {
         > span {
           > span {
-            @include scaleTransform($scale);
+            transform: scale($scale);
           }
         }
       }
     }
   }
 }
 
-.rn-bullet-container > span {
-  display: flex;
-  align-items: center;
-}
+.rem-button__container {
+  .rn-bullet-container {
+    > span {
+      display: flex;
+      align-items: center;
+    }
 
-.rn-bullet-container:has(.rn-rem-bullet--hidden-children) {
-  position: relative;
-  left: -1.5rem;
-}
-.toggle-collapse-button {
-  position: relative;
-  left: 1rem;
+    &:has(.rn-rem-bullet--hidden-children) {
+      @include relativeLeft(-1.5rem);
+    }
+  }
+  .toggle-collapse-button {
+    @include relativeLeft(1rem);
+    background-color: unset;
+    margin-right: unset !important;
+  }
 }
+
 [data-rem-tags~="document"] {
   .toggle-collapse-button {
-    position: relative;
     left: 1.35rem;
   }
-  // .toggle-collapse-button:not(.toggle-collapse-button:has(svg.rotate-0)) {
-  //     position: relative;
-  //     left: 1.35rem;
-  // }
+
+  .rn-rem-icon-bullet {
+    background-color: unset;
+    border-style: unset;
+    display: flex;
+    align-items: center;
+  }
+
+  .tree-node--parent {
+    .perfect-circle.rn-rem-bullet--hidden-children::after {
+      left: 1.2rem;
+    }
+  }
 }
+
 [data-rem-tags~="list-item"] {
   .toggle-collapse-button {
     z-index: 2;
@@ -187,8 +200,7 @@ $scaling-values: (
     &:has(.toggle-collapse-button) {
       &:hover {
         .rn-bullet-container {
-          position: relative;
-          left: -1.5rem;
+          @include relativeLeft(-1.5rem);
         }
       }
     }
@@ -198,7 +210,10 @@ $scaling-values: (
 .rem:not(:hover) .perfect-circle__inner {
   visibility: hidden;
 }
+
 .rn-rem-icon-bullet {
+  background-color: unset;
+
   &.rn-rem-bullet--hidden-children {
     svg[data-icon="document"],
     svg[data-icon="folder"] {
@@ -207,34 +222,20 @@ $scaling-values: (
     }
   }
 }
-[data-rem-tags~="document"] {
-  .rn-rem-icon-bullet {
-    border-style: unset;
-  }
-  .rn-rem-icon-bullet {
-    display: flex;
-    align-items: center;
-  }
-  .tree-node--parent {
-    .perfect-circle.rn-rem-bullet--hidden-children::after {
-      left: 1.2rem;
-    }
-  }
-}
 
 // patch for 1.13.36
-.hierarchy-editor--ltr .rn-editor-container:not(.is-explicit-folder-and-root-explicit-folder) .TreeNode,
-.hierarchy-editor--ltr .rn-editor-container:not(.is-explicit-folder-and-root-explicit-folder) .TreeNode--list {
-  margin-left: 1.6rem;
-  padding-left: unset;
-}
-.hierarchy-editor--ltr .rn-editor-container:not(.is-explicit-folder-and-root-explicit-folder) .TreeNode.portal-tree-node-box--tag-list-automatic {
-  margin-left: 1.6rem !important;
-}
+.hierarchy-editor--ltr {
+  .rn-editor-container:not(.is-explicit-folder-and-root-explicit-folder) {
+    .TreeNode,
+    .TreeNode--list {
+      margin-left: 1.6rem;
+      padding-left: unset;
+    }
 
-.rn-rem-icon-bullet,
-.toggle-collapse-button {
-  background-color: unset;
+    .TreeNode.portal-tree-node-box--tag-list-automatic {
+      margin-left: 1.6rem !important;
+    }
+  }
 }
 
 .node-card-item:before {