From 25118c683be05b0a2458a6e1891f53b7fb55b8d6 Mon Sep 17 00:00:00 2001 From: Vassili Minaev Date: Tue, 5 May 2026 18:38:05 -0600 Subject: [PATCH] Stylin --- frappe/public/scss/common/grid.scss | 2 +- frappe/public/scss/desk/form.scss | 2 +- frappe/public/scss/website/navbar.scss | 6 ++-- frappe/public/scss/website/page_builder.scss | 30 ++++++++----------- .../website_theme/website_theme_template.scss | 1 + frappe/www/me.css | 2 +- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss index a10c5c879d..4a06e5cce9 100644 --- a/frappe/public/scss/common/grid.scss +++ b/frappe/public/scss/common/grid.scss @@ -608,7 +608,7 @@ } &.active { - color: var(--primary); + /*color: var(--primary);*/ font-weight: 600; border-bottom-color: var(--primary); } diff --git a/frappe/public/scss/desk/form.scss b/frappe/public/scss/desk/form.scss index 5fe89298d9..5cd0ba3f91 100644 --- a/frappe/public/scss/desk/form.scss +++ b/frappe/public/scss/desk/form.scss @@ -529,7 +529,7 @@ &.active { font-weight: 400; border-bottom: 1px solid var(--text-color); - color: var(--text-neutral); + /* color: var(--text-neutral); */ padding-bottom: 9px; } &:focus-visible { diff --git a/frappe/public/scss/website/navbar.scss b/frappe/public/scss/website/navbar.scss index 1385665a46..cddb38e0a4 100644 --- a/frappe/public/scss/website/navbar.scss +++ b/frappe/public/scss/website/navbar.scss @@ -37,7 +37,6 @@ } .navbar-light { - border-bottom: 1px solid $border-color; background: $navbar-bg; .navbar-toggler .icon { @@ -128,14 +127,15 @@ } .navbar-light .navbar-nav .nav-link { - color: $gray-700; + color: var(--body-text-color); font-size: $font-size-sm; font-weight: 500; &:hover, &:focus, &.active { - color: $primary; + color: var(--body-text-color); + text-decoration: underline; } } diff --git a/frappe/public/scss/website/page_builder.scss b/frappe/public/scss/website/page_builder.scss index e761032940..d2f02ef5c3 100644 --- a/frappe/public/scss/website/page_builder.scss +++ b/frappe/public/scss/website/page_builder.scss @@ -90,38 +90,38 @@ } .section-padding { - padding-top: 3rem; - padding-bottom: 3rem; + padding-top: 1rem; + padding-bottom: 1rem; @include media-breakpoint-up(sm) { - padding-top: 5rem; - padding-bottom: 5rem; + padding-top: 2rem; + padding-bottom: 2rem; } @include media-breakpoint-up(xl) { - padding-top: 8rem; - padding-bottom: 8rem; + padding-top: 3rem; + padding-bottom: 3rem; } } .section-padding-top { - padding-top: 3rem; + padding-top: 1rem; @include media-breakpoint-up(sm) { - padding-top: 5rem; + padding-top: 2rem; } @include media-breakpoint-up(xl) { - padding-top: 8rem; + padding-top: 3rem; } } .section-padding-bottom { - padding-bottom: 3rem; + padding-bottom: 1rem; @include media-breakpoint-up(sm) { - padding-bottom: 5rem; + padding-bottom: 2rem; } @include media-breakpoint-up(xl) { - padding-bottom: 8rem; + padding-bottom: 3rem; } } @@ -230,22 +230,16 @@ padding-bottom: 1px; .nav-link { - color: $gray-800; font-weight: 500; border: none; padding: 1rem 0.5rem; margin-right: 2rem; white-space: nowrap; @include transition(); - - &:hover { - color: $primary; - } } .nav-link.active, .nav-item.show .nav-link { - color: darken($primary, 5%); background-color: transparent; border-bottom: 2px solid $primary; } diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss index 351fa63d29..27d9887fc8 100644 --- a/frappe/website/doctype/website_theme/website_theme_template.scss +++ b/frappe/website/doctype/website_theme/website_theme_template.scss @@ -16,6 +16,7 @@ $font-family-sans-serif: "{{ google_font }}", "InterVariable", "Inter", -apple-s {% if primary_color %}$primary: {{ frappe.db.get_value('Color', primary_color, 'color') }};{% endif -%} {% if dark_color %}$dark: {{ frappe.db.get_value('Color', dark_color, 'color') }};{% endif -%} {% if text_color %}$body-text-color: {{ frappe.db.get_value('Color', text_color, 'color') }};{% endif -%} +{% if light_color %}$light: {{ frappe.db.get_value('Color', light_color, 'color') }};{% endif -%} {% if background_color %}$body-bg: {{ frappe.db.get_value('Color', background_color, 'color') }};{% endif -%} $enable-shadows: {{ button_shadows and "true" or "false" }}; diff --git a/frappe/www/me.css b/frappe/www/me.css index 4465fd6798..1558056bba 100644 --- a/frappe/www/me.css +++ b/frappe/www/me.css @@ -6,5 +6,5 @@ max-width: 100vw; padding: 0; margin: 0; - background: var(--bg-light-gray); + /* background: var(--bg-light-gray); */ } \ No newline at end of file