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.

Sign up for GitHub

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

fix sidebar border on rtl. #1710

Merged
merged 4 commits into from
Nov 7, 2024
Merged

fix sidebar border on rtl. #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2055f7
fix sidebar border on rtl.
suraj-webkul Nov 6, 2024
266393f
fix sidebar border issue for child sidebar.
suraj-webkul Nov 6, 2024
220b4e8
add new line.
suraj-webkul Nov 6, 2024
6d183b7
resolved conflits.
suraj-webkul Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/Webkul/Admin/src/Resources/views/components/layouts/sidebar/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div
ref="sidebar"
class="duration-80 fixed top-[60px] z-[10002] h-full w-[200px] border-r border-gray-200 bg-white pt-4 transition-all group-[.sidebar-collapsed]/container:w-[70px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden"
class="duration-80 fixed top-[60px] z-[10002] h-full w-[200px] border-gray-200 bg-white pt-4 transition-all group-[.sidebar-collapsed]/container:w-[70px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden ltr:border-r rtl:border-l"
@mouseover="handleMouseOver"
@mouseleave="handleMouseLeave"
>
Expand Down Expand Up @@ -36,7 +36,7 @@ class="flex gap-2 p-1.5 items-center cursor-pointer hover:rounded-lg {{ $menuIte
class="absolute top-0 hidden flex-col bg-gray-100 ltr:left-[200px] rtl:right-[199px]"
:class="[isMenuActive && (hoveringMenu == '{{$menuItem->getKey()}}') ? '!flex' : 'hidden']"
>
<div class="sidebar-rounded fixed z-[1000] h-full min-w-[140px] max-w-max border-r bg-white pt-4 after:-right-[30px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden">
<div class="sidebar-rounded fixed z-[1000] h-full min-w-[140px] max-w-max bg-white pt-4 after:-right-[30px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden ltr:border-r rtl:border-x">
<div class="journal-scroll h-[calc(100vh-100px)] overflow-hidden">
<nav class="grid w-full gap-2">
@foreach ($menuItem->getChildren() as $subMenuItem)
Expand All @@ -60,4 +60,4 @@ class="flex gap-2.5 p-2 items-center cursor-pointer hover:rounded-lg {{ $subMenu
@endforeach
</nav>
</div>
</div>
</div>
1 change: 0 additions & 1 deletion public/admin/build/assets/app-6148165d.css
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions public/admin/build/assets/app-d6168e0d.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/admin/build/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
"src": "node_modules/vue-cal/dist/i18n/zh-hk.es.js"
},
"src/Resources/assets/css/app.css": {
"file": "assets/app-6148165d.css",
"file": "assets/app-d6168e0d.css",
"isEntry": true,
"src": "src/Resources/assets/css/app.css"
},
Expand Down
Loading