diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md index 4fccd90c..9b4ac890 100644 --- a/MIGRATION_GUIDE.md +++ b/MIGRATION_GUIDE.md @@ -4,6 +4,34 @@ This project is using the **Strangler Fig Pattern** to incrementally migrate from Bootstrap 3.3.7 to Tailwind CSS v4 + DaisyUI v5. +## Layout Architecture + +### Paper-over-Background Design + +The modern framework uses a "paper hovering over background" design: + +- **Background**: `bg-base-300` (slightly darker gray) +- **Content Area**: `bg-base-100` (white/light) with shadow and rounded corners on medium+ screens +- **Responsive**: Full width on mobile, centered with visible background on larger screens + +### Two Layout Modes + +**1. Standard Paper Layout** (default) +```django +{% block content %} + + +{% endblock content %} +``` + +**2. Full-Width Layout** (for landing pages, special layouts) +```django +{% block main_content %} + + +{% endblock main_content %} +``` + ## Architecture ### Two Base Templates diff --git a/static/css/daisyui-theme.css b/static/css/daisyui-theme.css index c79c56e6..7b4c8969 100644 --- a/static/css/daisyui-theme.css +++ b/static/css/daisyui-theme.css @@ -9,26 +9,26 @@ default: true; color-scheme: light; - --color-base-100: blue; - --color-base-200: oklch(95% 0.03 240); - --color-base-300: oklch(92% 0.04 240); - --color-base-content: oklch(20% 0.05 240); - --color-primary: oklch(55% 0.3 240); - --color-primary-content: oklch(98% 0.01 240); - --color-secondary: oklch(70% 0.25 200); - --color-secondary-content: oklch(98% 0.01 200); - --color-accent: oklch(65% 0.25 160); - --color-accent-content: oklch(98% 0.01 160); - --color-neutral: oklch(50% 0.05 240); - --color-neutral-content: oklch(98% 0.01 240); - --color-info: oklch(70% 0.2 220); - --color-info-content: oklch(98% 0.01 220); - --color-success: oklch(65% 0.25 140); - --color-success-content: oklch(98% 0.01 140); - --color-warning: oklch(80% 0.25 80); - --color-warning-content: oklch(20% 0.05 80); - --color-error: oklch(65% 0.3 30); - --color-error-content: oklch(98% 0.01 30); + --color-base-100: var(--color-neutral-50); + --color-base-200: var(--color-neutral-100); + --color-base-300: var(--color-neutral-200); + --color-base-content: var(--color-neutral-900); + --color-primary: var(--color-primary-500); + --color-primary-content: var(--color-primary-950); + --color-secondary: var(--color-secondary-500); + --color-secondary-content: var(--color-secondary-950); + --color-accent: var(--color-accent-500); + --color-accent-content: var(--color-accent-950); + --color-neutral: var(--color-neutral-500); + --color-neutral-content: var(--color-neutral-950); + --color-info: var(--color-info-500); + --color-info-content: var(--color-info-950); + --color-success: var(--color-success-500); + --color-success-content: var(--color-success-950); + --color-warning: var(--color-warning-500); + --color-warning-content: var(--color-warning-950); + --color-error: var(--color-error-500); + --color-error-content: var(--color-error-950); /* border radius */ --radius-selector: 1rem; @@ -61,7 +61,7 @@ --color-accent-content: var(--color-neutral-950); --color-neutral: var(--color-neutral-300); --color-neutral-content: var(--color-neutral-900); - --color-base-100: blue; + --color-base-100: var(--color-neutral-900); --color-base-200: var(--color-neutral-800); --color-base-300: var(--color-neutral-700); --color-base-content: var(--color-neutral-50); diff --git a/static/css/input.css b/static/css/input.css index ed95f89d..3f904a4e 100644 --- a/static/css/input.css +++ b/static/css/input.css @@ -12,22 +12,3 @@ } @import "./daisyui-theme.css"; - -/* Bootstrap compatibility layer - prevent Bootstrap from overriding Tailwind */ -@layer base { - /* Ensure Tailwind's preflight takes precedence in non-legacy sections */ - body:not(.legacy-bootstrap *) { - @apply antialiased; - } -} - -@layer utilities { - /* Add important utilities for overriding Bootstrap where needed */ - .tw-flex { - display: flex !important; - } - - .tw-grid { - display: grid !important; - } -} diff --git a/templates/framework_modern.html b/templates/framework_modern.html index e357a104..ed650a65 100644 --- a/templates/framework_modern.html +++ b/templates/framework_modern.html @@ -59,22 +59,23 @@ {% endif %} - + {% include "includes/navbar.html" %} {# Main Content Area #} -
-
+
+ {% block main_content %} + {# Breadcrumbs - outside main content, optional #} {% if breadcrumbs %} -
+
{% endif %} - {% if message %} -
- {{ message }} -
- {% endif %} - - {% block content %} - {% endblock content %} - - {% if meta.url_contains_package and meta.current_package.license %} -
- -
- License + {# Main content container - paper effect on medium+ screens #} +
+ {# Messages - inside paper #} + {% if message %} +
+ {{ message }}
-
- - License - + {% endif %} + + {# Page content - no enforced styles #} + {% block content %} + {% endblock content %} + + {# License - inside paper if present #} + {% if meta.url_contains_package and meta.current_package.license %} +
+ +
+ License +
+
+ + License + +
-
- {% endif %} -
+ {% endif %} +
+ {% endblock main_content %}
{% include "includes/footer.html" %} diff --git a/templates/index/index.html b/templates/index/index.html index 89ca0a9f..fb635feb 100644 --- a/templates/index/index.html +++ b/templates/index/index.html @@ -1,74 +1,75 @@ {% extends "framework_modern.html" %} {% load static %} -{% block content %} - - +{% block main_content %} -
- -
+
+
- -
- enviPath -
+
+
+
+
- -
-
- {% csrf_token %} - +
+ + - -
- - Learn more » - +
+ {% csrf_token %} +
+ + +
+ Example 1 Example 2 + Advanced + + + +
+
+
+
+
+ +
+
+
+ +
+
+
-

Community Updates

+

Community Updates

@@ -90,17 +91,17 @@
-
-
-
-

About enviPath

-

+

+
+

About enviPath

+
+

enviPath is a database and prediction system for the microbial biotransformation of organic environmental contaminants. The database provides the possibility to store and view experimentally observed biotransformation pathways.

-

+

The pathway prediction system provides different relative reasoning models to predict likely biotransformation pathways and products. Explore our tools and contribute to advancing environmental biotransformation research. @@ -180,4 +181,4 @@ processDiscourseTopics(); }); -{% endblock content %} +{% endblock main_content %}