diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css index 7c9bf2f5..1fe2dedc 100644 --- a/foundation/public/css/erpnext-org-theme.css +++ b/foundation/public/css/erpnext-org-theme.css @@ -81,6 +81,7 @@ a:hover { } .navbar { padding: 1rem 2.5rem; + background-color: #fff; } .navbar-header { display: flex; @@ -88,13 +89,14 @@ a:hover { align-items: center; } .navbar-icon { - width: 25px; + width: 1.5rem; margin-right: .5rem; padding-bottom: 0.07rem; } .navbar-brand { font-size: 1rem; font-weight: bold; + letter-spacing: 0.005em; text-decoration: none; color: #36414C; } @@ -131,26 +133,21 @@ a:hover { padding: 0 2.5rem; border-top: 1px solid #EBEFF2; } -.homepage-illustration { - margin-bottom: 2.5rem; +.hero-illustration { width: 100%; max-width: 800px; + margin-bottom: 2.5rem; +} +.about-img { + margin-bottom: 2.5rem; } .title { font-size: 2.5rem; line-height: 1.025; + margin-top: 0; } -.domain-links { - font-size: 1.5rem; - display: block; - padding: 1.5rem; -} -.domain-links span { - display: block; -} -.domain-image { - width: 125px; - padding-bottom: 1.5rem; +.subtitle { + margin-top: 0; } .list-items { text-align: center; @@ -165,11 +162,21 @@ a:hover { .list.grid-of-four { grid-gap: 2.5rem; } +.grid-of-four { + display: grid; + grid-template-columns: repeat(4, 1fr); +} .list { list-style: none; padding-left: 0; } /*utilities*/ +.gray-bg { + background-color: #fafbfc; +} +.dark-bg { + background-color: #2E3338; +} .left-aligned { text-align: left; } @@ -189,19 +196,12 @@ a:hover { .text-white { color: #fff; } -.grid-of-four { - display: grid; - grid-template-columns: repeat(4, 1fr); -} .intro-copy { font-size: 1.5rem; max-width: 600px; margin: 0 auto 1.5rem auto; line-height: 1.5em; } -.community-bg .intro-copy { - max-width: 800px; -} .primary-links { color: #6c7680; transition: color 0.3s ease-out; @@ -247,19 +247,6 @@ a:hover { background: #cad5df; color: #2E3338; } -.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; - background-repeat: no-repeat; - background-position: center; - background-attachment: fixed; -} .secondary-link { color: #6c7680; transition: color 0.3s ease-out; @@ -267,6 +254,9 @@ a:hover { .secondary-link:hover { color: #2E3338; } +.active { + color: #2E3338; +} .three-column, .two-column { display: flex; @@ -312,9 +302,6 @@ a:hover { max-width: 1200px; margin: 0 auto; } -.active { - color: #2E3338; -} .breadcrumb { padding: 0; margin-bottom: 1.5rem; @@ -350,6 +337,9 @@ a:hover { width: 100%; padding: 4rem 0; } +.page-content h1:first-child { + margin-top: 0; +} .blog-page { padding: 4rem 0; max-width: 700px; @@ -381,6 +371,82 @@ hr { margin-right: .5em; } /* loaned from bootstrap*/ +.modal-open .modal { + 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; +} +.modal-backdrop.in { + filter: alpha(opacity=50); + opacity: .5; +} +.modal-backdrop { + position: absolute; + top: 0; + right: 0; + left: 0; + background-color: #334143; +} +.modal.in .modal-dialog { + transform: translate(0, 0); +} +.modal-dialog { + width: 600px; + margin: 2rem auto; +} +.modal-content { + 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: 1px solid #d1d8dd; +} +.modal-title { + margin: 0; + line-height: 1.42857143; +} +.modal-body { + position: relative; + padding: 1rem; +} +.modal-header .close { + 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; +} +.close:hover, +.close:focus { + color: #000; + text-decoration: none; + cursor: pointer; + filter: alpha(opacity=50); + opacity: .5; +} .btn-default { color: inherit; background-color: #F0F4F7; @@ -457,6 +523,25 @@ code { font-size: .85em; } /*loaned from frappe*/ +.no-results { + text-align: center; + padding: 10rem 0px; +} +.add-comment-section { + padding-bottom: 2rem; +} +.comment-header { + border-bottom: 1px solid #d1d8dd; + padding: 2rem 0 1rem; +} +.comment-row { + margin: 0 1rem; + padding: 1rem; +} +.comment-row:last-child { + margin-bottom: 2rem; + border-bottom: 0; +} .page-card { max-width: 360px; padding: 1em; @@ -506,17 +591,6 @@ img.blog-cover-image, margin-top: 4rem; } /*blog*/ -.blog-text h1, -.blog-text h2, -.blog-text h3, -.blog-text h4, -.blog-text h5, -.blog-text h6 { - margin-top: 3em; - margin-bottom: 1em; - font-weight: bold; - color: #36414C; -} .blog-list-content { border: 0px; background: transparent; @@ -532,60 +606,59 @@ img.blog-cover-image, color: #36414C; } .blog-list-item h1 { - margin-bottom: .5em; + margin-top: 0; } .blog-list-item:not(:first-child) { padding-top: 4rem; } .blogpost-cover-img { width: 75%; + margin-bottom: .5rem; } -.blog-list-item .blog-header { +.blog-header { font-size: 2.5rem; } .blog-container img { margin-bottom: 1.5rem; } -.blog-header { - font-size: 2.5rem; -} .blog-comments { position: relative; border-top: 1px solid #d1d8dd; } .blog-info { - margin: 2em 0; + margin: 2.5rem 0; } .blog-text { font-size: 1.25em; letter-spacing: 0.01em; } .blog-content { - margin-bottom: 3em; + margin-bottom: 2.5rem; } .blogger { padding-top: 0px; - padding-bottom: 3em; + padding-bottom: 2.5rem; } .blogger-name { margin-top: .25em; } -.post-description { - margin: 1em 0; -} .blog-list-item .avatar { margin-right: 1em; } .avatar { display: inline-block; - vertical-align: middle; width: 50px; height: 50px; } .avatar img { max-width: 100%; max-height: 100%; - border-radius: 4px; + border-radius: 0.25em; +} +.avatar-medium { + margin-right: 0.25em; + width: 2rem; + height: 2rem; } .inline-block { display: inline-block; @@ -593,3 +666,43 @@ img.blog-cover-image, .blog-container { max-width: 700px; } +.media { + display: flex; + padding: 1.5rem; + background: #fafbfc; + margin-bottom: 1.5rem; + border-radius: .25em; + border: 1px solid lightgray; + width: 75%; +} +.media-left { + width: 10%; + margin-right: 1.5rem; +} +.media-heading { + margin-top: 0; +} +/* individual elements */ +.domain-links { + font-size: 1.5rem; + display: block; + padding: 1.5rem; +} +.domain-links span { + display: block; +} +.domain-image { + width: 125px; + padding-bottom: 1.5rem; +} +.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; + background-repeat: no-repeat; + background-position: center; + background-attachment: fixed; +} +.community-bg .intro-copy, +.about .intro-copy { + max-width: 800px; +} diff --git a/foundation/public/css/reset.css b/foundation/public/css/reset.css index 511d2d94..d7a7080b 100644 --- a/foundation/public/css/reset.css +++ b/foundation/public/css/reset.css @@ -56,8 +56,8 @@ hr { } h1, h2, h3, h4, h5, h6 { - margin-top: 0; - margin-bottom: 1.5rem; + margin-bottom: 1rem; + } p { @@ -183,6 +183,8 @@ figure { img { vertical-align: middle; border-style: none; + width: 100%; + border-radius: 0.25em; } svg:not(:root) { diff --git a/foundation/public/img/community-colored.png b/foundation/public/img/community-colored.png new file mode 100644 index 00000000..efd74b3b Binary files /dev/null and b/foundation/public/img/community-colored.png differ diff --git a/foundation/public/img/foundation-image.svg b/foundation/public/img/foundation-image.svg index 1e03dcdf..43c3510d 100644 --- a/foundation/public/img/foundation-image.svg +++ b/foundation/public/img/foundation-image.svg @@ -9,9 +9,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="330.00012" - height="330.00006" - viewBox="0 0 87.312531 87.312515" + width="115.71439" + height="115.7143" + viewBox="0 0 30.616098 30.616075" version="1.1" id="svg5271" inkscape:version="0.92.2 5c3e80d, 2017-08-06" @@ -26,14 +26,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" - inkscape:cx="-8.3021998" - inkscape:cy="181.06016" + inkscape:cx="-374.73073" + inkscape:cy="73.91727" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" units="px" inkscape:window-width="1920" - inkscape:window-height="1149" + inkscape:window-height="1029" inkscape:window-x="0" inkscape:window-y="24" inkscape:window-maximized="1" /> @@ -45,7 +45,7 @@ image/svg+xml - + @@ -70,52 +70,53 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-50.081839,-105.93303)"> + transform="translate(-78.430041,-134.28125)"> + style="fill:#cccccc;stroke-width:2.8518517"> + style="fill:#cccccc;stroke-width:2.85185337"> + style="fill:#cccccc;stroke-width:2.85185337"> + style="fill:#cccccc;stroke-width:2.85185337"> + style="opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:11.31829357;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + id="circle1424-7-6" + inkscape:connector-curvature="0" /> + style="fill:#cccccc;fill-opacity:1;stroke-width:2.8518517" /> + style="fill:#cccccc;stroke-width:2.8518517" /> diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less index 75e9174c..d3412399 100644 --- a/foundation/public/less/erpnext-org-theme.less +++ b/foundation/public/less/erpnext-org-theme.less @@ -13,6 +13,7 @@ a { } .navbar{ padding: 1rem 2.5rem; + background-color:#fff; } .navbar-header { display: flex; @@ -20,13 +21,15 @@ a { align-items: center; } .navbar-icon { - width: 25px; + width: 1.5rem; margin-right: .5rem; padding-bottom: 0.07rem; + } .navbar-brand { font-size: 1rem; font-weight: bold; + letter-spacing: 0.005em; text-decoration: none; color: @text-color; @@ -68,31 +71,24 @@ a { border-top: 1px solid @light-border-color; } -.homepage-illustration { - margin-bottom: 2.5rem; +.hero-illustration { width: 100%; max-width: 800px; + margin-bottom: 2.5rem; +} +.about-img { + margin-bottom: 2.5rem; + } .title{ font-size: 2.5rem; line-height: 1.025; + margin-top: 0; } - -.domain-links{ - font-size: 1.5rem; - display: block; - padding: 1.5rem; - - span{ - display:block; - } -} - -.domain-image { - width: 125px; - padding-bottom: 1.5rem; +.subtitle { + margin-top: 0; } .list-items { @@ -110,12 +106,24 @@ a { grid-gap: 2.5rem; } +.grid-of-four{ + display: grid; + grid-template-columns: repeat(4, 1fr); +} + .list{ list-style: none; padding-left: 0; } /*utilities*/ +.gray-bg { + background-color: @light-bg; +} +.dark-bg { + background-color: @text-dark; +} + .left-aligned{ text-align: left; } @@ -139,10 +147,6 @@ a { .text-white{ color:#fff; } -.grid-of-four{ - display: grid; - grid-template-columns: repeat(4, 1fr); -} .intro-copy{ font-size: 1.5rem; @@ -151,10 +155,6 @@ a { line-height: 1.5em; } -.community-bg .intro-copy{ - max-width:800px; -} - .primary-links { color: @text-light; transition: @transition-color; @@ -204,22 +204,7 @@ 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"); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - background-attachment: fixed; -} - -.secondary-link{ +.secondary-link { color:@text-light; transition: @transition-color; &:hover{ @@ -227,12 +212,16 @@ a { } } +.active { + color: @text-dark; +} + .three-column, .two-column { display: flex; justify-content: space-between; } -.list-unstyled{ +.list-unstyled { padding: 0; margin: 0; @@ -242,7 +231,6 @@ a { } - .bulleted-list { margin: 0; list-style: circle; @@ -281,9 +269,6 @@ a { margin: 0 auto; } -.active { - color: @text-dark; -} .breadcrumb { padding: 0; margin-bottom: 1.5rem; @@ -325,6 +310,10 @@ a { padding: 4rem 0; } +.page-content h1:first-child { + margin-top: 0; +} + .blog-page{ padding: 4rem 0; max-width: 700px; @@ -362,6 +351,86 @@ hr { /* loaned from bootstrap*/ +.modal-open .modal { + 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; +} + +.modal-backdrop.in { + filter: alpha(opacity=50); + opacity: .5; +} +.modal-backdrop { + position: absolute; + top: 0; + right: 0; + left: 0; + background-color: @modal-backdrop-bg; +} +.modal.in .modal-dialog { + transform: translate(0, 0); +} +.modal-dialog { + 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); +} +.modal-header { + min-height: 1rem; + padding: 1rem; + border-bottom: @border; +} +.modal-title { + margin: 0; + line-height: 1.42857143; +} +.modal-body { + position: relative; + padding: 1rem; +} + +.modal-header .close { + 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; +} + +.close:hover, .close:focus { + color: #000; + text-decoration: none; + cursor: pointer; + filter: alpha(opacity=50); + opacity: .5; +} .btn-default { color: inherit; @@ -385,11 +454,11 @@ hr { } .table-bordered { - border: 1px solid @border-color; + border: @border; } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { - border: 1px solid @border-color; + border: @border; } .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { @@ -421,7 +490,7 @@ hr { color: @text-dark; background-color: #fff; background-image: none; - border: 1px solid @border-color; + 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); @@ -437,11 +506,34 @@ code { } /*loaned from frappe*/ +.no-results { + text-align: center; + padding: 10rem 0px; +} + +.add-comment-section { + padding-bottom: 2rem; +} +.comment-header { + border-bottom: @border; + padding: 2rem 0 1rem; +} + +.comment-row { + margin: 0 1rem; + padding: 1rem; +} + +.comment-row:last-child { + margin-bottom: 2rem; + border-bottom: 0; +} + .page-card { max-width: 360px; padding: 1em; margin: 8rem auto; - border: 1px solid @border-color; + border: @border; border-radius: .25em; background-color: #fff; box-shadow: 0px .25em .5em rgba(0, 0, 0, 0.1); @@ -451,7 +543,7 @@ code { padding: .75em 1em; margin: -1em; margin-bottom: 1em; - border-bottom: 1px solid @border-color; + border-bottom: @border; } .login-content .btn { @@ -487,20 +579,6 @@ img.blog-cover-image, .blog-text img, .screenshot { } /*blog*/ -.headers(@style) { - h1, h2, h3, h4, h5, h6 { - @style(); - } -} - -.blog-text { - .headers({ - margin-top: 3em; - margin-bottom: 1em; - font-weight:bold; - color: @text-color; - }); -} .blog-list-content { border: 0px; @@ -517,21 +595,22 @@ img.blog-cover-image, .blog-text img, .screenshot { color: @text-color; } h1{ - margin-bottom: .5em; + margin-top: 0; } } .blog-list-item:not(:first-child){ padding-top: 4rem; - } - - -.blogpost-cover-img{ -width: 75%; } -.blog-list-item .blog-header { +.blogpost-cover-img{ + width: 75%; + margin-bottom: .5rem; +} + + +.blog-header { font-size: 2.5rem; } @@ -539,53 +618,53 @@ width: 75%; margin-bottom: 1.5rem; } -.blog-header { - font-size: 2.5rem; -} .blog-comments { position: relative; - border-top: 1px solid @border-color; + border-top: @border; } + .blog-info { - margin: 2em 0; + margin: 2.5rem 0; } + .blog-text { + font-size: 1.25em; letter-spacing: 0.01em; } -.blog-content{ -margin-bottom: 3em; +.blog-content { + margin-bottom: 2.5rem; } .blogger { padding-top: 0px; - padding-bottom: 3em; + padding-bottom: 2.5rem; } .blogger-name { margin-top: .25em; } -.post-description { - margin: 1em 0; -} - .blog-list-item .avatar { margin-right: 1em; } .avatar { display: inline-block; - vertical-align: middle; - width: 50px; + width: 50px; height: 50px; } .avatar img { max-width: 100%; max-height: 100%; - border-radius: 4px; + border-radius: 0.25em; } +.avatar-medium { + margin-right: 0.25em; + width: 2rem; + height: 2rem; +} .inline-block { display: inline-block; } @@ -593,3 +672,50 @@ margin-bottom: 3em; .blog-container { max-width: 700px; } + +.media { + display: flex; + padding: 1.5rem; + background: #fafbfc; + margin-bottom: 1.5rem; + border-radius: .25em; + border: 1px solid lightgray; + width: 75%; +} +.media-left { + width: 10%; + margin-right: 1.5rem; +} +.media-heading { + margin-top: 0; +} +.media-object { +} +/* individual elements */ + +.domain-links { + font-size: 1.5rem; + display: block; + padding: 1.5rem; + + span { + display:block; + } +} + +.domain-image { + width: 125px; + padding-bottom: 1.5rem; +} + +.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"); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + background-attachment: fixed; +} + +.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 0c11729e..680b37d1 100644 --- a/foundation/public/less/variables.less +++ b/foundation/public/less/variables.less @@ -9,3 +9,4 @@ @screen-max: 1200px; @transition-color: color .3s ease-out; @transition-all: all .3s ease-out; +@border: 1px solid @border-color; diff --git a/foundation/templates/base.html b/foundation/templates/base.html index a0c0311f..108b4d11 100644 --- a/foundation/templates/base.html +++ b/foundation/templates/base.html @@ -17,12 +17,9 @@ {%- block head -%} {% block meta_block %}{% endblock %} - {% if 'docs' in path or doctype == 'Blog Post' %} - - - - {% endif %} - + + + {%- endblock -%} {# loading required JS for login #}