diff --git a/src/renderer/App.css b/src/renderer/App.css index 866c01197bf6f..f031b839caf01 100644 --- a/src/renderer/App.css +++ b/src/renderer/App.css @@ -13,11 +13,10 @@ .routerView { flex: 1 1 0%; margin-block: 18px; - margin-inline: 10px; + margin-inline: 5px; } .banner { - inline-size: 85%; margin-block: 40px 0; margin-inline: auto; } @@ -55,6 +54,18 @@ opacity: 0; } +/* align banner with ft-card width using identical styling rules */ +@media only screen and (width > 680px) { + .isSideNavOpen .banner { + max-inline-size: min(calc(100vw + -262px), 2800px); + } + + .hideLabelsSideBar .banner { + max-inline-size: min(calc(100vw + -122px), 2800px); + } +} + + @media only screen and (width <= 680px) { .routerView { margin-block: 68px; @@ -62,7 +73,7 @@ } .banner { - inline-size: 90%; + max-inline-size: calc(100vw - 64px); margin-block: 60px 0; } diff --git a/src/renderer/components/FtAutoGrid/FtAutoGrid.css b/src/renderer/components/FtAutoGrid/FtAutoGrid.css index ed10d515183ea..d6acdeff4399d 100644 --- a/src/renderer/components/FtAutoGrid/FtAutoGrid.css +++ b/src/renderer/components/FtAutoGrid/FtAutoGrid.css @@ -1,11 +1,30 @@ -.grid { +.autoGrid { display: grid; grid-gap: 8px; grid-template-columns: repeat(auto-fill, minmax(262px, 1fr)); justify-content: space-evenly; } -.list { +.autoList { display: grid; grid-gap: 4px; } + +@media (width >= 1514px) { + .autoList { + justify-content: center; + } +} + +/* Cap grid column width at 5 for larger viewports */ +@media (width >= 1605px) { + .autoGrid { + grid-template-columns: repeat(5, minmax(262px, 1fr)); + } +} + +@media (width >= 2000px) { + .autoGrid { + grid-template-columns: repeat(6, minmax(262px, 1fr)); + } +} diff --git a/src/renderer/components/FtAutoGrid/FtAutoGrid.vue b/src/renderer/components/FtAutoGrid/FtAutoGrid.vue index 05af66ecb95a9..eaa2e8eb4f406 100644 --- a/src/renderer/components/FtAutoGrid/FtAutoGrid.vue +++ b/src/renderer/components/FtAutoGrid/FtAutoGrid.vue @@ -1,8 +1,8 @@