Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Dan icon dropdown fix#1073

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
chillenberger merged 3 commits intomasterfromdan-icon-dropdown-fix
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
<% use crate::components::{LeftNavMenu, Dropdown}; %>
<nav class="navbarleftnav nav-pills h-100" data-controller="extend-bs-collapse navigation-left-nav-web-app" data-extend-bs-collapse-affected-value=".leftnav-collapse-affect">
<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">
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
}

.leftnav {
@extend .navbar;
max-width: 260px;

border: none;
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
.navbar-marketing-site {
@extend .navbar;
&.horizontal {
background: linear-gradient(180deg, rgba(0, 0, 0, 0.64) -55.68%, rgba(0, 0, 0, 0) 100%);
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
<% use crate::templates::components::PostgresLogo; %>

<div class="sticky-top-nav" data-controller="navigation-navbar-marketing">
<nav class="navbar navbar-marketing-site horizontal navbar-expand-lg" data-controller="search topnav-styling">
<nav class="navbar-marketing-site horizontal navbar-expand-lg" data-controller="search topnav-styling">
<div class="container gap-4">
<div class="controls">
<%+ PostgresLogo::new("/") %>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
%>

<div class="fixed-top-nav" data-controller="navigation-navbar-web-app">
<nav class="navbar navbar-web-app horizontal navbar-expand-lg" data-controller="search topnav-web-app">
<nav class="navbar-web-app horizontal navbar-expand-lg" data-controller="search topnav-web-app">

<div class="controls">
<!-- Toggles items that come from left nav -->
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
.navbar-web-app {
@extend .navbar;
background-color: var(--webapp-nav-bg);

border-bottom: 1px solid #{$gray-500};
Expand Down
10 changes: 5 additions & 5 deletionspgml-dashboard/src/guards.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl Cluster {
"Notebooks".to_string(),
"/dashboard?tab=Notebooks".to_string(),
)
.icon("thumbnail_bar")
.icon("add_notes")
.active(
uri.is_some()
&& (uri.clone().unwrap().starts_with("/dashboard?tab=Notebook")
Expand All@@ -100,7 +100,7 @@ impl Cluster {
"Projects".to_string(),
"/dashboard?tab=Projects".to_string(),
)
.icon("thumbnail_bar")
.icon("library_add")
.active(
uri.is_some()
&& uri.clone().unwrap().starts_with("/dashboard?tab=Project"),
Expand All@@ -109,7 +109,7 @@ impl Cluster {
"Models".to_string(),
"/dashboard?tab=Models".to_string(),
)
.icon("thumbnail_bar")
.icon("space_dashboard")
.active(
uri.is_some()
&& uri.clone().unwrap().starts_with("/dashboard?tab=Model"),
Expand All@@ -118,7 +118,7 @@ impl Cluster {
"Snapshots".to_string(),
"/dashboard?tab=Snapshots".to_string(),
)
.icon("thumbnail_bar")
.icon("filter_center_focus")
.active(
uri.is_some()
&& uri.clone().unwrap().starts_with("/dashboard?tab=Snapshot"),
Expand All@@ -127,7 +127,7 @@ impl Cluster {
"Upload data".to_string(),
"/dashboard?tab=Upload_Data".to_string(),
)
.icon("thumbnail_bar")
.icon("upload")
.active(
uri.is_some()
&& uri
Expand Down
6 changes: 5 additions & 1 deletionpgml-dashboard/static/css/scss/layout/_containers.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,10 @@

.webapp-content-max-width-container {
max-width: $webapp-content-max-width;
margin: 0pxauto;
margin: 0px20px;
min-height: calc(100vh - $navbar-height - $breadcrumb-height - 1px);

@include media-breakpoint-up(md) {
margin: 0px auto;
}
}
[8]ページ先頭
©2009-2025 Movatter.jp