Revert shell.css primitive rework (5 commits eea1ed6..a8f5bce)
This commit is contained in:
parent
a8f5bce9ee
commit
ddd3b3eca1
5 changed files with 31 additions and 72 deletions
|
|
@ -7,6 +7,7 @@
|
|||
<title>Containers — Z-AMPP</title>
|
||||
<link rel="stylesheet" href="/dist/app.css">
|
||||
<style>
|
||||
body { margin: 0; }
|
||||
|
||||
/* Page-only auto-refresh indicator (preserves original IDs + look-and-feel) */
|
||||
.refresh-indicator {
|
||||
|
|
@ -58,7 +59,7 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<div class="wd-shell">
|
||||
<div class="wd-shell" style="display:flex;min-height:100vh;">
|
||||
<nav class="wd-sidebar" aria-label="Main navigation">
|
||||
<div class="wd-sidebar-header">
|
||||
<img src="img/dragon-logo.png?v=1" alt="Wild Dragon" style="width:18px;height:18px;">
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
<style>
|
||||
/* Page-only layout. Sidebar + all chrome is from /dist/app.css primitives.
|
||||
Hero / cards / SVG art are bespoke to the home landing page. */
|
||||
body { margin: 0; }
|
||||
.wd-shell { display: flex; min-height: 100vh; }
|
||||
|
||||
.home-main {
|
||||
flex: 1;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<title>Users — Z-AMPP</title>
|
||||
<link rel="stylesheet" href="/dist/app.css">
|
||||
<style>
|
||||
body { margin: 0; }
|
||||
|
||||
/* Local-only tabs styling — JS toggles .tab.active and .tab-content.active,
|
||||
so we keep those class names and just retheme. */
|
||||
|
|
@ -118,7 +119,7 @@
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wd-shell">
|
||||
<div class="wd-shell" style="display:flex;min-height:100vh;">
|
||||
|
||||
<!-- Sidebar -->
|
||||
<nav class="wd-sidebar" aria-label="Main navigation">
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@
|
|||
*
|
||||
* IMPORTANT: All @import must come first per CSS spec / postcss-import
|
||||
* requirements. Tailwind directives below; cascade order in the emitted
|
||||
* bundle is: tokens → shell → primitives → tailwind base → tailwind
|
||||
* components → tailwind utilities. Utilities win on specificity,
|
||||
* primitives win over base where they share specificity.
|
||||
* bundle is: tokens → primitives → tailwind base → tailwind components
|
||||
* → tailwind utilities. Utilities win on specificity, primitives win
|
||||
* over base where they share specificity.
|
||||
*/
|
||||
@import "./components/tokens.css";
|
||||
@import "./components/shell.css";
|
||||
@import "./components/sidebar.css";
|
||||
@import "./components/topbar.css";
|
||||
@import "./components/button.css";
|
||||
|
|
@ -30,25 +29,42 @@
|
|||
@font-face {
|
||||
font-family: 'Inter';
|
||||
src: url('/fonts/inter-400.woff2') format('woff2');
|
||||
font-weight: 400; font-style: normal; font-display: swap;
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Inter';
|
||||
src: url('/fonts/inter-500.woff2') format('woff2');
|
||||
font-weight: 500; font-style: normal; font-display: swap;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Inter';
|
||||
src: url('/fonts/inter-600.woff2') format('woff2');
|
||||
font-weight: 600; font-style: normal; font-display: swap;
|
||||
font-weight: 600;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'JetBrains Mono';
|
||||
src: url('/fonts/jetbrains-mono-400.woff2') format('woff2');
|
||||
font-weight: 400; font-style: normal; font-display: swap;
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'JetBrains Mono';
|
||||
src: url('/fonts/jetbrains-mono-600.woff2') format('woff2');
|
||||
font-weight: 600; font-style: normal; font-display: swap;
|
||||
font-weight: 600;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
|
||||
html {
|
||||
font-family: var(--font);
|
||||
background: var(--bg-base);
|
||||
color: var(--text-primary);
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
/* shell.css ─ root document + app shell primitives.
|
||||
*
|
||||
* Defines the html/body baseline AND the .wd-shell horizontal layout
|
||||
* (sidebar + main pane). Every authenticated app page mounts inside
|
||||
* .wd-shell; this is the only correct way to lay out the app.
|
||||
*
|
||||
* History: pre-shell.css, each page rolled its own
|
||||
* body { margin: 0; } .wd-shell { display: flex; min-height: 100vh; }
|
||||
* inline. Pages that forgot rendered with the sidebar stacking on top
|
||||
* of the content (8px default body margin + display:block .wd-shell),
|
||||
* which read as "dead space at top, left-shifted content at bottom".
|
||||
* Codifying it here prevents that footgun.
|
||||
*/
|
||||
|
||||
html, body {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
background: var(--bg-base);
|
||||
color: var(--text-primary);
|
||||
font-family: var(--font);
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
/* App shell: sidebar (fixed width) + main pane (flex-fills viewport).
|
||||
* 100dvh handles mobile chrome resize; 100vh as fallback. */
|
||||
.wd-shell {
|
||||
display: flex;
|
||||
min-height: 100vh;
|
||||
min-height: 100dvh;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* Default main-pane container. Pages may override background/scroll,
|
||||
* but the sizing contract is fixed: fill remaining horizontal space,
|
||||
* scroll vertically, never escape viewport horizontally. */
|
||||
.wd-main {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
background: var(--bg-base);
|
||||
}
|
||||
|
||||
/* Content wrapper inside .wd-main. Caps width for readability on
|
||||
* ultrawide displays; --full opts out for dense data pages. */
|
||||
.wd-content {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
max-width: 1440px;
|
||||
margin: 0 auto;
|
||||
padding: 24px 32px;
|
||||
}
|
||||
.wd-content--full { max-width: none; padding: 0; }
|
||||
.wd-content--narrow { max-width: 780px; }
|
||||
Loading…
Reference in a new issue