Просмотр исходного кода

Update styling for bookmark folder tree

https://youtrack.weseek.co.jp/issue/GW-7925
- Move bookmark foldertree style to module BookmarkFolderTree.module.scss
- Remove _bookmark-folder-tree.scss
- Commonize .grw-foldertree in _apply-colors.scss
Mudana-Grune 3 лет назад
Родитель
Сommit
10ba355a4d

+ 209 - 1
packages/app/src/components/Bookmarks/BookmarkFolderTree.module.scss

@@ -1,4 +1,5 @@
-@use '~/styles/molecules/bookmark-folder-tree';
+$grw-foldertree-item-padding-left: 15px;
+$grw-bookmark-item-padding-left: 35px;
 
 .grw-folder-tree-container :global {
   .grw-foldertree-item-container, .grw-drop-item-area {
@@ -20,3 +21,210 @@
     border-width: 0.15rem !important;
   }
 }
+
+.grw-foldertree {
+  :global {
+
+    .btn-page-item-control {
+      .icon-plus::before {
+        font-size: 18px;
+      }
+    }
+
+    .list-group-item {
+      .grw-visible-on-hover {
+        display: none;
+      }
+
+      &:hover {
+        .grw-visible-on-hover {
+          display: block;
+        }
+
+        .grw-count-badge {
+          display: none;
+        }
+      }
+
+      .grw-foldertree-triangle-btn {
+        background-color: transparent;
+        transition: all 0.2s ease-out;
+        transform: rotate(0deg);
+
+        &.grw-foldertree-open {
+          transform: rotate(90deg);
+        }
+      }
+
+      .grw-foldertree-title-anchor {
+        width: 100%;
+        overflow: hidden;
+        text-decoration: none;
+      }
+    }
+
+    .grw-foldertree-item-container {
+      .grw-triangle-container {
+        min-width: 35px;
+        height: 40px;
+      }
+      .grw-bookmark-item-list{
+        .picture {
+          width: 16px;
+          height: 16px;
+          vertical-align: text-bottom;
+
+          &.picture-md {
+            width: 20px;
+            height: 20px;
+          }
+        }
+        min-width: 30px;
+        height: 35px;
+        .grw-foldertree-control{
+          margin-left: auto;
+        }
+      }
+    }
+  }
+  &:global{
+    // To realize a hierarchical structure, set multiplied padding-left to each foldertree-item
+    >.grw-foldertree-item-container.grw-root-bookmarks{
+      > .grw-drag-drop-container {
+        > .list-group-item.grw-bookmark-item-list {
+          padding-left: $grw-bookmark-item-padding-left ;
+        }
+      }
+    }
+    > .grw-foldertree-item-container {
+      > .grw-drag-drop-container {
+        > .list-group-item {
+          padding-left: 0
+        }
+        > .list-group-item.grw-bookmark-item-list {
+          padding-left: $grw-bookmark-item-padding-left + $grw-foldertree-item-padding-left;
+        }
+      }
+      > .grw-foldertree-item-children {
+        > .grw-foldertree-item-container {
+          > .grw-drag-drop-container {
+            > .list-group-item {
+              padding: $grw-foldertree-item-padding-left
+            }
+            > .list-group-item.grw-bookmark-item-list {
+              padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 2);
+            }
+          }
+          > .grw-foldertree-item-children {
+            > .grw-foldertree-item-container {
+              > .grw-drag-drop-container {
+                > .list-group-item {
+                  padding: $grw-foldertree-item-padding-left * 2
+                }
+                > .list-group-item.grw-bookmark-item-list {
+                  padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 3);
+                }
+              }
+              > .grw-foldertree-item-children {
+                > .grw-foldertree-item-container {
+                  > .grw-drag-drop-container {
+                    > .list-group-item {
+                      padding: $grw-foldertree-item-padding-left * 3
+                    }
+                    > .list-group-item.grw-bookmark-item-list {
+                      padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 4);
+                    }
+                  }
+                  > .grw-foldertree-item-children {
+                    > .grw-foldertree-item-container {
+                      > .grw-drag-drop-container {
+                        > .list-group-item {
+                          padding: $grw-foldertree-item-padding-left * 4
+                        }
+                        > .list-group-item.grw-bookmark-item-list {
+                          padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 5);
+                        }
+                      }
+                      > .grw-foldertree-item-children {
+                        > .grw-foldertree-item-container {
+                          > .grw-drag-drop-container {
+                            > .list-group-item {
+                              padding: $grw-foldertree-item-padding-left * 5
+                            }
+                            > .list-group-item.grw-bookmark-item-list {
+                              padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 6);
+                            }
+                          }
+                          > .grw-foldertree-item-children {
+                            > .grw-foldertree-item-container {
+                              > .grw-drag-drop-container {
+                                > .list-group-item {
+                                  padding: $grw-foldertree-item-padding-left * 6
+                                }
+                                > .list-group-item.grw-bookmark-item-list {
+                                  padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 7);
+                                }
+                              }
+                              > .grw-foldertree-item-children {
+                                > .grw-foldertree-item-container {
+                                  > .grw-drag-drop-container {
+                                    > .list-group-item {
+                                      padding: $grw-foldertree-item-padding-left * 7
+                                    }
+                                    > .list-group-item.grw-bookmark-item-list {
+                                      padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 8);
+                                    }
+                                  }
+                                  > .grw-foldertree-item-children {
+                                    > .grw-foldertree-item-container {
+                                      > .grw-drag-drop-container {
+                                        > .list-group-item {
+                                          padding: $grw-foldertree-item-padding-left * 8
+                                        }
+                                        > .list-group-item.grw-bookmark-item-list {
+                                          padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 9);
+                                        }
+                                      }
+                                      > .grw-foldertree-item-children {
+                                        > .grw-foldertree-item-container {
+                                          > .grw-drag-drop-container {
+                                            > .list-group-item {
+                                              padding: $grw-foldertree-item-padding-left * 9
+                                            }
+                                            > .list-group-item.grw-bookmark-item-list {
+                                              padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 10);
+                                            }
+                                          }
+                                          > .grw-foldertree-item-children {
+                                            > .grw-foldertree-item-container {
+                                              > .grw-drag-drop-container {
+                                                > .list-group-item {
+                                                  padding: $grw-foldertree-item-padding-left * 10
+                                                }
+                                                > .list-group-item.grw-bookmark-item-list {
+                                                  padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 11);
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

+ 0 - 210
packages/app/src/styles/molecules/_bookmark-folder-tree.scss

@@ -1,210 +0,0 @@
-@use '~/styles/variables' as var;
-$grw-foldertree-item-padding-left: 15px;
-$grw-bookmark-item-padding-left: 35px;
-
-.grw-foldertree {
-  :global {
-
-    .btn-page-item-control {
-      .icon-plus::before {
-        font-size: 18px;
-      }
-    }
-
-    .list-group-item {
-      .grw-visible-on-hover {
-        display: none;
-      }
-
-      &:hover {
-        .grw-visible-on-hover {
-          display: block;
-        }
-
-        .grw-count-badge {
-          display: none;
-        }
-      }
-
-      .grw-foldertree-triangle-btn {
-        background-color: transparent;
-        transition: all 0.2s ease-out;
-        transform: rotate(0deg);
-
-        &.grw-foldertree-open {
-          transform: rotate(90deg);
-        }
-      }
-
-      .grw-foldertree-title-anchor {
-        width: 100%;
-        overflow: hidden;
-        text-decoration: none;
-      }
-    }
-
-    .grw-foldertree-item-container {
-      .grw-triangle-container {
-        min-width: 35px;
-        height: 40px;
-      }
-      .grw-bookmark-item-list{
-        .picture {
-          width: 16px;
-          height: 16px;
-          vertical-align: text-bottom;
-
-          &.picture-md {
-            width: 20px;
-            height: 20px;
-          }
-        }
-        min-width: 30px;
-        height: 35px;
-        .grw-foldertree-control{
-          margin-left: auto;
-        }
-      }
-    }
-  }
-  &:global{
-    // To realize a hierarchical structure, set multiplied padding-left to each foldertree-item
-    >.grw-foldertree-item-container.grw-root-bookmarks{
-      > .grw-drag-drop-container {
-        > .list-group-item.grw-bookmark-item-list {
-          padding-left: $grw-bookmark-item-padding-left ;
-        }
-      }
-    }
-    > .grw-foldertree-item-container {
-      > .grw-drag-drop-container {
-        > .list-group-item {
-          padding-left: 0
-        }
-        > .list-group-item.grw-bookmark-item-list {
-          padding-left: $grw-bookmark-item-padding-left + $grw-foldertree-item-padding-left;
-        }
-      }
-      > .grw-foldertree-item-children {
-        > .grw-foldertree-item-container {
-          > .grw-drag-drop-container {
-            > .list-group-item {
-              padding: $grw-foldertree-item-padding-left
-            }
-            > .list-group-item.grw-bookmark-item-list {
-              padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 2);
-            }
-          }
-          > .grw-foldertree-item-children {
-            > .grw-foldertree-item-container {
-              > .grw-drag-drop-container {
-                > .list-group-item {
-                  padding: $grw-foldertree-item-padding-left * 2
-                }
-                > .list-group-item.grw-bookmark-item-list {
-                  padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 3);
-                }
-              }
-              > .grw-foldertree-item-children {
-                > .grw-foldertree-item-container {
-                  > .grw-drag-drop-container {
-                    > .list-group-item {
-                      padding: $grw-foldertree-item-padding-left * 3
-                    }
-                    > .list-group-item.grw-bookmark-item-list {
-                      padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 4);
-                    }
-                  }
-                  > .grw-foldertree-item-children {
-                    > .grw-foldertree-item-container {
-                      > .grw-drag-drop-container {
-                        > .list-group-item {
-                          padding: $grw-foldertree-item-padding-left * 4
-                        }
-                        > .list-group-item.grw-bookmark-item-list {
-                          padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 5);
-                        }
-                      }
-                      > .grw-foldertree-item-children {
-                        > .grw-foldertree-item-container {
-                          > .grw-drag-drop-container {
-                            > .list-group-item {
-                              padding: $grw-foldertree-item-padding-left * 5
-                            }
-                            > .list-group-item.grw-bookmark-item-list {
-                              padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 6);
-                            }
-                          }
-                          > .grw-foldertree-item-children {
-                            > .grw-foldertree-item-container {
-                              > .grw-drag-drop-container {
-                                > .list-group-item {
-                                  padding: $grw-foldertree-item-padding-left * 6
-                                }
-                                > .list-group-item.grw-bookmark-item-list {
-                                  padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 7);
-                                }
-                              }
-                              > .grw-foldertree-item-children {
-                                > .grw-foldertree-item-container {
-                                  > .grw-drag-drop-container {
-                                    > .list-group-item {
-                                      padding: $grw-foldertree-item-padding-left * 7
-                                    }
-                                    > .list-group-item.grw-bookmark-item-list {
-                                      padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 8);
-                                    }
-                                  }
-                                  > .grw-foldertree-item-children {
-                                    > .grw-foldertree-item-container {
-                                      > .grw-drag-drop-container {
-                                        > .list-group-item {
-                                          padding: $grw-foldertree-item-padding-left * 8
-                                        }
-                                        > .list-group-item.grw-bookmark-item-list {
-                                          padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 9);
-                                        }
-                                      }
-                                      > .grw-foldertree-item-children {
-                                        > .grw-foldertree-item-container {
-                                          > .grw-drag-drop-container {
-                                            > .list-group-item {
-                                              padding: $grw-foldertree-item-padding-left * 9
-                                            }
-                                            > .list-group-item.grw-bookmark-item-list {
-                                              padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 10);
-                                            }
-                                          }
-                                          > .grw-foldertree-item-children {
-                                            > .grw-foldertree-item-container {
-                                              > .grw-drag-drop-container {
-                                                > .list-group-item {
-                                                  padding: $grw-foldertree-item-padding-left * 10
-                                                }
-                                                > .list-group-item.grw-bookmark-item-list {
-                                                  padding-left: $grw-bookmark-item-padding-left + ($grw-foldertree-item-padding-left * 11);
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

+ 2 - 10
packages/app/src/styles/theme/_apply-colors.scss

@@ -276,17 +276,9 @@ ul.pagination {
     }
   }
 
-  .grw-pagetree {
+  .grw-pagetree, .grw-foldertree {
     .list-group-item {
-      .grw-pagetree-title-anchor {
-        color: inherit;
-      }
-    }
-  }
-
-  .grw-foldertree {
-    .list-group-item {
-      .grw-foldertree-title-anchor {
+      .grw-pagetree-title-anchor, .grw-foldertree-title-anchor {
         color: inherit;
       }
     }