diff --git a/foundation/public/css/reset.css b/foundation/public/css/reset.css index c6b8ba9c..45d0549f 100644 --- a/foundation/public/css/reset.css +++ b/foundation/public/css/reset.css @@ -15,22 +15,6 @@ box-sizing: border-box; } -html { - font-family: sans-serif; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - -ms-overflow-style: scrollbar; - -webkit-tap-highlight-color: transparent; - line-height: 1.62; - font-size: 14px; -} - -@media screen and (min-width: 1199px) { - html { - font-size: 16px; - } -} - @-ms-viewport { width: device-width; } @@ -50,11 +34,6 @@ section { } body { - margin: 0; - font-weight: 400; - text-align: left; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica", "Arial", "Noto", "Oxygen-Sans", "Noto Sans", "Ubuntu", "Cantarell", sans-serif, "Apple Color Emoji", "Noto Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - color: #36414c; font-feature-settings: "kern" 1; font-kerning: normal; text-rendering: optimizeLegibility; @@ -78,6 +57,7 @@ h5, h6 { margin: 0; font-weight: 500; + line-height: 1; } p { diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less index 8f1be71d..962d1596 100644 --- a/foundation/public/less/erpnext-org-theme.less +++ b/foundation/public/less/erpnext-org-theme.less @@ -15,9 +15,8 @@ fill: var(--dark-grey); height: 1rem; width: 1rem; - position: absolute; left: 1rem; - top: 50%; + top: 50%; transform: translateY(-50%); } diff --git a/foundation/templates/base.html b/foundation/templates/base.html index e6196cfc..cb299903 100644 --- a/foundation/templates/base.html +++ b/foundation/templates/base.html @@ -3,20 +3,13 @@ {% block meta_block %}{% endblock %} - - {% if path != '' %} - - - - {% endif %} - {% if path == 'contact' %} {% endif %} {% endblock %} {% block body %} - + {%- block navbar -%}{% include "templates/includes/navbar/navbar.html" %}{%- endblock -%} {% block content %} {{ content }} diff --git a/foundation/templates/includes/footer/footer.html b/foundation/templates/includes/footer/footer.html index 317d5bdc..6024f6fa 100644 --- a/foundation/templates/includes/footer/footer.html +++ b/foundation/templates/includes/footer/footer.html @@ -1,7 +1,7 @@