diff --git a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html index 3681bf24..b6b1be71 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html +++ b/foundation/erpnext_foundation/doctype/portal_job/templates/portal_job.html @@ -46,6 +46,6 @@ {% else %}

You must register and login to view contact details

{% endif %} -


Post a New Job

+


Post a New Job

{% endblock %} \ No newline at end of file diff --git a/foundation/public/img/conf/2019/expo.png b/foundation/public/img/conf/2019/expo.png new file mode 100644 index 00000000..849ea4c0 Binary files /dev/null and b/foundation/public/img/conf/2019/expo.png differ diff --git a/foundation/public/img/conf/2019/foundation-splash.png b/foundation/public/img/conf/2019/foundation-splash.png new file mode 100644 index 00000000..7dcb2d37 Binary files /dev/null and b/foundation/public/img/conf/2019/foundation-splash.png differ diff --git a/foundation/public/img/conf/2019/sprint.png b/foundation/public/img/conf/2019/sprint.png new file mode 100644 index 00000000..2bb88d40 Binary files /dev/null and b/foundation/public/img/conf/2019/sprint.png differ diff --git a/foundation/public/img/conf/2019/talks.png b/foundation/public/img/conf/2019/talks.png new file mode 100644 index 00000000..f724fa64 Binary files /dev/null and b/foundation/public/img/conf/2019/talks.png differ diff --git a/foundation/templates/includes/custom.css b/foundation/templates/includes/custom.css index 95e594d9..16bd9d8a 100644 --- a/foundation/templates/includes/custom.css +++ b/foundation/templates/includes/custom.css @@ -20,4 +20,32 @@ body[data-path*="erpnext-jobs"] .breadcrumb { .row-index .hidden-xs { display: inline-block !important; +} + +.btn-primary { + background-color: #38C172; + border-color: #38C172; +} + +.btn-primary:hover { + background-color: #1F9D55; + border-color: #1F9D55; +} + +.section-bg { + background-color: #E3FCEC; + border: none; +} + +.navbar { + background-color: #E3FCEC; + border-color: rgb(211, 238, 223); +} + +.section-bg .lead, .navbar-light .navbar-nav .nav-link, .card-body { + color: rgb(122, 175, 144) !important; +} + +.bg-dark { + background-color: #0F2F21 !important; } \ No newline at end of file diff --git a/foundation/www/about/index.html b/foundation/www/about/index.html index f9b6e6ad..ed940d3a 100644 --- a/foundation/www/about/index.html +++ b/foundation/www/about/index.html @@ -81,7 +81,7 @@
- Support us by becoming a Member + Support us by becoming a Member
diff --git a/foundation/www/about/projects.html b/foundation/www/about/projects.html index ab13d0b0..42102252 100644 --- a/foundation/www/about/projects.html +++ b/foundation/www/about/projects.html @@ -34,7 +34,7 @@

Apart from this, foundation funded developers and interns have pushed
hundreds of bug fixes since 2017

- Help us fund more projects + Help us fund more projects
{% endblock %} \ No newline at end of file diff --git a/foundation/www/chapter-list.html b/foundation/www/chapter-list.html index 542918d4..aeab1886 100644 --- a/foundation/www/chapter-list.html +++ b/foundation/www/chapter-list.html @@ -95,7 +95,7 @@ To start your own chapter, start a group on Meetup.com and get in touch with us.
- Contact Us To Start a New Chapter + Contact Us To Start a New Chapter
diff --git a/foundation/www/conf/2017/index.html b/foundation/www/conf/2017/index.html index 78d461c8..a6e423f2 100644 --- a/foundation/www/conf/2017/index.html +++ b/foundation/www/conf/2017/index.html @@ -13,8 +13,8 @@

ERPNext Conference 2017, Mumbai

October 12th to 14th

-

Watch ERPNext Conference 2017 - Community Talks -

Watch ERPNext Conference 2017 - Developer Talks +

Watch ERPNext Conference 2017 - Community Talks +

Watch ERPNext Conference 2017 - Developer Talks

Three days of amazing talks and discussions. See the full agenda. diff --git a/foundation/www/conf/2018/index.html b/foundation/www/conf/2018/index.html index 54359dd0..dd1eee36 100644 --- a/foundation/www/conf/2018/index.html +++ b/foundation/www/conf/2018/index.html @@ -82,11 +82,11 @@

Watch the Conference Live

-

Watch the Conference Live

+

Watch the Conference Live

Join us live and be part of the evolution of the world's leading 100% open source ERP!

-
-
+ +
@@ -192,7 +192,7 @@

Become a patron for the conference and get associated with a global community of tens of thousands of users and developers. Sponsors also get complimentary passes for the conference!

- Become A Sponsor + Become A Sponsor
diff --git a/foundation/www/conf/2019/exhibition.html b/foundation/www/conf/2019/exhibition.html index 7fc29fa8..6722f9e4 100644 --- a/foundation/www/conf/2019/exhibition.html +++ b/foundation/www/conf/2019/exhibition.html @@ -14,7 +14,7 @@ understand their challenges and explore solutions with them.

- Book a Stall + Book a Stall

@@ -102,8 +102,8 @@

ERPNext Foundation

ERPNext Conference is a community event driven by the community and organized by the ERPNext Open Source Software Foundation.

- Buy Tickets (INR) - Buy Tickets (USD) + Buy Tickets (INR) + Buy Tickets (USD)

diff --git a/foundation/www/conf/2019/index.html b/foundation/www/conf/2019/index.html index 35d51adb..5952a76e 100644 --- a/foundation/www/conf/2019/index.html +++ b/foundation/www/conf/2019/index.html @@ -2,29 +2,31 @@ {% block title %}ERPNext Conference 2019{% endblock %} {% block content %} -
-
+
+
-
- Enterprise Buildings -
-
-

+

+

ERPNext Conference 2019

+<<<<<<< 9ec18934c5ba5526b15c09d6af92ce8d26c34864

Next Generation Enterprise

+======= +

Next Generation Enterprise

+

+>>>>>>> style(new-theme): again October 15 - 18, Mumbai

- Buy Tickets (INR) - Buy Tickets (USD) + Buy Tickets (INR) + Buy Tickets (USD)

-
+

The 6th edition of the ERPNext Conference is here! @@ -33,7 +35,7 @@

-
+

Events

@@ -43,7 +45,7 @@
- Person Contributing + Person Contributing

Contribution Sprint

@@ -57,7 +59,7 @@
- Group of people + Group of people

Talks and Sessions

@@ -70,7 +72,7 @@
- Bussiness People + Bussiness People

Exhibition

@@ -87,13 +89,13 @@ {% from "www/conf/2019/sponsor.html" import sponsor %} {{ sponsor() }} -
+

ERPNext Foundation

ERPNext Conference is a community event driven by the community and organized by the ERPNext Open Source Software Foundation.

- Buy Tickets (INR) - Buy Tickets (USD) + Buy Tickets (INR) + Buy Tickets (USD)

diff --git a/foundation/www/conf/2019/sponsor.html b/foundation/www/conf/2019/sponsor.html index 81f408f2..f6ced015 100644 --- a/foundation/www/conf/2019/sponsor.html +++ b/foundation/www/conf/2019/sponsor.html @@ -40,13 +40,13 @@ {% endmacro %} {% macro sponsor() %} -
+

Become a Sponsor

Become a patron for the conference and get associated with a global community of tens of thousands of users and developers.

- Sponsor Us + Sponsor Us

Download Prospectus
diff --git a/foundation/www/conf/2019/sprint.html b/foundation/www/conf/2019/sprint.html index de17a5eb..98fe653e 100644 --- a/foundation/www/conf/2019/sprint.html +++ b/foundation/www/conf/2019/sprint.html @@ -15,8 +15,8 @@ fixes and documentation.

- Buy Tickets (INR) - Buy Tickets (USD) + Buy Tickets (INR) + Buy Tickets (USD)

@@ -104,8 +104,8 @@

ERPNext Foundation

ERPNext Conference is a community event driven by the community and organized by the ERPNext Open Source Software Foundation.

- Buy Tickets (INR) - Buy Tickets (USD) + Buy Tickets (INR) + Buy Tickets (USD)

diff --git a/foundation/www/conf/2019/talks.html b/foundation/www/conf/2019/talks.html index 7952e0be..a0aaeadf 100644 --- a/foundation/www/conf/2019/talks.html +++ b/foundation/www/conf/2019/talks.html @@ -14,8 +14,8 @@ exciting features, stories and best practices.

- Buy Tickets (INR) - Buy Tickets (USD) + Buy Tickets (INR) + Buy Tickets (USD)

@@ -59,7 +59,7 @@
- Propose a talk + Propose a talk
@@ -110,8 +110,8 @@

ERPNext Foundation

ERPNext Conference is a community event driven by the community and organized by the ERPNext Open Source Software Foundation.

- Buy Tickets (INR) - Buy Tickets (USD) + Buy Tickets (INR) + Buy Tickets (USD)

diff --git a/foundation/www/conf/index.html b/foundation/www/conf/index.html index 76e58665..04403188 100644 --- a/foundation/www/conf/index.html +++ b/foundation/www/conf/index.html @@ -23,7 +23,7 @@ October 15th - 18th, Mumbai

- Learn More + Learn More

diff --git a/foundation/www/contribute.html b/foundation/www/contribute.html index 9894c007..8560312b 100644 --- a/foundation/www/contribute.html +++ b/foundation/www/contribute.html @@ -135,7 +135,7 @@ Our web sites are open for designers web developers to hack on. Find a web site

Have questions? head to the forum

- + ERPNext Forum
diff --git a/foundation/www/erpnext-jobs.html b/foundation/www/erpnext-jobs.html index 1226ed12..bc23a56f 100644 --- a/foundation/www/erpnext-jobs.html +++ b/foundation/www/erpnext-jobs.html @@ -33,7 +33,7 @@
- Post A New Job + Post A New Job
{% endblock %} \ No newline at end of file diff --git a/foundation/www/fellows.html b/foundation/www/fellows.html index 8e1f3c66..e3d48145 100644 --- a/foundation/www/fellows.html +++ b/foundation/www/fellows.html @@ -126,7 +126,7 @@
-

+

Contact Us To Nominate A Fellow

Learn how you can contribute

diff --git a/foundation/www/get-started.html b/foundation/www/get-started.html index 073e9f42..4203ab2e 100644 --- a/foundation/www/get-started.html +++ b/foundation/www/get-started.html @@ -5,7 +5,7 @@

Getting Started with ERPNext

ERPNext is Python based web application which runs on MariaDB. There are many ways to get started.

- See the Demo

+ See the Demo

@@ -13,7 +13,7 @@

Start a Free Trial on ERPNext.com

Get your own personal ERPNext instance that you can play with and explore for the next 14 days.

- Start Trial

+ Start Trial

@@ -21,7 +21,7 @@

Self Install on Linux using Bench

Bench is a command-line tool to install and manage ERPNext.

- Read the instructions on GitHub + Read the instructions on GitHub
@@ -31,7 +31,7 @@
{{ title }}
{{ body }}
- Download + Download
@@ -75,7 +75,7 @@

Connect with ERPNext Members

Find members who can help you setup and evaluate ERPNext.

- See Member Listing + See Member Listing
diff --git a/foundation/www/index.html b/foundation/www/index.html index 8c16f4dc..e24de7b1 100644 --- a/foundation/www/index.html +++ b/foundation/www/index.html @@ -18,7 +18,7 @@

ERPNext Foundation is a registered not for profit that helps build the ERPNext community and drive projects.

-

Get Started with ERPNext

+

Get Started with ERPNext

@@ -35,7 +35,7 @@
{{ title }}
{{ body }}
- +
@@ -164,7 +164,7 @@

ERPNext Foundation

ERPNext Foundation is a registered not-for-profit organization that enables community to build and enhance ERPNext.

- Get Started with ERPNext + Get Started with ERPNext {% endblock %} diff --git a/foundation/www/members/index.html b/foundation/www/members/index.html index 143ba7f8..c14c8b18 100644 --- a/foundation/www/members/index.html +++ b/foundation/www/members/index.html @@ -10,7 +10,7 @@
{{ title }}
{{ body }}
- +
{{ ', '.join(badges) }} @@ -61,7 +61,7 @@ )}}

- Become A Member + Become A Member

See List of All Members diff --git a/foundation/www/releases/version-11/index.html b/foundation/www/releases/version-11/index.html index 64f7c134..87853a28 100644 --- a/foundation/www/releases/version-11/index.html +++ b/foundation/www/releases/version-11/index.html @@ -19,7 +19,7 @@

ERPNext Version 11

The biggest ERPNext release is here, with more feature, security, usability and performance updates than ever before.

- Explore

+ Explore

{{ card( "Financial Accounting", diff --git a/foundation/www/service-providers.html b/foundation/www/service-providers.html index 9a81190d..56ddbacd 100644 --- a/foundation/www/service-providers.html +++ b/foundation/www/service-providers.html @@ -80,7 +80,7 @@

Learn more about becoming an ERPNext Service Provider

- Become a Member + Become a Member
diff --git a/foundation/www/stories/index.html b/foundation/www/stories/index.html index 85ed6172..c430cbe5 100644 --- a/foundation/www/stories/index.html +++ b/foundation/www/stories/index.html @@ -120,7 +120,7 @@

- + Get Started with ERPNext Now