From 1ae122fd45f1508287b8a0ea49b07ffc5d3abf85 Mon Sep 17 00:00:00 2001
From: Volpeon <git@volpeon.ink>
Date: Wed, 26 Jun 2024 21:53:25 +0200
Subject: Update

---
 src/objects/_menu.scss    |  3 ++-
 tpl/index.pug             |  2 --
 tpl/views/action-menu.pug | 20 --------------
 tpl/views/menu.pug        | 68 ++++++++++++-----------------------------------
 4 files changed, 19 insertions(+), 74 deletions(-)
 delete mode 100644 tpl/views/action-menu.pug

diff --git a/src/objects/_menu.scss b/src/objects/_menu.scss
index 091098d..b1350ba 100644
--- a/src/objects/_menu.scss
+++ b/src/objects/_menu.scss
@@ -10,7 +10,7 @@
             --header: (
                 --font-size: fn.global-dim(--font-size --50),
             ),
-            --separator: fn.global-dim(--size --85),
+            --separator: fn.global-dim(--size --100),
             --item: (
                 --pad-i:    fn.global-dim(--size --150),
                 --pad-b:    fn.global-dim(--size --100),
@@ -106,6 +106,7 @@
         @include iro.bem-elem('separator') {
             block-size:       1px;
             margin-block:     fn.dim(--separator);
+            margin-inline:    fn.dim(--item --pad-i);
             background-color: fn.color(--separator);
         }
 
diff --git a/tpl/index.pug b/tpl/index.pug
index 7b419b3..d3e9daf 100644
--- a/tpl/index.pug
+++ b/tpl/index.pug
@@ -73,7 +73,6 @@ include views/overflow-button.pug
 include views/status-indicator.pug
 include views/avatar.pug
 include views/popover.pug
-include views/action-menu.pug
 include views/menu.pug
 include views/side-nav.pug
 include views/icon-nav.pug
@@ -122,7 +121,6 @@ html
             +view-side-nav
             +view-popover
             +view-menu
-            +view-action-menu
             +view-icon-nav
             +view-backdrop
             +view-dialog
diff --git a/tpl/views/action-menu.pug b/tpl/views/action-menu.pug
deleted file mode 100644
index 0546463..0000000
--- a/tpl/views/action-menu.pug
+++ /dev/null
@@ -1,20 +0,0 @@
-mixin view-action-menu 
-    +view('action-menu', 'Action menu')
-        .c-box
-            div(style={ display: 'flex', 'flex-direction': 'column', 'align-items': 'flex-start' })
-                +action-button(quiet=true selected=true)= 'Menu'
-                +popover
-                    +menu
-                        +menu-slot(class='l-media l-media--flush')
-                            +avatar(block=true circle=true size='100' src='avatar.png' class='l-media__block')
-                            .l-media__block.l-media__block--main
-                                strong.u-d-block= 'Volpeon'
-                                small.u-d-block= '@volpeon@mk.vulpes.one'
-                        +menu-separator
-                        +menu-item(icon='user')= 'View profile'
-                        +menu-item(icon='red' iconIsStatus=true)= 'Mark as away'
-                        +menu-separator
-                        +menu-item(icon='trash' disabled=true)= 'Delete'
-                        +menu-item(icon='bookmark')= 'Bookmark'
-                        +menu-item(icon='tags')= 'Tags'
-                        +menu-item(postIcon='chevron-right')= 'More'
diff --git a/tpl/views/menu.pug b/tpl/views/menu.pug
index c61cb92..34a15ce 100644
--- a/tpl/views/menu.pug
+++ b/tpl/views/menu.pug
@@ -1,54 +1,20 @@
 mixin view-menu 
     +view('menu', 'Menu')
         .c-box
-            div(style={ display: 'flex', gap: '3rem' })
-                +menu
-                    +menu-header= 'Category 1'
-                    +menu-item= 'Mark as away'
-                    +menu-item= 'Delete'
-
-                    +menu-header= 'Category 2'
-                    +menu-item(icon='bookmark')= 'Bookmark'
-                    +menu-item(icon='tags')= 'Tags'
-
-                +menu
-                    +menu-item(header=true)
-                        = 'Bouncer'
-
-                    +menu-separator
-
-                    +menu-item(header=true)
-                        = 'Libera'
-                    +menu-item(icon='hash')
-                        = 'achannel '
-                        +badge('primary')(size='sm')= '12 '
-                    +menu-item(icon='hash')
-                        = 'kitsuneirc '
-                        +badge(size='sm')= '31 '
-                    +menu-item(icon='green' iconIsStatus=true)
-                        = 'volpeon'
-                    +menu-item(icon='red' iconIsStatus=true)
-                        = 'someone'
-
-                    +menu-separator
-
-                    +menu-item(header=true)
-                        = 'Ergo Testnet'
-
-                    +menu-separator
-
-                    +menu-item(header=true)
-                        = 'NixNet'
-
-                +menu
-                    +menu-header= 'Operators'
-                    +menu-item
-                        +user-card('volpeon', 0)
-                    +menu-item
-                        +user-card('curiousfox', 90)
-
-                    +menu-header= 'Moderators'
-                    +menu-item
-                        +user-card('user3567', 135)
-                    +menu-item
-                        +user-card('johndoe', 270)
+            div(style={ display: 'flex', 'flex-direction': 'column', 'align-items': 'flex-start' })
+                +action-button(quiet=true selected=true)= 'Menu'
+                +popover
+                    +menu
+                        +menu-slot(class='l-media l-media--flush')
+                            +avatar(block=true circle=true size='100' src='avatar.png' class='l-media__block')
+                            .l-media__block.l-media__block--main
+                                strong.u-d-block= 'Volpeon'
+                                small.u-d-block= '@volpeon@mk.vulpes.one'
+                        +menu-separator
+                        +menu-item(icon='user')= 'View profile'
+                        +menu-item(icon='red' iconIsStatus=true)= 'Mark as away'
+                        +menu-separator
+                        +menu-item(icon='trash' disabled=true)= 'Delete'
+                        +menu-item(icon='bookmark')= 'Bookmark'
+                        +menu-item(icon='tags')= 'Tags'
+                        +menu-item(postIcon='chevron-right')= 'More'
-- 
cgit v1.2.3-70-g09d2