🌐 AI搜索 & 代理 主页
Skip to content

Dan leftnav width #1079

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

Merged
chillenberger merged 2 commits into from
Oct 16, 2023
Merged

Dan leftnav width #1079

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1507da
min width 260px, remove menu title, make arrow have transition duration
chillenberger Oct 16, 2023
6c4fe03
fmt
chillenberger Oct 16, 2023
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
Next Next commit
min width 260px, remove menu title, make arrow have transition duration
  • Loading branch information
@chillenberger
chillenberger committed Oct 16, 2023
commit f1507dad0cd3ecabcb822f59f76b804dbcb98db0
35 changes: 18 additions & 17 deletions pgml-dashboard/src/components/navigation/left_nav/web_app/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@

<% use crate::components::{LeftNavMenu, Dropdown}; %>
<nav class="leftnav nav-pills h-100" data-controller="extend-bs-collapse navigation-left-nav-web-app" data-extend-bs-collapse-affected-value=".leftnav-collapse-affect">
<div class="d-flex flex-column justify-content-between h-100 w-100">
<div class="d-flex flex-column">
<button class="btn-left-nav-toggle mb-5" type="button" data-bs-toggle="collapse" data-bs-target=".leftnav-collapse" aria-expanded="true">
<span class="collapse collapse-horizontal leftnav-collapse show" data-extend-bs-collapse-target="stateReference">
Menu
</span>
<span class="left-nav-toggle-icon material-symbols-outlined leftnav-collapse-affect expanded">
keyboard_double_arrow_left
</span>
</button>
<div class="leftnav-container py-3" data-controller="navigation-left-nav-web-app">
<nav class="leftnav nav-pills h-100" data-controller="extend-bs-collapse" data-extend-bs-collapse-affected-value=".leftnav-collapse-affect">
<div class="d-flex flex-column justify-content-between h-100 menu-container leftnav-collapse-affect expanded">
<div class="d-flex flex-column">
<button class="btn btn-left-nav-toggle mb-4" type="button" data-bs-toggle="collapse" data-bs-target=".leftnav-collapse" aria-expanded="true">
<span class="left-nav-toggle-icon material-symbols-outlined leftnav-collapse-affect expanded">
keyboard_double_arrow_left
</span>
<span class="collapse collapse-horizontal leftnav-collapse show" data-extend-bs-collapse-target="stateReference"></span>
</button>

<div class="mb-4">
<%+ Dropdown::nav(dropdown_nav.links).collapsable() %>
<div class="mb-4">
<%+ Dropdown::nav(dropdown_nav.links).collapsable() %>
</div>
<%+ LeftNavMenu { nav: upper_nav } %>
</div>
<%+ LeftNavMenu { nav: upper_nav } %>
<%+ LeftNavMenu { nav: lower_nav} %>
</div>
<%+ LeftNavMenu { nav: lower_nav} %>
</div>
</nav>
</nav>
</div>
68 changes: 68 additions & 0 deletions pgml-dashboard/src/components/navigation/left_nav/web_app/web_app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,71 @@
background-color: #{$gray-900}
}
}

div[data-controller="navigation-left-nav-web-app"] {
.menu-container {
transition: width $animation-timer;
&.expanding, &.expanded {
width: 220px;
}
&.collapsing, &.collapsed {
width: 48px;
}
}

.btn-left-nav-toggle {
--bs-btn-padding-x: 0px;
display: flex;
justify-content: start;
font-weight: $font-weight-bold;

color: #{$gray-100};

border-radius: 0px;
--bs-btn-border-color: transparent;
border: 0px;

--bs-btn-active-color: #{$gray-100};
--bs-btn-hover-color: #{$gray-100};
}

.left-nav-toggle-icon {
margin-left: 12px;
margin-right: 0px;

transition: all $animation-timer;
&.collapsing {
transform: rotate(-180deg);
}

&.collapsed {
transform: rotate(-180deg);
}

&.collapsing {
height: auto !important;
}
}
}


@keyframes collapse-margin {
from {
margin-left: calc($left-nav-w - 9rem);
margin-right: 0px;
}
to {
margin-left: calc($left-nav-w-collapsed/2 - 32px);
margin-right: calc($left-nav-w-collapsed/2 - 32px);
}
}
@keyframes expand-margin {
from {
margin-left: calc($left-nav-w-collapsed/2 - 32px);
margin-right: calc($left-nav-w-collapsed/2 - 32px);
}
to {
margin-left: calc($left-nav-w - 9rem);
margin-right: 0px;
}
}
2 changes: 1 addition & 1 deletion pgml-dashboard/static/css/scss/abstracts/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,4 +247,4 @@ $breadcrumb-height: 57px;

// animations
$animation-timer: 0.35s;
$transition-collapse-width: width 0.35s ease;
$transition-collapse-width: width .35s ease;
71 changes: 0 additions & 71 deletions pgml-dashboard/static/css/scss/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,74 +251,3 @@
border-right: none;
font-weight: $font-weight-medium;
}

.btn-left-nav-toggle {
@extend .btn;
--bs-btn-padding-x: 0px;
display: flex;
font-weight: $font-weight-bold;

color: #{$gray-100};

border-radius: 0px;
--bs-btn-border-color: transparent;
border-top: 0px;
border-left: 0px;
border-right: 0px;
border-bottom: 1px solid #{$gray-100} !important;

--bs-btn-active-color: #{$gray-100};
--bs-btn-hover-color: #{$gray-100};
}

.left-nav-toggle-icon {
margin-left: calc($left-nav-w - 9rem);
margin-right: 0px;

&.expanding {
animation-name: expand-margin;
animation-duration: $animation-timer;
}

&.collapsing {
animation-name: collapse-margin;
animation-duration: $animation-timer;
transform: rotate(-180deg);
}

&.expanded {
margin-left: calc($left-nav-w - 9rem);
margin-right: 0px;
}

&.collapsed {
margin-left: calc($left-nav-w-collapsed/2 - 32px);
margin-right: calc($left-nav-w-collapsed/2 - 32px);
transform: rotate(-180deg);
}

&.collapsing {
height: auto !important;
}
}

@keyframes collapse-margin {
from {
margin-left: calc($left-nav-w - 9rem);
margin-right: 0px;
}
to {
margin-left: calc($left-nav-w-collapsed/2 - 32px);
margin-right: calc($left-nav-w-collapsed/2 - 32px);
}
}
@keyframes expand-margin {
from {
margin-left: calc($left-nav-w-collapsed/2 - 32px);
margin-right: calc($left-nav-w-collapsed/2 - 32px);
}
to {
margin-left: calc($left-nav-w - 9rem);
margin-right: 0px;
}
}
4 changes: 1 addition & 3 deletions pgml-dashboard/templates/layout/web_app_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
<%+ WebAppNavbar::new(left_nav_links, account_management_nav) %>

<div class="d-flex">
<div class="leftnav-container py-3" >
<%+ WebAppLeftNav::new( upper_left_nav, lower_left_nav, dropdown_nav ) %>
</div>
<%+ WebAppLeftNav::new( upper_left_nav, lower_left_nav, dropdown_nav ) %>

<div class="clear-from-under-navbar flex-grow-1 min-vw-0">
<div class="px-5 py-3" style="position: absolute">
Expand Down