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 new file mode 100644 index 00000000..4666330c Binary files /dev/null and b/foundation/erpnext_foundation/doctype/service_provider/templates/.service_provider.html.kate-swp differ diff --git a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html index 2a144931..7090aee4 100644 --- a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html +++ b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html @@ -9,14 +9,12 @@ {% endif %}
- {% if image %}
- {% endif %}
{{ introduction }} diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css index 5233adbf..3da4d411 100644 --- a/foundation/public/css/erpnext-org-theme.css +++ b/foundation/public/css/erpnext-org-theme.css @@ -109,40 +109,29 @@ a:hover { .list-items:hover { box-shadow: 0px 5px 9px 0px rgba(0, 0, 0, 0.05); } -.list.grid-of-four, +.grid-of-four, .grid-of-three { grid-gap: 2.5rem; -} -.grid-of-four { display: grid; - grid-template-columns: repeat(1, 1fr); -} -@media screen and (min-width: 500px) { - .grid-of-four { - grid-template-columns: repeat(2, 1fr); - } -} -@media screen and (min-width: 767px) { - .grid-of-four { - grid-template-columns: repeat(3, 1fr); - } } @media screen and (min-width: 991px) { .grid-of-four { grid-template-columns: repeat(4, 1fr); } } -.grid-of-three { - display: grid; +.grid-of-three, +.grid-of-four { grid-template-columns: repeat(1, 1fr); } @media screen and (min-width: 500px) { - .grid-of-three { + .grid-of-three, + .grid-of-four { grid-template-columns: repeat(2, 1fr); } } @media screen and (min-width: 767px) { - .grid-of-three { + .grid-of-three, + .grid-of-four { grid-template-columns: repeat(3, 1fr); } } @@ -151,6 +140,11 @@ a:hover { padding-left: 0; } /*utilities*/ +.hide, +.hidden { + display: none; + visibility: hidden; +} .top-zero { margin-top: 0; } @@ -289,7 +283,7 @@ a:hover { line-height: 3; } .button-secondary:hover { - background: #cad5df; + background: #ffffff; color: #2E3338; } .secondary-link { @@ -316,12 +310,18 @@ a:hover { .page_content li, .sidebar-item, .footer-list li { - margin-bottom: 1em; + margin-bottom: 1rem; } .page-container { display: flex; max-width: 1199px; margin: 0 auto; + flex-direction: column-reverse; +} +@media screen and (min-width: 767px) { + .page-container { + flex-direction: row; + } } .page-content { width: 100%; @@ -357,9 +357,13 @@ a:hover { } .sidebar-block { padding: 4rem 0; - border-right: 1px solid black; min-width: 200px; - border-right: 1px solid #EBEFF2; + border-top: 1px solid #EBEFF2; +} +@media screen and (min-width: 767px) { + .sidebar-block { + border-right: 1px solid #EBEFF2; + } } .blog-page { padding: 4rem 0; @@ -367,7 +371,12 @@ a:hover { margin: 0 auto; } .page-content.with-sidebar { - padding: 4rem 0 4rem 2.5rem; + padding: 1rem; +} +@media screen and (min-width: 767px) { + .page-content.with-sidebar { + padding: 4rem 0 4rem 2.5rem; + } } hr { margin-top: 20px; @@ -391,12 +400,39 @@ hr { margin-right: .5em; } /* loaned from bootstrap*/ -.fade.in { - opacity: 1; +/*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, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } +.progress-bar-success { + 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; +} +/*progress bar*/ .clickable a { color: #36414C; } +.clickable a:focus { + outline: 0; +} +.fade.in { + opacity: 1; +} caption { padding-top: 8px; padding-bottom: 8px; @@ -569,6 +605,9 @@ code { font-size: .85em; } /*loaned from frappe*/ +.comment-view { + padding-bottom: 2.5rem; +} .no-results { text-align: center; padding: 10rem 0px; @@ -759,13 +798,13 @@ img.blog-cover-image, .gold-member:hover { background-color: #fafbfc; } -.silver-member { +.box { padding: 1.5rem; border: 1px solid #d1d8dd; border-radius: .25em; transition: background-color 0.3s ease-out; } -.silver-member:hover { +.box:hover { background-color: #fafbfc; } .domain-links { diff --git a/foundation/public/img/conf/sponsors/cloude8.png b/foundation/public/img/conf/sponsors/cloude8.png new file mode 100644 index 00000000..2cc399d9 Binary files /dev/null and b/foundation/public/img/conf/sponsors/cloude8.png differ diff --git a/foundation/public/img/conf/sponsors/cloude8.webp b/foundation/public/img/conf/sponsors/cloude8.webp deleted file mode 100644 index d03a9d62..00000000 Binary files a/foundation/public/img/conf/sponsors/cloude8.webp and /dev/null differ diff --git a/foundation/public/img/conf/sponsors/digithinkit.png b/foundation/public/img/conf/sponsors/digithinkit.png index 28019917..35bec7a7 100644 Binary files a/foundation/public/img/conf/sponsors/digithinkit.png and b/foundation/public/img/conf/sponsors/digithinkit.png differ diff --git a/foundation/public/img/conf/sponsors/indictrans.jpg b/foundation/public/img/conf/sponsors/indictrans.jpg deleted file mode 100644 index 7ce8a5bb..00000000 Binary files a/foundation/public/img/conf/sponsors/indictrans.jpg and /dev/null differ diff --git a/foundation/public/img/conf/sponsors/indictrans.png b/foundation/public/img/conf/sponsors/indictrans.png new file mode 100644 index 00000000..3d2914e1 Binary files /dev/null and b/foundation/public/img/conf/sponsors/indictrans.png differ diff --git a/foundation/public/img/conf/sponsors/mnt-logo.png b/foundation/public/img/conf/sponsors/mnt-logo.png index 1a72cab3..e73a5e89 100644 Binary files a/foundation/public/img/conf/sponsors/mnt-logo.png and b/foundation/public/img/conf/sponsors/mnt-logo.png differ diff --git a/foundation/public/img/conf/sponsors/mnt.png b/foundation/public/img/conf/sponsors/mnt.png new file mode 100644 index 00000000..791b3155 Binary files /dev/null and b/foundation/public/img/conf/sponsors/mnt.png differ diff --git a/foundation/public/img/conf/sponsors/mnt.svg b/foundation/public/img/conf/sponsors/mnt.svg deleted file mode 100644 index d1128535..00000000 --- a/foundation/public/img/conf/sponsors/mnt.svg +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - MN Technique - - - - - - - - - - - diff --git a/foundation/public/img/conf/sponsors/shs-logo.png b/foundation/public/img/conf/sponsors/shs-logo.png index f01b8917..458d8b2a 100644 Binary files a/foundation/public/img/conf/sponsors/shs-logo.png and b/foundation/public/img/conf/sponsors/shs-logo.png differ diff --git a/foundation/public/img/frappe-bird-black.svg b/foundation/public/img/frappe-bird-black.svg index 4077d24e..43c4c8bd 100644 --- a/foundation/public/img/frappe-bird-black.svg +++ b/foundation/public/img/frappe-bird-black.svg @@ -1,16 +1,45 @@ - - - - Group - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + +image/svg+xml \ No newline at end of file diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less index 9dd186be..d027d308 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: @transition-color; + transition: color @transition; &:hover{ color: @text-dark; text-decoration: underline; @@ -91,7 +91,7 @@ a { padding: 8rem 2.5rem; } } -.page{ +.page { padding: 0 1rem; border-top: 1px solid @light-border-color; } @@ -111,34 +111,24 @@ a { border-radius: .5rem; background-color: #fff; min-width:200px; - transition: @transition-all; + transition: all @transition; &:hover{ box-shadow: 0px 5px 9px 0px rgba(0, 0, 0, 0.05); } } -.list.grid-of-four, .grid-of-three { +.grid-of-four, .grid-of-three { grid-gap: 2.5rem; + display: grid; } .grid-of-four { - display: grid; - 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{ - display: grid; +.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); @@ -158,6 +148,11 @@ a { @spacer-2: @spacer-1 * 2; /*utilities*/ +.hide, .hidden { + display: none; + visibility: hidden; +} + .top-zero { margin-top: 0; } @@ -182,7 +177,7 @@ a { text-align: right; } -.text-center{ +.text-center { text-align: center; } @@ -198,11 +193,11 @@ a { color:#fff; } -.centered{ +.centered { margin: 0 auto; } -.bold{ +.bold { font-weight: bold; } @@ -263,7 +258,7 @@ a { .primary-links { color: @text-light; - transition: @transition-color; + transition: color @transition; &:hover{ color: @text-dark; text-decoration: none; @@ -274,7 +269,7 @@ a { padding: 1rem 1.5rem; border-radius:.25em; cursor: pointer; - transition: @transition-all; + transition: all @transition; border-bottom: 3px solid rgba(0, 0, 0, 0.2); text-decoration: none; &:hover{ @@ -312,7 +307,7 @@ a { .secondary-link { color:@text-light; - transition: @transition-color; + transition: color @transition; &:hover{ color: @text-dark; } @@ -337,7 +332,7 @@ a { padding: ; } .page_content li, .sidebar-item, .footer-list li{ - margin-bottom: 1em; + margin-bottom: 1rem; } @@ -345,9 +340,14 @@ a { display: flex; max-width: @screen-md; margin: 0 auto; + flex-direction: column-reverse; + @media screen and (min-width: @screen-xs) { + flex-direction: row + } + } -.page-content{ +.page-content { width:100%; padding: 4rem 0; @@ -370,7 +370,7 @@ a { } &:hover{ color: @text-dark; - transition: @transition-color; + transition: color @transition; } } @@ -387,19 +387,27 @@ a { .sidebar-block { padding: 4rem 0; - border-right: 1px solid black; min-width: 200px; - border-right: 1px solid @light-border-color; + border-top: 1px solid @light-border-color; + @media screen and (min-width: @screen-xs) { + border-right: 1px solid @light-border-color; + } + } -.blog-page{ +.blog-page { padding: 4rem 0; max-width: 700px; margin: 0 auto; } .page-content.with-sidebar { - padding: 4rem 0 4rem 2.5rem; + + @media screen and (min-width: @screen-xs) { + padding: 4rem 0 4rem 2.5rem; + } + padding: 1rem; + } hr { @@ -415,9 +423,9 @@ hr { font-size: 0.75rem; } -.footer-end a{ +.footer-end a { color: @text-muted; - &:hover{ + &:hover { color: #fff; } } @@ -428,13 +436,47 @@ hr { } /* 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); +} + +.progress-bar-success { + background-color: @indicator-green; +} + +.sr-only { + 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; + } +} + .fade.in { opacity: 1; } -.clickable a { - color: @text-color; -} caption { padding-top: 8px; padding-bottom: 8px; @@ -614,6 +656,10 @@ code { } /*loaned from frappe*/ +.comment-view { + padding-bottom: 2.5rem; +} + .no-results { text-align: center; padding: 10rem 0px; @@ -754,7 +800,7 @@ img.blog-cover-image, .blog-text img, .screenshot { margin-top: .25em; font-weight: normal; font-size: 1rem; - a{ + a { color: @text-color; } } @@ -830,7 +876,7 @@ img.blog-cover-image, .blog-text img, .screenshot { } } -.silver-member{ +.box { padding: 1.5rem; border: 1px solid @border-color; border-radius: .25em; @@ -865,6 +911,6 @@ img.blog-cover-image, .blog-text img, .screenshot { background-attachment: fixed; } -.community-bg .intro-copy, .about .intro-copy{ +.community-bg .intro-copy, .about .intro-copy { max-width:800px; } diff --git a/foundation/public/less/variables.less b/foundation/public/less/variables.less index 21a6cc70..bedd06ea 100644 --- a/foundation/public/less/variables.less +++ b/foundation/public/less/variables.less @@ -4,10 +4,8 @@ @screen-sm-min: 768px; @screen-xs-max: (@screen-sm-min - 1); @button-primary-hover: darken(desaturate(@brand-primary, 50%), 15%); -@button-secondary-hover: darken(@light-bg, 15%); +@button-secondary-hover: lighten(@light-bg, 15%); @primary-link-color: lighten(@brand-primary, 5%); -@transition-color: color .3s ease-out; -@transition-all: all .3s ease-out; @border: 1px solid @border-color; @transition: .3s ease-out; @screen-palm: 500px; diff --git a/foundation/templates/includes/footer/footer.html b/foundation/templates/includes/footer/footer.html index ccd5abc8..031b741f 100644 --- a/foundation/templates/includes/footer/footer.html +++ b/foundation/templates/includes/footer/footer.html @@ -44,7 +44,7 @@ Memberships
  • - Fellow + Fellow
  • Bounties @@ -103,7 +103,7 @@ ERPNext Model & API
    • -

    Localisation

    + diff --git a/foundation/templates/includes/sponsors.html b/foundation/templates/includes/sponsors.html index cd04afeb..647741f9 100644 --- a/foundation/templates/includes/sponsors.html +++ b/foundation/templates/includes/sponsors.html @@ -1,63 +1,35 @@ -
    -
    -
    - -
    - + \ No newline at end of file +
    diff --git a/foundation/www/service-providers.html b/foundation/www/service-providers.html index 8db95f88..303d3ef3 100644 --- a/foundation/www/service-providers.html +++ b/foundation/www/service-providers.html @@ -4,13 +4,11 @@ {% macro gold_member(m) %}
    - {% if m.image %}
    - {% endif %}

    {{ m.title }}

    {{ m.introduction }} @@ -19,7 +17,7 @@ {% endmacro %} {% macro silver_member(m) %} -

    {{ m.title }}

    {{ m.introduction | truncate(140) }}

    diff --git a/foundation/www/service_providers.py b/foundation/www/service_providers.py index 6a454763..d222f324 100644 --- a/foundation/www/service_providers.py +++ b/foundation/www/service_providers.py @@ -26,6 +26,7 @@ def get_context(context): context.gold_members.append(dict( title='Your Company', introduction='Become a Gold Member today and get your company featured here', + image='/assets/foundation/img/gold.png', route='/members', placeholder=True )) @@ -43,6 +44,7 @@ def get_context(context): context.silver_members.append(dict( title='Your Company', introduction='Become a silver Member today and get your company featured here', + image='/assets/foundation/img/silver.png', route='/members', placeholder=True ))