diff --git a/foundation/hooks.py b/foundation/hooks.py index 11398a4b..94cb3788 100644 --- a/foundation/hooks.py +++ b/foundation/hooks.py @@ -39,7 +39,7 @@ home_page = "index" template_apps = ['foundation', 'erpnext', 'frappe'] website_context = { # "navbar_search": 1, - "brand_html": "ERPNext.org", + "brand_html": "ERPNext.org", "top_bar_items": [ {"label": "Foundation", "child_items":[ {"label": "Chapter", "url": "/chapters","right": 1}, diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css index ffc75988..12389294 100644 --- a/foundation/public/css/erpnext-org-theme.css +++ b/foundation/public/css/erpnext-org-theme.css @@ -118,7 +118,7 @@ a:hover { border-top: 1px solid #EBEFF2; } .homepage-illustration { - margin-bottom: 4rem; + margin-bottom: 2.5rem; width: 100%; max-width: 900px; } @@ -129,6 +129,17 @@ a:hover { .domain-links { font-size: 1.5rem; } +.domain-image { + width: 200px; + padding-bottom: 1.5rem; +} +.list-items { + text-align: center; + padding: 2em; + border: 1px solid #d1d8dd; + border-radius: .5rem; + background-color: #fff; +} .list.grid-of-four { grid-gap: 4rem; } @@ -140,6 +151,9 @@ a:hover { .left-aligned { text-align: left; } +.right-aligned { + text-align: right; +} .centered { text-align: center; } @@ -210,6 +224,9 @@ a:hover { .gray-bg { background-color: #fafbfc; } +.dark-bg { + background-color: #2E3338; +} .community-bg { background-image: linear-gradient(to bottom, rgba(117, 116, 254, 0.52), #7574fe), url("/assets/foundation/img/community-2016.jpg"); background-size: cover; @@ -244,7 +261,6 @@ a:hover { display: flex; text-align: left; justify-content: space-between; - margin-bottom: 8rem; } .footer-list { padding-left: 0; @@ -305,6 +321,22 @@ hr { border: 0; border-top: 1px solid #EBEFF2; } +.footer-end { + border-top: 1px solid #EBEFF2; + padding: 2rem 2.5rem; + font-size: 0.75rem; +} +.footer-end a { + text-decoration: underline; + color: #8D99A6; +} +.footer-end a:hover { + color: #fff; +} +.footer-icon { + width: 1.5rem; + margin-right: .5em; +} /* loaned from bootstrap*/ .btn-default { color: inherit; @@ -374,6 +406,13 @@ hr { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; } +code { + color: #FC4F51; + background: #fff5f5; + padding: .25em; + border-radius: .25em; + font-size: .85em; +} /*loaned from frappe*/ .page-card { max-width: 360px; @@ -396,4 +435,30 @@ hr { .btn-primary { background-color: #7575ff; border-color: #7575ff; + color: #fff; + transition: background-color 0.5s ease-in; +} +.btn-primary:hover, +.btn-primary:focus, +.btn-primary.focus, +.btn-primary:active, +.btn-primary.active, +.open > .dropdown-toggle.btn-primary { + color: #fff; + background-color: #5e5ec9; + border-color: #5e5ec9; + text-decoration: none; +} +.screenshot { + width: 100%; + margin: auto; +} +img.blog-cover-image, +.blog-text img, +.screenshot { + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1); + border: 1px solid #d1d8dd; +} +.btn-next-wrapper { + margin-top: 4rem; } diff --git a/foundation/public/img/erpnext-foundation-icon.svg b/foundation/public/img/erpnext-foundation-icon.svg deleted file mode 100644 index e6053e18..00000000 --- a/foundation/public/img/erpnext-foundation-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - erp-icon - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/foundation/public/img/erpnext-foundation.png b/foundation/public/img/erpnext-foundation.png deleted file mode 100644 index 7ad3cf86..00000000 Binary files a/foundation/public/img/erpnext-foundation.png and /dev/null differ diff --git a/foundation/public/img/erpnext-logo.jpg b/foundation/public/img/erpnext-logo.jpg deleted file mode 100644 index 811eca83..00000000 Binary files a/foundation/public/img/erpnext-logo.jpg and /dev/null differ diff --git a/foundation/public/img/erpnext-logo.svg b/foundation/public/img/erpnext-logo.svg index 60b3d4d0..4e0c26d1 100644 --- a/foundation/public/img/erpnext-logo.svg +++ b/foundation/public/img/erpnext-logo.svg @@ -1,36 +1,127 @@ - - - - - - - - - - - - - - + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/foundation/public/img/manufacturing-domain.svg b/foundation/public/img/manufacturing-domain.svg new file mode 100644 index 00000000..60589578 --- /dev/null +++ b/foundation/public/img/manufacturing-domain.svg @@ -0,0 +1,459 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less index fa2c1ac6..7b576b2c 100644 --- a/foundation/public/less/erpnext-org-theme.less +++ b/foundation/public/less/erpnext-org-theme.less @@ -5,7 +5,7 @@ a { color:@brand-primary; text-decoration:none; - transition: color .5s ease-in; + transition: @transition-color; &:hover{ color:@text-dark; text-decoration:underline @@ -52,7 +52,7 @@ a { } .homepage-illustration { - margin-bottom: 4rem; + margin-bottom: 2.5rem; width: 100%; max-width: 900px; } @@ -67,6 +67,19 @@ a { font-size: 1.5rem; } +.domain-image { + width: 200px; + padding-bottom: 1.5rem; +} + +.list-items { + text-align: center; + padding: 2em; + border: 1px solid @border-color; + border-radius: .5rem; + background-color: #fff; +} + .list.grid-of-four{ grid-gap: 4rem; } @@ -81,6 +94,10 @@ a { text-align: left; } +.right-aligned{ + text-align: right; +} + .centered{ text-align: center; } @@ -110,7 +127,7 @@ a { .primary-links { color: @brand-primary; - transition: color .5s ease-in; + transition: @transition-color; &:hover{ color: @text-dark; text-decoration: none; @@ -160,6 +177,9 @@ a { .gray-bg{ background-color: @light-bg; } +.dark-bg{ + background-color: @text-dark; +} .community-bg { background-image: linear-gradient(to bottom, rgba(117, 116, 254, 0.52), rgb(117, 116, 254)), url("/assets/foundation/img/community-2016.jpg"); @@ -171,7 +191,7 @@ a { .secondary-link{ color:@text-light; - transition: color .5s ease-in; + transition: @transition-color; &:hover{ color: @text-dark; } @@ -201,7 +221,6 @@ a { display: flex; text-align: left; justify-content: space-between; - margin-bottom: 8rem; } .footer-list { @@ -237,7 +256,7 @@ a { .breadcrumb a:hover{ color: @text-dark; - transition: color .5s ease-in; + transition: @transition-color; } .breadcrumb > li { @@ -270,6 +289,25 @@ hr { border-top: 1px solid @light-border-color; } +.footer-end { + border-top: 1px solid @light-border-color; + padding: 2rem 2.5rem; + font-size: 0.75rem; +} + +.footer-end a{ + text-decoration: underline; + color: @text-muted; + &:hover{ + color: #fff; + } +} + +.footer-icon { + width: 1.5rem; + margin-right: .5em; +} + /* loaned from bootstrap*/ @@ -338,6 +376,14 @@ hr { transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } +code { + color: @red; + background: lighten(@red-extra-light, 10%); + padding: .25em; + border-radius: .25em; + font-size: .85em; +} + /*loaned from frappe*/ .page-card { max-width: 360px; @@ -363,4 +409,27 @@ hr { .btn-primary { background-color: @brand-primary; border-color: @brand-primary; + color: #fff; + transition: background-color .5s ease-in; +} + +.btn-primary:hover, .btn-primary:focus, .btn-primary.focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { + color: #fff; + background-color: @button-primary-hover; + border-color: @button-primary-hover; + text-decoration:none; +} + +.screenshot { + width: 100%; + margin: auto; +} + +img.blog-cover-image, .blog-text img, .screenshot { + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1); + border: 1px solid #d1d8dd; +} + +.btn-next-wrapper { + margin-top: 4rem; } diff --git a/foundation/public/less/variables.less b/foundation/public/less/variables.less index e6cbdc5e..86e30d0c 100644 --- a/foundation/public/less/variables.less +++ b/foundation/public/less/variables.less @@ -7,3 +7,4 @@ @button-secondary-hover: darken(@light-bg, 15%); @primary-link-color: lighten(@brand-primary, 5%); @screen-max: 1366px; +@transition-color: color .5s ease-in; diff --git a/foundation/templates/base.html b/foundation/templates/base.html index ba5cda37..7ad9217e 100644 --- a/foundation/templates/base.html +++ b/foundation/templates/base.html @@ -18,10 +18,9 @@ {% block meta_block %}{% endblock %} {% if 'docs' in path %} - - - - + + + {% endif %} {%- endblock -%} {# loading required JS for login #} @@ -43,14 +42,12 @@ {% endblock %} {%- block footer -%}{% include "foundation/templates/includes/footer/footer.html" %}{%- endblock -%} - {# loading required JS for login #} - {% if path == 'login' or 'docs' in path %} {% block base_scripts %} + src="/assets/js/frappe-web.min.js"> {% endblock %} {%- if js_globals is defined %} diff --git a/foundation/www/index.html b/foundation/www/index.html index 0168a4ce..d1d60c74 100644 --- a/foundation/www/index.html +++ b/foundation/www/index.html @@ -15,7 +15,7 @@