From b2977370354ad5d6e5db43fb55804be54a6c5eb5 Mon Sep 17 00:00:00 2001 From: Will Hannon Date: Thu, 11 Apr 2024 10:57:07 -0700 Subject: [PATCH] Harmonize pad, marg, and width between main and nav --- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- v0/css/layout.css | 13 +++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1f56ea..425f96f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -442,3 +442,21 @@ ### Removed - N/A + +## [0.6.2] - 2024-04-11 + +### Added + +- N/A + +### Changed + +- Harmonize the padding, margins, and min/max widths of the sidebar and main content. + +### Deprecated + +- N/A + +### Removed + +- N/A \ No newline at end of file diff --git a/package.json b/package.json index 3652432..277184a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "dms-viz.github.io", "private": true, - "version": "v0.6.1", + "version": "v0.6.2", "type": "module", "scripts": { "dev": "vite", diff --git a/v0/css/layout.css b/v0/css/layout.css index d624825..4390b69 100644 --- a/v0/css/layout.css +++ b/v0/css/layout.css @@ -25,27 +25,28 @@ display: flex; flex-direction: column; align-items: center; - margin-top: 10px; - padding-left: calc(var(--sidebar-width) + 32px); + margin: 10px auto 0 auto; + max-width: calc(var(--layout-max-width) + var(--sidebar-width)); + min-width: calc(var(--layout-min-width) + var(--sidebar-width)); padding-right: 32px; min-height: 100vh; } .app-main.sidebar-collapsed { - padding-left: calc(var(--sidebar-icon-width) + 32px); + max-width: calc(var(--layout-max-width) + var(--sidebar-icon-width)); + min-width: calc(var(--layout-min-width) + var(--sidebar-icon-width)); } .app-main .container { - max-width: calc(var(--layout-max-width) - var(--sidebar-width)); - min-width: var(--layout-min-width); width: 100%; + padding-left: calc(var(--sidebar-width) + 32px); box-sizing: border-box; margin-left: auto; margin-right: auto; } .app-main.sidebar-collapsed .container { - max-width: calc(var(--layout-max-width) - var(--sidebar-icon-width)); + padding-left: calc(var(--sidebar-icon-width) + 32px); } .protein {