diff --git a/foundation/erpnext_foundation/doctype/service_provider/service_provider.py b/foundation/erpnext_foundation/doctype/service_provider/service_provider.py index 280c983e..bd86f850 100644 --- a/foundation/erpnext_foundation/doctype/service_provider/service_provider.py +++ b/foundation/erpnext_foundation/doctype/service_provider/service_provider.py @@ -23,6 +23,14 @@ class ServiceProvider(WebsiteGenerator): context.membership_type = frappe.get_value('Member', self.member, 'membership_type') if context.website and not context.website.startswith('http'): context.website = 'http://' + context.website + if not context.image: + if context.membership_type == "Gold": + context.image = "/assets/foundation/img/gold.png" + elif context.membership_type == "Silver": + context.image = "/assets/foundation/img/silver.png" + else: + context.image = "/assets/foundation/img/default-membership-logo.png" + def send_alert_to_inactive_service_providers(): @@ -55,4 +63,4 @@ def get_last_login_diff(user): last_login = frappe.db.get_value("User", user, ["last_login"]) for x in xrange(1,10): print((get_datetime() - get_datetime(last_login)).days, user) - return (get_datetime() - get_datetime(last_login)).days \ No newline at end of file + return (get_datetime() - get_datetime(last_login)).days diff --git a/foundation/erpnext_foundation/doctype/service_provider/templates/.service_provider.html.kate-swp b/foundation/erpnext_foundation/doctype/service_provider/templates/.service_provider.html.kate-swp deleted file mode 100644 index 4666330c..00000000 Binary files a/foundation/erpnext_foundation/doctype/service_provider/templates/.service_provider.html.kate-swp and /dev/null differ diff --git a/foundation/hooks.py b/foundation/hooks.py index 833f5d41..d72e7e6e 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": "Oensource ERP SoftwareERPNext.org", "top_bar_items": [ {"label": "Foundation", "child_items":[ {"label": "Chapter", "url": "/chapters","right": 1}, diff --git a/foundation/public/css/bootstrap-for-webform.css b/foundation/public/css/bootstrap-for-webform.css index 70048ad7..aa81aaa6 100644 --- a/foundation/public/css/bootstrap-for-webform.css +++ b/foundation/public/css/bootstrap-for-webform.css @@ -718,9 +718,9 @@ select[multiple].form-group-lg .form-control { } .btn { display: inline-block; - padding: 4px 10px; + padding: .25rem .5rem; margin-bottom: 0; - font-size: 14px; + font-size: 1rem; font-weight: normal; line-height: 1.42857143; text-align: center; @@ -735,7 +735,7 @@ select[multiple].form-group-lg .form-control { user-select: none; background-image: none; border: 1px solid transparent; - border-radius: 4px; + border-radius: .25rem; } .btn:focus, .btn:active:focus, diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css index 3da4d411..8b35eef7 100644 --- a/foundation/public/css/erpnext-org-theme.css +++ b/foundation/public/css/erpnext-org-theme.css @@ -9,6 +9,11 @@ a:hover { color: #2E3338; text-decoration: underline; } +a:focus, +a:visited { + outline: 0; + background-color: transparent; +} .header1 { font-size: 2.5rem; line-height: 1.025; @@ -56,6 +61,7 @@ a:hover { } .menu { display: flex; + margin: 0; } .menu-items { padding-left: 1.5rem; @@ -114,30 +120,36 @@ a:hover { grid-gap: 2.5rem; display: grid; } -@media screen and (min-width: 991px) { - .grid-of-four { - grid-template-columns: repeat(4, 1fr); - } -} -.grid-of-three, .grid-of-four { grid-template-columns: repeat(1, 1fr); } @media screen and (min-width: 500px) { - .grid-of-three, .grid-of-four { grid-template-columns: repeat(2, 1fr); } } @media screen and (min-width: 767px) { - .grid-of-three, .grid-of-four { grid-template-columns: repeat(3, 1fr); } } -.list { - list-style: none; - padding-left: 0; +@media screen and (min-width: 991px) { + .grid-of-four { + grid-template-columns: repeat(4, 1fr); + } +} +.grid-of-three { + grid-template-columns: repeat(1, 1fr); +} +@media screen and (min-width: 500px) { + .grid-of-three { + grid-template-columns: repeat(2, 1fr); + } +} +@media screen and (min-width: 767px) { + .grid-of-three { + grid-template-columns: repeat(3, 1fr); + } } /*utilities*/ .hide, @@ -149,7 +161,7 @@ a:hover { margin-top: 0; } .top-spacer { - margin-top: 1rem; + margin-top: 2.5rem; } .bottom-spacer-4 { margin-bottom: 4rem; @@ -186,7 +198,6 @@ a:hover { } .list-unstyled { padding: 0; - margin: 0; } .list-unstyled li { list-style: none; @@ -208,6 +219,14 @@ a:hover { flex-direction: row; } } +.contact-content { + max-width: 90%; +} +@media screen and (min-width: 500px) { + .contact-content { + max-width: 50%; + } +} .columns { margin-bottom: 1rem; } @@ -239,7 +258,6 @@ a:hover { font-size: 1.5rem; max-width: 599.5px; margin: 0 auto 1.5rem auto; - line-height: 1.5em; } .primary-links { color: #6c7680; @@ -570,6 +588,11 @@ th { border: 1px solid transparent; border-radius: .25em; } +.btn-block { + background-image: none; + border: 1px solid transparent; + border-radius: .25em; +} .btn-block { display: block; width: 100%; @@ -605,6 +628,17 @@ code { font-size: .85em; } /*loaned from frappe*/ +textarea.form-control { + height: auto; +} +.col-sm-6 { + margin-bottom: 1rem; +} +@media screen and (min-width: 767px) { + .col-sm-8 { + width: 66.66%; + } +} .comment-view { padding-bottom: 2.5rem; } @@ -716,8 +750,8 @@ img.blog-cover-image, margin: 2.5rem 0; } .blog-text { - font-size: 1.25em; - letter-spacing: 0.01em; + font-size: 1.15em; + line-height: 1.62; } .blog-content { margin-bottom: 2.5rem; @@ -781,14 +815,33 @@ img.blog-cover-image, } .with-border a { text-decoration: none; + color: #36414C; } .with-border a:hover { text-decoration: none; + color: #2E3338; } .with-border:hover { background-color: #fafbfc; } /* individual elements */ +.row.page-head { + display: flex; + align-items: center; + flex-direction: column; +} +@media screen and (min-width: 767px) { + .row.page-head { + flex-direction: row; + } +} +.item-search .input-wrapper { + margin-right: 1.5rem; +} +.item-search i { + margin-right: -1.5rem; + margin-top: .5rem; +} .gold-member { display: flex; padding: 2.5rem 0; @@ -798,6 +851,10 @@ img.blog-cover-image, .gold-member:hover { background-color: #fafbfc; } +.individual-member { + border-bottom: 1px solid #d1d8dd; + padding-bottom: 2.5rem; +} .box { padding: 1.5rem; border: 1px solid #d1d8dd; @@ -819,7 +876,7 @@ img.blog-cover-image, width: 100px; } .domain-image { - width: 125px; + width: 150px; padding-bottom: 1.5rem; } .community-bg { diff --git a/foundation/public/css/reset.css b/foundation/public/css/reset.css index 6ebfd46e..c5842d4c 100644 --- a/foundation/public/css/reset.css +++ b/foundation/public/css/reset.css @@ -21,7 +21,7 @@ html { -ms-text-size-adjust: 100%; -ms-overflow-style: scrollbar; -webkit-tap-highlight-color: transparent; - line-height: 1.5; + line-height: 1.62; font-size: 14px; } @media screen and (min-width: 767px){ @@ -62,6 +62,7 @@ hr { h1, h2, h3, h4, h5, h6 { margin-bottom: 1rem; + margin-top:0; } diff --git a/foundation/public/img/agriculture.png b/foundation/public/img/agriculture.png new file mode 100644 index 00000000..132db4fb Binary files /dev/null and b/foundation/public/img/agriculture.png differ diff --git a/foundation/public/img/agriculture.svg b/foundation/public/img/agriculture.svg deleted file mode 100644 index 15231db1..00000000 --- a/foundation/public/img/agriculture.svg +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/foundation/public/img/community-2016.jpg b/foundation/public/img/community-2016.jpg index 7363a891..a969a0ce 100644 Binary files a/foundation/public/img/community-2016.jpg and b/foundation/public/img/community-2016.jpg differ diff --git a/foundation/public/img/community-colored.jpg b/foundation/public/img/community-colored.jpg new file mode 100644 index 00000000..ce9436de Binary files /dev/null and b/foundation/public/img/community-colored.jpg differ diff --git a/foundation/public/img/community-colored.png b/foundation/public/img/community-colored.png deleted file mode 100644 index efd74b3b..00000000 Binary files a/foundation/public/img/community-colored.png and /dev/null differ diff --git a/foundation/public/img/distribution.png b/foundation/public/img/distribution.png new file mode 100644 index 00000000..41c89de7 Binary files /dev/null and b/foundation/public/img/distribution.png differ diff --git a/foundation/public/img/distribution.svg b/foundation/public/img/distribution.svg deleted file mode 100644 index c666d98d..00000000 --- a/foundation/public/img/distribution.svg +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/foundation/public/img/education.png b/foundation/public/img/education.png new file mode 100644 index 00000000..b57ab409 Binary files /dev/null and b/foundation/public/img/education.png differ diff --git a/foundation/public/img/education.svg b/foundation/public/img/education.svg deleted file mode 100644 index 429ed801..00000000 --- a/foundation/public/img/education.svg +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/foundation/public/img/foundation-image.svg b/foundation/public/img/foundation-image.svg deleted file mode 100644 index 43c3510d..00000000 --- a/foundation/public/img/foundation-image.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/foundation/public/img/healthcare.png b/foundation/public/img/healthcare.png new file mode 100644 index 00000000..3a84d684 Binary files /dev/null and b/foundation/public/img/healthcare.png differ diff --git a/foundation/public/img/healthcare.svg b/foundation/public/img/healthcare.svg deleted file mode 100644 index bc5162cd..00000000 --- a/foundation/public/img/healthcare.svg +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/foundation/public/img/manufacturing-domain.png b/foundation/public/img/manufacturing-domain.png new file mode 100644 index 00000000..b0b95cd6 Binary files /dev/null and b/foundation/public/img/manufacturing-domain.png differ diff --git a/foundation/public/img/manufacturing-domain.svg b/foundation/public/img/manufacturing-domain.svg deleted file mode 100644 index f17c62e9..00000000 --- a/foundation/public/img/manufacturing-domain.svg +++ /dev/null @@ -1,445 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/foundation/public/img/retail.png b/foundation/public/img/retail.png new file mode 100644 index 00000000..9f79a52f Binary files /dev/null and b/foundation/public/img/retail.png differ diff --git a/foundation/public/img/retail.svg b/foundation/public/img/retail.svg deleted file mode 100644 index c5c686b9..00000000 --- a/foundation/public/img/retail.svg +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/foundation/public/img/services.png b/foundation/public/img/services.png new file mode 100644 index 00000000..0b455423 Binary files /dev/null and b/foundation/public/img/services.png differ diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less index d027d308..ae2c5bba 100644 --- a/foundation/public/less/erpnext-org-theme.less +++ b/foundation/public/less/erpnext-org-theme.less @@ -10,6 +10,10 @@ a { color: @text-dark; text-decoration: underline; } + &:focus, &:visited{ + outline: 0; + background-color: transparent; + } } .header1 { @@ -63,6 +67,7 @@ a { .menu { display: flex; + margin:0; } .menu-items { @@ -123,30 +128,38 @@ a { } .grid-of-four { - @media screen and (min-width: @screen-sm) { - grid-template-columns: repeat(4, 1fr); - } -} - -.grid-of-three, .grid-of-four{ grid-template-columns: repeat(1, 1fr); + @media screen and (min-width: @screen-palm) { grid-template-columns: repeat(2, 1fr); } @media screen and (min-width: @screen-xs) { + grid-template-columns: repeat(3, 1fr); + + } + @media screen and (min-width: @screen-sm) { + + grid-template-columns: repeat(4, 1fr); + } +} + +.grid-of-three { + grid-template-columns: repeat(1, 1fr); + + @media screen and (min-width: @screen-palm) { + + grid-template-columns: repeat(2, 1fr); + + } + @media screen and (min-width: @screen-xs) { + + grid-template-columns: repeat(3, 1fr); + } } -.list { - list-style: none; - padding-left: 0; -} - -@spacer-1: 0.5rem; -@spacer-2: @spacer-1 * 2; - /*utilities*/ .hide, .hidden { display: none; @@ -157,7 +170,7 @@ a { margin-top: 0; } .top-spacer { - margin-top: @spacer-2; + margin-top: 2.5rem; } .bottom-spacer-4{ margin-bottom: 4rem; @@ -203,7 +216,6 @@ a { .list-unstyled { padding: 0; - margin: 0; li { list-style: none; @@ -226,6 +238,13 @@ a { } +.contact-content { + max-width: 90%; + @media screen and (min-width: @screen-palm) { + max-width: 50%; + } +} + .columns { margin-bottom: 1rem; @media screen and (min-width: @screen-xs) { @@ -253,7 +272,6 @@ a { font-size: 1.5rem; max-width: @screen-md/2; margin: 0 auto 1.5rem auto; - line-height: 1.5em; } .primary-links { @@ -266,7 +284,7 @@ a { } .button { - padding: 1rem 1.5rem; + padding: 1rem 1.5rem; border-radius:.25em; cursor: pointer; transition: all @transition; @@ -277,6 +295,7 @@ a { } } + .button-primary { font-size: 1.5em; color: #fff; @@ -434,49 +453,40 @@ hr { width: 1.5rem; margin-right: .5em; } - /* loaned from bootstrap*/ - - - /*progress bar*/ .progress { - height: 1.5rem; - margin-bottom: 1.5rem; - overflow: hidden; - background-color: #f5f5f5; - border-radius: .25rem; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); + height: 1.5rem; + margin-bottom: 1.5rem; + overflow: hidden; + background-color: #f5f5f5; + border-radius: .25rem; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } - .progress-bar-success { - background-color: @indicator-green; + background-color: #98d85b; } - .sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0, 0, 0, 0); - border: 0; + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; } /*progress bar*/ - .clickable a { - color: @text-color; - &:focus { - outline:0; - } + color: #36414C; +} +.clickable a:focus { + outline: 0; } - .fade.in { opacity: 1; } - caption { padding-top: 8px; padding-bottom: 8px; @@ -486,176 +496,187 @@ caption { th { text-align: left; } - -.note-popover .popover-content > .btn-group, .panel-heading.note-toolbar > .btn-group { - margin-top: 5px; - margin-right: 5px; - margin-left: 0; +.note-popover .popover-content > .btn-group, +.panel-heading.note-toolbar > .btn-group { + margin-top: 5px; + margin-right: 5px; + margin-left: 0; } -.btn-group, .btn-group-vertical { - position: relative; - display: inline-block; - vertical-align: middle; +.btn-group, +.btn-group-vertical { + position: relative; + display: inline-block; + vertical-align: middle; } -.note-popover .popover-content, .panel-heading.note-toolbar { - padding: 0 0 5px 5px; - margin: 0; +.note-popover .popover-content, +.panel-heading.note-toolbar { + padding: 0 0 5px 5px; + margin: 0; } .panel-default > .panel-heading { - color: #333; - background-color:@panel-bg; - border-color: @border-color; + color: #333; + background-color: #F7FAFC; + border-color: #d1d8dd; } -.panel-heading, .panel-body { - padding-left: 1rem; +.panel-heading, +.panel-body { + padding-left: 1rem; } .panel-heading { - padding: .5rem 1rem; - border-bottom: 1px solid transparent; - border-top-left-radius: .25em; - border-top-right-radius: .25em; + padding: .5rem 1rem; + border-bottom: 1px solid transparent; + border-top-left-radius: .25em; + border-top-right-radius: .25em; } .modal-open .modal { - overflow-x: hidden; - overflow-y: auto; + overflow-x: hidden; + overflow-y: auto; } - .modal { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - display: none; - overflow: hidden; - outline: 0; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + display: none; + overflow: hidden; + outline: 0; } - .modal-backdrop.in { - filter: alpha(opacity=50); - opacity: .5; + filter: alpha(opacity=50); + opacity: .5; } .modal-backdrop { - position: absolute; - top: 0; - right: 0; - left: 0; - background-color: @modal-backdrop-bg; + position: absolute; + top: 0; + right: 0; + left: 0; + background-color: #334143; } .modal.in .modal-dialog { - transform: translate(0, 0); + transform: translate(0, 0); } .modal-dialog { - width: 600px; - margin: 2rem auto; + width: 600px; + margin: 2rem auto; } .modal-content { - position: relative; - background-color: #fff; - background-clip: padding-box; - border: @border; - border-radius: 0.25rem; - outline: 0; - box-shadow: 0 3px 9px rgba(0, 0, 0, .5); + position: relative; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #d1d8dd; + border-radius: 0.25rem; + outline: 0; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); } .modal-header { - min-height: 1rem; - padding: 1rem; - border-bottom: @border; + min-height: 1rem; + padding: 1rem; + border-bottom: 1px solid #d1d8dd; } .modal-title { - margin: 0; - line-height: 1.42857143; + margin: 0; + line-height: 1.42857143; } .modal-body { - position: relative; - padding: 1rem; + position: relative; + padding: 1rem; } - .modal-header .close { - margin-top: -2px; + margin-top: -2px; } - .close { - float: right; - font-size: 1.5rem; - font-weight: bold; - line-height: 1; - color: #000; - text-shadow: 0 1px 0 #fff; - filter: alpha(opacity=20); - opacity: .2; + float: right; + font-size: 1.5rem; + font-weight: bold; + line-height: 1; + color: #000; + text-shadow: 0 1px 0 #fff; + filter: alpha(opacity=20); + opacity: .2; } - -.close:hover, .close:focus { - color: #000; - text-decoration: none; - cursor: pointer; - filter: alpha(opacity=50); - opacity: .5; +.close:hover, +.close:focus { + color: #000; + text-decoration: none; + cursor: pointer; + filter: alpha(opacity=50); + opacity: .5; } - .btn-default { - color: inherit; - background-color: @btn-bg; - border-color: transparent; + color: inherit; + background-color: #F0F4F7; + border-color: transparent; } .btn { - display: inline-block; - padding: .25em .75em; - margin-bottom: 0; - font-size: 1em; - font-weight: normal; - text-align: center; - white-space: nowrap; - vertical-align: middle; - cursor: pointer; - user-select: none; - background-image: none; - border: 1px solid transparent; - border-radius: .25em; + display: inline-block; + padding: .25em .75em; + margin-bottom: 0; + font-size: 1em; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + cursor: pointer; + user-select: none; + background-image: none; + border: 1px solid transparent; + border-radius: .25em; } - .btn-block { - display: block; - width: 100%; + background-image: none; + border: 1px solid transparent; + border-radius: .25em; +} +.btn-block { + display: block; + width: 100%; } - .form-signin .form-control { - position: relative; - height: auto; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding: .5rem ; - margin-bottom: .5rem; + position: relative; + height: auto; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: .5rem ; + margin-bottom: .5rem; } - .form-control { - display: block; - width: 100%; - height: 2em; - padding: .5em; - color: @text-dark; - background-color: #fff; - background-image: none; - border: @border; - border-radius: .25em; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - transition: border-color ease-out .15s, box-shadow ease-out .15s; + display: block; + width: 100%; + height: 2em; + padding: .5em; + color: #2E3338; + background-color: #fff; + background-image: none; + border: 1px solid #d1d8dd; + border-radius: .25em; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + transition: border-color ease-out 0.15s, box-shadow ease-out 0.15s; } - code { - color: @red; - background: lighten(@red-extra-light, 10%); - padding: .25em; - border-radius: .25em; - font-size: .85em; + color: #FC4F51; + background: #fff5f5; + padding: .25em; + border-radius: .25em; + font-size: .85em; } /*loaned from frappe*/ +textarea.form-control { + height: auto; +} + +.col-sm-6 { + margin-bottom: 1rem; +} +.col-sm-8 { +@media screen and (min-width: @screen-xs) { + width: 66.66%; + } +} .comment-view { padding-bottom: 2.5rem; } @@ -784,8 +805,9 @@ img.blog-cover-image, .blog-text img, .screenshot { .blog-text { - font-size: 1.25em; - letter-spacing: 0.01em; + font-size: 1.15em; + line-height: 1.62; + } .blog-content { @@ -856,16 +878,35 @@ img.blog-cover-image, .blog-text img, .screenshot { border: 1px solid @border-color; a{ text-decoration: none; + color: @text-color; &:hover{ text-decoration: none; + color: @text-dark; } } &:hover{ background-color: @light-bg; } } + /* individual elements */ +.row.page-head { + display: flex; + align-items: center; + flex-direction: column; + @media screen and (min-width: @screen-xs) { + flex-direction: row; + } +} + +.item-search .input-wrapper { + margin-right: 1.5rem; +} +.item-search i { + margin-right: -1.5rem; + margin-top: .5rem; +} .gold-member{ display: flex; padding: 2.5rem 0; @@ -876,6 +917,11 @@ img.blog-cover-image, .blog-text img, .screenshot { } } +.individual-member { + border-bottom: 1px solid @border-color; + padding-bottom: 2.5rem; +} + .box { padding: 1.5rem; border: 1px solid @border-color; @@ -899,7 +945,7 @@ img.blog-cover-image, .blog-text img, .screenshot { width: 100px; } .domain-image { - width: 125px; + width: 150px; padding-bottom: 1.5rem; } diff --git a/foundation/www/about.html b/foundation/www/about.html index 8836e5ad..41d21c9c 100644 --- a/foundation/www/about.html +++ b/foundation/www/about.html @@ -8,8 +8,8 @@
- -

ERPNext Foundation

+ +

ERPNext Foundation

We are a Non Profit Foundation representing a community of ERPNext Users, Developers and Service Providers. Our goal is to provide a platform for the ERPNext Community to come together, join hands and build assets to help build and enhance ERPNext around the world.

ERPNext Foundation aims to be a community driven organization and run in a transparent manner. If you want to be more involved in the ERPNext Community, read the FAQ.

diff --git a/foundation/www/index.html b/foundation/www/index.html index 45eed889..2f64f99d 100644 --- a/foundation/www/index.html +++ b/foundation/www/index.html @@ -3,49 +3,49 @@ {% block content %}
- + ERP software for Everybody

ERP for Everybody

-

A free and opensource do-it-yourself business management system that will help you stay in control.

+

Worlds Leading Fully Opensource ERP Software That Helps You Stay In Control Of Your Business

Get Started

One App Many Domains

-
@@ -63,7 +63,7 @@
-

Events & Meetups

+

Events & Meetups

    {# get first three events from portal events doctype #} {% for e in events[:3] %} @@ -74,7 +74,7 @@
-

Help Us Improve

+

Help Us Improve

-

Need Help?

+

Need Help?

  • User Manual diff --git a/foundation/www/members/details.html b/foundation/www/members/details.html index 0532ec06..b5ca028f 100644 --- a/foundation/www/members/details.html +++ b/foundation/www/members/details.html @@ -33,4 +33,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/foundation/www/service-providers.html b/foundation/www/service-providers.html index 303d3ef3..772cd407 100644 --- a/foundation/www/service-providers.html +++ b/foundation/www/service-providers.html @@ -25,7 +25,7 @@ {% endmacro %} {% macro show_member(s) %} -
    +

    {{ s.title and s.title[:25] }}

    {{ s.introduction and s.introduction | truncate(140) }}