Merge pull request #425 from scmmishra/style-patch-2

refactor: Styling fixes for new theme
This commit is contained in:
Shivam Mishra
2019-08-05 13:29:40 +05:30
committed by GitHub
10 changed files with 124 additions and 501 deletions

View File

@@ -37,7 +37,7 @@
"fieldname": "request_type", "fieldname": "request_type",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Request Type", "label": "Request Type",
"options": "Sponsorship\nExhibit Program" "options": "Sponsorship\nExhibition"
}, },
{ {
"fieldname": "message", "fieldname": "message",

View File

@@ -1,488 +1,129 @@
{ {
"allow_copy": 0,
"allow_guest_to_view": 1, "allow_guest_to_view": 1,
"allow_import": 0,
"allow_rename": 0,
"autoname": "TALK-.YYYY.-.###", "autoname": "TALK-.YYYY.-.###",
"beta": 0,
"creation": "2017-07-06 14:56:52.586022", "creation": "2017-07-06 14:56:52.586022",
"custom": 0,
"docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [
"title",
"column_break_2",
"status",
"speaker_details_section",
"speaker",
"email",
"speaker_bio",
"talk_summary",
"website_details_section",
"route",
"published",
"column_break_12",
"year",
"discuss_link"
],
"fields": [ "fields": [
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Talk Title", "label": "Talk Title",
"length": 0, "reqd": 1
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_2", "fieldname": "column_break_2",
"fieldtype": "Column Break", "fieldtype": "Column Break"
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "Pending Review", "default": "Pending Review",
"fieldname": "status", "fieldname": "status",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Status", "label": "Status",
"length": 0, "options": "Pending Review\nApproved\nRejected"
"no_copy": 0,
"options": "Pending Review\nApproved\nRejected",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "speaker_details_section", "fieldname": "speaker_details_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "label": "Speaker Details"
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Speaker Details",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "speaker", "fieldname": "speaker",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0,
"label": "Speaker", "label": "Speaker",
"length": 0, "reqd": 1
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "email", "fieldname": "email",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "label": "Email"
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Email",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "speaker_bio", "fieldname": "speaker_bio",
"fieldtype": "Text", "fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Speaker Bio", "label": "Speaker Bio",
"length": 0, "reqd": 1
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "talk_summary", "fieldname": "talk_summary",
"fieldtype": "Text", "fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Talk Summary", "label": "Talk Summary",
"length": 0, "reqd": 1
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "website_details_section", "fieldname": "website_details_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "label": "Website Details"
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Website Details",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "route", "fieldname": "route",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "label": "Route"
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Route",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "1", "default": "1",
"fieldname": "published", "fieldname": "published",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 0, "label": "Published"
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Published",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_12", "fieldname": "column_break_12",
"fieldtype": "Column Break", "fieldtype": "Column Break"
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "year", "fieldname": "year",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Year", "label": "Year",
"length": 0, "options": "\n2018\n2017"
"no_copy": 0,
"options": "\n2018\n2017",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "discuss_link", "fieldname": "discuss_link",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "label": "Discuss Link"
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discuss Link",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
} }
], ],
"has_web_view": 1, "has_web_view": 1,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_published_field": "published", "is_published_field": "published",
"is_submittable": 0, "modified": "2019-08-05 13:05:57.484303",
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2018-10-02 13:20:28.827852",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "ERPNext Foundation", "module": "ERPNext Foundation",
"name": "Conference Talk Proposal", "name": "Conference Talk Proposal",
"name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0,
"cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 1, "export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "System Manager", "role": "System Manager",
"set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 0,
"write": 1 "write": 1
} }
], ],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"route": "talk-proposals", "route": "talk-proposals",
"show_name_in_global_search": 0,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "title", "title_field": "title",
"track_changes": 1, "track_changes": 1
"track_seen": 0,
"track_views": 0
} }

View File

@@ -12,7 +12,7 @@
"idx": 0, "idx": 0,
"is_standard": 1, "is_standard": 1,
"message": "<p>Dear {{ doc.participant_name }},</p>\n\n<p>Thank you for registering for the 2019 ERPNext Conference!</p>\n\n<p>Here are your ticket details:</p>\n\n<h4>Ticket Number {{ doc.name}}</h4>\n\n<table class=\"table table-bordered\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\" style=\"padding: 30px 0px\">\n\t<tr>\n\t\t<th style='width: 50%'>Ticket Type</th>\n\t\t<th style='width: 25%'>Qty</th>\n\t\t<th style='width: 25%'>Rate</th>\n\t</tr>\n\t<tr>\n\t\t<td>Conference Tickets + Lunch + Dinner</td>\n\t\t<td>{{ doc.full_conference_tickets or 0 }}</td>\n\t\t<td>{% if doc.currency==\"INR\" %}5000{% else %}70{% endif %}</td>\n\t</tr>\n</table>\n\n<h5>Total Amount: {{ doc.currency }} {{ doc.get_formatted('amount') }}</h5>\n\n\n<p>If you need any help, please email us at foundation@erpnext.com</p>", "message": "<p>Dear {{ doc.participant_name }},</p>\n\n<p>Thank you for registering for the 2019 ERPNext Conference!</p>\n\n<p>Here are your ticket details:</p>\n\n<h4>Ticket Number {{ doc.name}}</h4>\n\n<table class=\"table table-bordered\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\" style=\"padding: 30px 0px\">\n\t<tr>\n\t\t<th style='width: 50%'>Ticket Type</th>\n\t\t<th style='width: 25%'>Qty</th>\n\t\t<th style='width: 25%'>Rate</th>\n\t</tr>\n\t<tr>\n\t\t<td>Conference Tickets + Lunch + Dinner</td>\n\t\t<td>{{ doc.full_conference_tickets or 0 }}</td>\n\t\t<td>{% if doc.currency==\"INR\" %}5000{% else %}70{% endif %}</td>\n\t</tr>\n</table>\n\n<h5>Total Amount: {{ doc.currency }} {{ doc.get_formatted('amount') }}</h5>\n\n\n<p>If you need any help, please email us at foundation@erpnext.com</p>",
"modified": "2019-08-04 21:43:49.890976", "modified": "2019-08-05 13:09:17.385839",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "ERPNext Foundation", "module": "ERPNext Foundation",
"name": "Conference Ticket Confirmation", "name": "Conference Ticket Confirmation",
@@ -21,7 +21,7 @@
"property_value": "1", "property_value": "1",
"recipients": [ "recipients": [
{ {
"cc": "", "cc": "foundation@erpnext.org",
"email_by_document_field": "email" "email_by_document_field": "email"
} }
], ],

View File

@@ -17,7 +17,7 @@
"is_standard": 1, "is_standard": 1,
"login_required": 0, "login_required": 0,
"max_attachment_size": 0, "max_attachment_size": 0,
"modified": "2018-10-16 12:08:19.712608", "modified": "2019-08-05 13:10:19.956393",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "ERPNext Foundation", "module": "ERPNext Foundation",
"name": "conference-talk-proposal", "name": "conference-talk-proposal",
@@ -51,7 +51,7 @@
"fieldname": "speaker", "fieldname": "speaker",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Speaker", "label": "Your Name",
"max_length": 0, "max_length": 0,
"max_value": 0, "max_value": 0,
"read_only": 0, "read_only": 0,
@@ -75,7 +75,7 @@
"fieldname": "speaker_bio", "fieldname": "speaker_bio",
"fieldtype": "Text", "fieldtype": "Text",
"hidden": 0, "hidden": 0,
"label": "Speaker Bio", "label": "Tell us about yourself",
"max_length": 0, "max_length": 0,
"max_value": 0, "max_value": 0,
"read_only": 0, "read_only": 0,
@@ -93,32 +93,6 @@
"read_only": 0, "read_only": 0,
"reqd": 1, "reqd": 1,
"show_in_filter": 0 "show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"default": "2018",
"fieldname": "year",
"fieldtype": "Data",
"hidden": 1,
"label": "Year",
"max_length": 0,
"max_value": 0,
"options": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "discuss_link",
"fieldtype": "Data",
"hidden": 0,
"label": "Link To Discuss Post (In Case You Have Posted Your Proposal Earlier)",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
} }
] ]
} }

View File

@@ -91,7 +91,7 @@
"label": "Request Type", "label": "Request Type",
"max_length": 0, "max_length": 0,
"max_value": 0, "max_value": 0,
"options": "Sponsorship\nExhibit Program", "options": "Sponsorship\nExhibition",
"read_only": 0, "read_only": 0,
"reqd": 1, "reqd": 1,
"show_in_filter": 0 "show_in_filter": 0

View File

@@ -1,5 +1,5 @@
{% extends "templates/base.html" %} {% extends "templates/base.html" %}
{% block title %}Exhibit Program{% endblock %} {% block title %}Exhibition{% endblock %}
{% block content %} {% block content %}
<section class='top-section'> <section class='top-section'>
@@ -7,8 +7,8 @@
<div class="flex-item-30 d-none d-md-block"> <div class="flex-item-30 d-none d-md-block">
<img src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='People Meeting at Expo'> <img src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='People Meeting at Expo'>
</div> </div>
<div> <div class="pr-2">
<h1>Exhibit Program</h1> <h1>Exhibition</h1>
<p class='lead'> <p class='lead'>
Showcase the services you provide for ERPNext to the global community, Showcase the services you provide for ERPNext to the global community,
understand their challenges and explore solutions with them. understand their challenges and explore solutions with them.
@@ -64,21 +64,21 @@
</div> </div>
<div class="mt-7"> <div class="mt-7">
<a href="/conf/2019/sprint" class="no-border"> <a href="/conf/2019/sprint" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/typing-on-a-computer.png' alt='Person Contributing'> <img class="pr-4 pl-5" src='/assets/foundation/img/illustrations/typing-on-a-computer.png' alt='Person Contributing'>
</div> </div>
<div class="col-xs-12 col-sm-7"> <div class="col-xs-12 col-sm-7">
<h3>Contribution Sprint</h3> <h3>Contribution Sprint</h3>
<p>Join the global community of ERPNext developers and users for a <p>Join the global ERPNext community for a
two day contribution sprint and contribute new features, two day sprint and contribute new features,
fixes and documentation.</p> fixes and documentation.</p>
<p>KJ Somaiya College of Engineering <br> 15 and 16 October</p> <p>KJ Somaiya College of Engineering <br> 15 and 16 October</p>
</div> </div>
</div> </div>
</a> </a>
<a href="/conf/2019/talks" class="no-border"> <a href="/conf/2019/talks" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/group.png' alt='Group of people'> <img class="px-5" src='/assets/foundation/img/illustrations/group.png' alt='Group of people'>
</div> </div>

View File

@@ -41,21 +41,21 @@
</div> </div>
<div class="mt-7 container-md mx-auto"> <div class="mt-7 container-md mx-auto">
<a href="/conf/2019/sprint" class="no-border"> <a href="/conf/2019/sprint" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/typing-on-a-computer.png' alt='Person Contributing'> <img class="pr-4 pl-5" src='/assets/foundation/img/illustrations/typing-on-a-computer.png' alt='Person Contributing'>
</div> </div>
<div class="col-xs-12 col-sm-7"> <div class="col-xs-12 col-sm-7">
<h3>Contribution Sprint</h3> <h3>Contribution Sprint</h3>
<p>Join the global community of ERPNext developers and users for a <p>Join the global ERPNext community for a
two day contribution sprint and contribute new features, two day sprint and contribute new features,
fixes and documentation.</p> fixes and documentation.</p>
<p>KJ Somaiya College of Engineering <br> 15 and 16 October</p> <p>KJ Somaiya College of Engineering <br> 15 and 16 October</p>
</div> </div>
</div> </div>
</a> </a>
<a href="/conf/2019/talks" class="no-border"> <a href="/conf/2019/talks" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/group.png' alt='Group of people'> <img class="px-5" src='/assets/foundation/img/illustrations/group.png' alt='Group of people'>
</div> </div>
@@ -67,13 +67,13 @@
</div> </div>
</div> </div>
</a> </a>
<a href="/conf/2019/expo" class="no-border"> <a href="/conf/2019/exhibition" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='Bussiness People'> <img class="px-5" src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='Bussiness People'>
</div> </div>
<div class="col-xs-12 col-sm-7"> <div class="col-xs-12 col-sm-7">
<h3>Exhibit Program</h3> <h3>Exhibition</h3>
<p>Showcase the services you provide for ERPNext to the global community, <p>Showcase the services you provide for ERPNext to the global community,
understand their challenges and explore solutions with them.</p> understand their challenges and explore solutions with them.</p>
</div> </div>

View File

@@ -67,7 +67,7 @@
</div> </div>
<div class="mt-7"> <div class="mt-7">
<a href="/conf/2019/talks" class="no-border"> <a href="/conf/2019/talks" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/group.png' alt='Group of people'> <img class="px-5" src='/assets/foundation/img/illustrations/group.png' alt='Group of people'>
</div> </div>
@@ -79,13 +79,13 @@
</div> </div>
</div> </div>
</a> </a>
<a href="/conf/2019/expo" class="no-border"> <a href="/conf/2019/exhibition" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='Bussiness People'> <img class="px-5" src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='Bussiness People'>
</div> </div>
<div class="col-xs-12 col-sm-7"> <div class="col-xs-12 col-sm-7">
<h3>Exhibit Program</h3> <h3>Exhibition</h3>
<p>Showcase the services you provide for ERPNext to the global community, <p>Showcase the services you provide for ERPNext to the global community,
understand their challenges and explore solutions with them.</p> understand their challenges and explore solutions with them.</p>
</div> </div>

View File

@@ -58,6 +58,9 @@
</ul>--> </ul>-->
</div> </div>
</div> </div>
<div class="text-center">
<a class="mt-4 btn btn-dark btn" href="/propose-a-talk">Propose a talk</a>
</div>
</div> </div>
</section> </section>
@@ -69,26 +72,26 @@
</div> </div>
<div class="mt-7"> <div class="mt-7">
<a href="/conf/2019/sprint" class="no-border"> <a href="/conf/2019/sprint" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/typing-on-a-computer.png' alt='Person Contributing'> <img class="pr-4 pl-5" src='/assets/foundation/img/illustrations/typing-on-a-computer.png' alt='Person Contributing'>
</div> </div>
<div class="col-xs-12 col-sm-7"> <div class="col-xs-12 col-sm-7">
<h3>Contribution Sprint</h3> <h3>Contribution Sprint</h3>
<p>Join the global community of ERPNext developers and users for a <p>Join the global ERPNext community for a
two day contribution sprint and contribute new features, two day sprint and contribute new features,
fixes and documentation.</p> fixes and documentation.</p>
<p>KJ Somaiya College of Engineering <br> 15 and 16 October</p> <p>KJ Somaiya College of Engineering <br> 15 and 16 October</p>
</div> </div>
</div> </div>
</a> </a>
<a href="/conf/2019/expo" class="no-border"> <a href="/conf/2019/exhibition" class="no-border">
<div class="card-body row"> <div class="card-body mb-4 row">
<div class="col-xs-12 col-sm-5 mb-4 mb-md-0"> <div class="col-xs-12 col-sm-5 mb-4 mb-md-0">
<img class="px-5" src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='Bussiness People'> <img class="px-5" src='/assets/foundation/img/illustrations/people-hand-shake.png' alt='Bussiness People'>
</div> </div>
<div class="col-xs-12 col-sm-7"> <div class="col-xs-12 col-sm-7">
<h3>Exhibit Program</h3> <h3>Exhibition</h3>
<p>Showcase the services you provide for ERPNext to the global community, <p>Showcase the services you provide for ERPNext to the global community,
understand their challenges and explore solutions with them.</p> understand their challenges and explore solutions with them.</p>
</div> </div>

View File

@@ -19,9 +19,14 @@
ERPNext Foundation is a registered not for profit that helps build the ERPNext community and drive projects. ERPNext Foundation is a registered not for profit that helps build the ERPNext community and drive projects.
</p> </p>
<p><a class="mt-4 btn btn-dark btn" href="/get-started">Get Started with ERPNext</a></p> <p><a class="mt-4 btn btn-dark btn" href="/get-started">Get Started with ERPNext</a></p>
<p><a class="text-muted" href="/stories">Read user stories</a></p> <!-- <p><a class="text-muted" href="/stories">Read user stories</a></p> -->
</div> </div>
</div> </div>
<div class="container">
<a href="/conf/2019" class="alert alert-info mt-4 d-block">
The 2019 edition of the ERPNext Conference is here. 15th to 18th October, Mumbai
</a>
</div>
</section> </section>
{% macro card(title, body, badges) %} {% macro card(title, body, badges) %}