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

fix breadcrumb, nav, bug#1209

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 1 commit intomasterfromdan-issues-bugs-things
Dec 1, 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
36 changes: 36 additions & 0 deletionspgml-dashboard/src/components/breadcrumbs/breadcrumbs.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@

.breadcrumb {
.breadcrumb-item {
display: flex;
align-items: center;
text-align: center;
border: none;

&:not(.active) a {
@extend .btn-tertiary-web-app;
padding: 0px;
}

&.active {
a {
color: #{$gray-100};
border-bottom: none;

&:hover {
@include semibold_by_shadow(#{$gray-100});
}

&:active {
@include bold_by_shadow(#{$gray-100});
}

}
}
}

.vr {
opacity: 1;
color: #{$gray-600};
width: 2px;
}
}
24 changes: 16 additions & 8 deletionspgml-dashboard/src/components/breadcrumbs/template.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
<nav>
<nav aria-label="breadcrumb z-1">
<ol class="breadcrumb">
<!-- not quite ready for this yet -->
<!-- <li class="breadcrumb-item body-regular-text <% if links.is_empty() {%>active<% } %>">
<a class="d-flex" href="/deployments">
<span class="material-symbols-outlined">
roofing
</span>
</a>
</li> -->
<% for link in links {
let active = if link.active {
"active"
Expand All@@ -15,14 +23,14 @@
};

%>
<li class="breadcrumb-item <%= active %> fs-6" <%- area %>>
<a class="" href="<%= link.href %>">
<%= link.name %>
</a>
<% if active.is_empty() { %>
<div class="vr my-1 ms-2 opacity-100" style="width: 2px"></div>
<% } %>
</li>
<li class="breadcrumb-itembody-regular-text<%= active %>" <%- area %>>
<a href="<%= link.href %>">
<%= link.name %>
</a>
<% if active.is_empty() { %>
<div class="vr my-1 ms-2"></div>
<% } %>
</li>
<% } %>
</ol>
</nav>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@

<div class="collapse navbar-collapse drawer-submenu-container navbarSupportedContent" id="navbarSupportedContent">
<!-- Main Menu -->
<div class="nav-item w-100 d-xl-flex flex-column flex-xl-row align-items-xl-center collapse collapse-horizontalshowdrawer-submenu <% for item in &mobile_nav_items {%> <%- item.collapse %><% } %>">
<div class="nav-item w-100 d-xl-flex flex-column flex-xl-row align-items-xl-center collapse collapse-horizontal drawer-submenu <% for item in &mobile_nav_items {%> <%- item.collapse %><% } %> show">
<ul class="navbar-nav flex-grow-1 gap-4 me-auto my-4 my-xl-0">

<% if !standalone_dashboard { %>
Expand Down
1 change: 0 additions & 1 deletionpgml-dashboard/static/css/bootstrap-theme.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,6 @@
// Components
@import 'scss/components/icon';
@import 'scss/components/admonitions';
@import 'scss/components/breadcrumb';
@import 'scss/components/navs';
@import 'scss/components/tables';
@import 'scss/components/badges';
Expand Down
1 change: 1 addition & 0 deletionspgml-dashboard/static/css/modules.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// There is no need to edit it manually.

@import "../../src/components/accordian/accordian.scss";
@import "../../src/components/breadcrumbs/breadcrumbs.scss";
@import "../../src/components/chatbot/chatbot.scss";
@import "../../src/components/dropdown/dropdown.scss";
@import "../../src/components/github_icon/github_icon.scss";
Expand Down
53 changes: 27 additions & 26 deletionspgml-dashboard/static/css/scss/base/_typography.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ h6, .h6 {
}
}

.eyebrow {
.eyebrow-text {
font-weight: $font-weight-bold; font-size: var(--eyebrow-font-size); line-height: var(--eyebrow-line-height);
@include media-breakpoint-down(md) {
font-size: 16px; line-height: 22px;
Expand All@@ -60,14 +60,35 @@ h6, .h6 {
font-size: 18px;
line-height: 22px;
}
.body-text {
font-size: 16px;
line-height: 20px;

.body-large-text {
font-size: var(--body-large-font-size); line-height: var(--body-large-line-height);
@include media-breakpoint-down(md) {
font-size: 18px; line-height: 24px;
}
}

.body-regular-text {
font-size: var(--body-regular-font-size); line-height: var(--body-regular-line-height);
@include media-breakpoint-down(md) {
font-size: 16px; line-height: 20px;
}
}

.body-small-text {
font-size: var(--body-small-font-size); line-height: var(--body-small-line-height);
@include media-breakpoint-down(md) {
font-size: 14px; line-height: 18px;
}
}

.legal-text {
font-family: Inter;
font-size: 12px;
line-height: 16px;
font-size: var(--legal-font-size);
line-height: var(--legal-line-height);
@include media-breakpoint-down(md) {
font-size: 12px; line-height: 16px;
}
}

.text-error {
Expand DownExpand Up@@ -108,23 +129,3 @@ h6, .h6 {
.text-gradient-party, .party-time {
@include text-gradient($gradient-text);
}

.marketing-body-large {
font-size: 20px;
line-height: 26px;
color: #{$gray-200};
@include media-breakpoint-down(md) {
font-size: 18px;
line-height: 24px;
}
}

.marketing-body {
font-size: 18px;
line-height: 22px;
color: #{$gray-200};
@include media-breakpoint-down(md) {
font-size: 16px;
line-height: 20px;
}
}
30 changes: 0 additions & 30 deletionspgml-dashboard/static/css/scss/components/_breadcrumb.scss
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletionspgml-dashboard/static/css/scss/components/_buttons.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -177,10 +177,6 @@
width: fit-content;
padding: 0px;

span {
font-size: 2rem;
}

&:hover {
color: #{$slate-tint-400};
border-bottom-color: #{$slate-tint-400};
Expand Down
8 changes: 8 additions & 0 deletionspgml-dashboard/static/css/scss/themes/docs.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,10 @@
--h5-font-size: 24px;
--h6-font-size: 20px;
--eyebrow-font-size: 18px;
--legal-font-size: 12px;
--body-large-font-size: 20px;
--body-regulare-font-size: 18px;
--body-small-font-size: 16px;

--h1-big-line-height: 84px;
--h1-line-height: 72px;
Expand All@@ -16,4 +20,8 @@
--h5-line-height: 30px;
--h6-line-height: 24px;
--eyebrow-line-height: 24px;
--legal-line-height: 16px;
--body-large-line-height: 26px;
--body-regular-line-height: 22px;
--body-small-line-height: 20px;
}
8 changes: 8 additions & 0 deletionspgml-dashboard/static/css/scss/themes/marketing.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@
--h5-font-size: 28px;
--h6-font-size: 24px;
--eyebrow-font-size: 18px;
--legal-font-size: 10px;
--body-large-font-size: 20px;
--body-regulare-font-size: 18px;
--body-small-font-size: 16px;

--h1-big-line-height: 84px;
--h1-line-height: 72px;
Expand All@@ -17,4 +21,8 @@
--h5-line-height: 34px;
--h6-line-height: 30px;
--eyebrow-line-height: 24px;
--legal-line-height: 14px;
--body-large-line-height: 26px;
--body-regular-line-height: 22px;
--body-small-line-height: 20px;
}
8 changes: 8 additions & 0 deletionspgml-dashboard/static/css/scss/themes/product.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,10 @@
--h5-font-size: 24px;
--h6-font-size: 20px;
--eyebrow-font-size: 14px;
--legal-font-size: 12px;
--body-large-font-size: 18px;
--body-regular-font-size: 16px;
--body-small-font-size: 14px;

--h1-big-line-height: 84px;
--h1-line-height: 72px;
Expand All@@ -16,4 +20,8 @@
--h5-line-height: 30px;
--h6-line-height: 24px;
--eyebrow-line-height: normal;
--legal-line-height: 16px;
--body-large-line-height: 24px;
--body-regular-line-height: 20px;
--body-small-line-height: 18px;
}
33 changes: 17 additions & 16 deletionspgml-dashboard/static/js/topnav-web-app.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,25 @@ import {
} from '@hotwired/stimulus'

export default class extends Controller {

connect() {
let navbarMenues = document.querySelectorAll('.navbar-collapse');

document.addEventListener('show.bs.collapse', e => {
this.closeOtherMenues(navbarMenues, e.target)
})
document.addEventListener('show.bs.collapse', this.closeOtherMenus)
document.addEventListener('hidden.bs.collapse', this.closeSubmenus, false)
}

document.addEventListener('hidden.bs.collapse', e => {
this.closeSubmenus(e.target.querySelectorAll('.drawer-submenu'))
closeSubmenus(e) {
let submenus = e.target.querySelectorAll('.drawer-submenu')
submenus.forEach(submenu => {
const bsInstance = bootstrap.Collapse.getInstance(submenu)
if ( bsInstance ) {
bsInstance.hide()
}
})
}

closeOtherMenues(menus, current) {
closeOtherMenus(e) {
let menus = document.querySelectorAll('.navbar-collapse')
let current = e.target

menus.forEach( menu => {
const bsInstance = bootstrap.Collapse.getInstance(menu)
if ( bsInstance && menu != current && menu != current.parentElement ) {
Expand All@@ -25,12 +30,8 @@ export default class extends Controller {
})
}

closeSubmenus(submenues) {
submenues.forEach(submenu => {
const bsInstance = bootstrap.Collapse.getInstance(submenu)
if ( bsInstance ) {
bsInstance.hide()
}
})
disconnect() {
document.removeEventListener('show.bs.collapse', this.closeOtherMenus)
document.removeEventListener('hidden.bs.collapse', this.closeSubmenus)
}
}
4 changes: 2 additions & 2 deletionspgml-dashboard/templates/layout/base.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@
use crate::components::navigation::navbar::marketing::Marketing as MarketingNavbar;
%>
<!DOCTYPE html>
<html lang="en-US" data-bs-theme="dark" data-theme="docs">
<html lang="en-US">

<% include!("head.html"); %>

<body>
<body data-bs-theme="dark" data-theme="docs">
<main>
<div class="container-fluid bg-primary pb-4 min-vh-100">
<div class="ellipse-container position-absolute" style="margin: -2rem; height: 100vh; width: 100vw;">
Expand Down
4 changes: 2 additions & 2 deletionspgml-dashboard/templates/layout/web_app_base.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@
%>

<!DOCTYPE html>
<html lang="en-US" data-bs-theme="dark" data-theme="product">
<html lang="en-US">
<%- head %>
<body>
<body data-bs-theme="dark" data-theme="product">
<% for component in body_components { %>
<%+ component %>
<% } %>
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp