diff --git a/frappe/public/scss/website/footer.scss b/frappe/public/scss/website/footer.scss index e112b1cbea..b0ae0c5776 100644 --- a/frappe/public/scss/website/footer.scss +++ b/frappe/public/scss/website/footer.scss @@ -1,8 +1,6 @@ .web-footer { padding: 3rem 0; - min-height: 140px; background-color: var(--fg-color); - border-top: 1px solid $border-color; margin-top: auto; } @@ -21,11 +19,11 @@ .footer-child-item a { font-size: $font-size-sm; font-weight: 500; - color: $gray-700; + color: var(--body-text-color); &:hover { - color: $primary; - text-decoration: none; + color: var(--body-text-color); + text-decoration: underline; } } @@ -81,7 +79,7 @@ } .footer-info { - color: $text-muted; + color: var(--body-text-color); font-size: $font-size-sm; } diff --git a/frappe/templates/includes/footer/footer.html b/frappe/templates/includes/footer/footer.html index 2016c7e3d9..477dd506ce 100644 --- a/frappe/templates/includes/footer/footer.html +++ b/frappe/templates/includes/footer/footer.html @@ -2,9 +2,9 @@
{% include "templates/includes/footer/footer_logo_extension.html" %} - {% if footer_items -%} + {% include "templates/includes/footer/footer_links.html" %} {% include "templates/includes/footer/footer_info.html" %} diff --git a/frappe/templates/includes/footer/footer_info.html b/frappe/templates/includes/footer/footer_info.html index ba04949ec0..fcab2ed51b 100644 --- a/frappe/templates/includes/footer/footer_info.html +++ b/frappe/templates/includes/footer/footer_info.html @@ -1,6 +1,7 @@
-
+ +
{% if copyright %} © {{ copyright }} {% endif %} @@ -10,6 +11,7 @@ {% endif %}
{# powered #} +
diff --git a/frappe/templates/includes/footer/footer_links.html b/frappe/templates/includes/footer/footer_links.html index 7f71f0548a..6ea5673289 100644 --- a/frappe/templates/includes/footer/footer_links.html +++ b/frappe/templates/includes/footer/footer_links.html @@ -9,16 +9,18 @@ {% endmacro %}
-
+ +
{%- for item in footer_items if item.label and not (item.parent_label or item.child_items) and not item.right %} {{ footer_link(item) }} + {{ "|" if not loop.last }} {% endfor -%}
-
+
diff --git a/frappe/website/web_template/primary_navbar/__init__.py b/frappe/website/web_template/primary_navbar/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/web_template/primary_navbar/primary_navbar.html b/frappe/website/web_template/primary_navbar/primary_navbar.html deleted file mode 100644 index 9ff23259eb..0000000000 --- a/frappe/website/web_template/primary_navbar/primary_navbar.html +++ /dev/null @@ -1,29 +0,0 @@ - \ No newline at end of file diff --git a/frappe/website/web_template/primary_navbar/primary_navbar.json b/frappe/website/web_template/primary_navbar/primary_navbar.json deleted file mode 100644 index 1ccac8fcd8..0000000000 --- a/frappe/website/web_template/primary_navbar/primary_navbar.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "__islocal": true, - "__unsaved": 1, - "creation": "2021-01-20 13:20:46.147656", - "docstatus": 0, - "doctype": "Web Template", - "fields": [], - "idx": 0, - "modified": "2021-01-20 13:20:46.147656", - "modified_by": "Administrator", - "module": "Website", - "name": "Primary Navbar", - "owner": "Administrator", - "standard": 1, - "template": "", - "type": "Navbar" -} \ No newline at end of file diff --git a/frappe/website/web_template/standard_navbar/__init__.py b/frappe/website/web_template/standard_navbar/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/web_template/standard_navbar/standard_navbar.html b/frappe/website/web_template/standard_navbar/standard_navbar.html deleted file mode 100644 index 46a0099e0b..0000000000 --- a/frappe/website/web_template/standard_navbar/standard_navbar.html +++ /dev/null @@ -1 +0,0 @@ -{% include "templates/includes/navbar/navbar.html" %} diff --git a/frappe/website/web_template/standard_navbar/standard_navbar.json b/frappe/website/web_template/standard_navbar/standard_navbar.json deleted file mode 100644 index c1eb6324a2..0000000000 --- a/frappe/website/web_template/standard_navbar/standard_navbar.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "creation": "2020-08-19 17:49:37.288380", - "docstatus": 0, - "doctype": "Web Template", - "fields": [], - "idx": 0, - "modified": "2020-08-19 17:50:44.342765", - "modified_by": "Administrator", - "name": "Standard Navbar", - "owner": "Administrator", - "standard": 1, - "type": "Navbar" -} \ No newline at end of file diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index a20d01f420..691c473526 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1,20 +1,27 @@ { + "background_color": "Background", "button_gradients": 0, "button_rounded_corners": 1, "button_shadows": 0, "creation": "2015-02-19 13:37:33.925909", "custom": 0, "custom_overrides": "", + "dark_color": "Primary", "docstatus": 0, "doctype": "Website Theme", "font_properties": "wght:400;500;600;700;800", + "google_font": "Ethnocentric", "idx": 28, - "modified": "2020-06-15 13:10:16.618476", + "ignored_apps": [], + "light_color": "Gold Text", + "modified": "2026-03-17 20:45:47.424219", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", + "primary_color": "Primary", + "text_color": "Gold Text", "theme": "Standard", - "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n// Bootstrap Variable Overrides\n\n\n@import \"frappe/public/scss/website\";\n\n\n\n// Custom Theme\n", - "theme_url": "/assets/css/standard_style.css" -} \ No newline at end of file + "theme_scss": "\n@import url(\"https://fonts.googleapis.com/css2?family=Ethnocentric:wght:400;500;600;700;800&display=swap\");\n// backward compatibility. deprecated in v15\n$font-family-sans-serif: \"Ethnocentric\", \"InterVariable\", \"Inter\", -apple-system, BlinkMacSystemFont,\n\t\"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\", \"Fira Sans\",\n\t\"Droid Sans\", \"Helvetica Neue\", sans-serif;\n\n// override font stack if custom font is set in website theme\n:root {\n\t--font-stack: \"Ethnocentric\", \"InterVariable\", \"Inter\", -apple-system, BlinkMacSystemFont,\n\t\"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\", \"Fira Sans\",\n\t\"Droid Sans\", \"Helvetica Neue\", sans-serif !important;\n}\n$primary: #8139c4;$dark: #8139c4;$body-text-color: #e6c96c;$body-bg: #4e3269;$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n// Bootstrap Variable Overrides\n\n\n// Import themes from installed apps\n@import \"frappe/public/scss/website.bundle\";\n\n\n\n// Custom Theme\n\n\n:root {\n\t\n\t--primary: #{$primary};\n\t--primary-color: #{$primary};\n\t\n\t--bg-color: #{$body-bg};\n\t\n\t--text-color: #{$body-text-color};\n\t--text-light: #{$body-text-color};\n\t}\n", + "theme_url": "/files/website_theme/standard_style.css" +}