From 0507bca6db39b8ba23e5fb1579f7231b5b5de139 Mon Sep 17 00:00:00 2001 From: Raghavendra Kamath Date: Wed, 21 Feb 2018 10:47:19 +0530 Subject: [PATCH] minor tweaks --- foundation/hooks.py | 4 +-- foundation/public/css/.css | 0 .../public/css/bootstrap-for-webform.css | 33 +++++++++++++----- foundation/public/css/erpnext-org-theme.css | 27 +++++++++++++-- foundation/public/less/erpnext-org-theme.less | 34 +++++++++++++++---- foundation/templates/base.html | 1 + .../templates/includes/footer/footer.html | 2 +- .../doctype/web_form/templates/web_form.html | 4 +-- foundation/www/index.html | 5 +-- 9 files changed, 85 insertions(+), 25 deletions(-) create mode 100644 foundation/public/css/.css diff --git a/foundation/hooks.py b/foundation/hooks.py index 94cb3788..833f5d41 100644 --- a/foundation/hooks.py +++ b/foundation/hooks.py @@ -19,7 +19,7 @@ app_license = "MIT" # app_include_js = "/assets/foundation/js/foundation.js" # include js, css files in header of web template -# web_include_css = "/assets/foundation/css/main.css" +# web_include_css = "/assets/foundation/css/style.css" # web_include_js = "/assets/foundation/js/foundation.js" # include js in page @@ -50,7 +50,7 @@ website_context = { {"label": "Freelancer Jobs", "url": "/erpnext-jobs", "right": 1}, ], "right":1}, ], - "hide_login": 1, + "hide_login": 0, "favicon": "/assets/foundation/img/favicon.ico" } # website user home page (by Role) diff --git a/foundation/public/css/.css b/foundation/public/css/.css new file mode 100644 index 00000000..e69de29b diff --git a/foundation/public/css/bootstrap-for-webform.css b/foundation/public/css/bootstrap-for-webform.css index 951b2028..70048ad7 100644 --- a/foundation/public/css/bootstrap-for-webform.css +++ b/foundation/public/css/bootstrap-for-webform.css @@ -1106,15 +1106,7 @@ input[type="reset"].btn-block, input[type="button"].btn-block { width: 100%; } -.fade { - opacity: 0; - -webkit-transition: opacity .15s linear; - -o-transition: opacity .15s linear; - transition: opacity .15s linear; -} -.fade.in { - opacity: 1; -} + .collapse { display: none; visibility: hidden; @@ -1708,3 +1700,26 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-width: 0 5px 5px; border-bottom-color: #000; } + +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1060; + display: none; + max-width: 276px; + padding: 1px; + font-size: 14px; + font-weight: normal; + line-height: 1.42857143; + text-align: left; + white-space: normal; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, .2); + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); + box-shadow: 0 5px 10px rgba(0, 0, 0, .2); +} diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css index 65785b7a..a394c340 100644 --- a/foundation/public/css/erpnext-org-theme.css +++ b/foundation/public/css/erpnext-org-theme.css @@ -1,5 +1,4 @@ @import "reset.css"; -/*@import (css) "bootstrap-temp.css";*/ .indicator, .indicator-right { background: none; @@ -263,6 +262,12 @@ a:hover { display: flex; justify-content: space-between; } +.three-column .columns { + max-width: 33.33%; +} +.two-column { + max-width: 50%; +} .list-unstyled { padding: 0; margin: 0; @@ -270,9 +275,11 @@ a:hover { .list-unstyled li { list-style: none; } +.list-circle { + list-style: circle; +} .bulleted-list { margin: 0; - list-style: circle; padding-left: 1em; } .bulleted-list li { @@ -371,6 +378,18 @@ hr { margin-right: .5em; } /* loaned from bootstrap*/ +.fade.in { + opacity: 1; +} +.with-border a { + text-decoration: none; +} +.with-border a:hover { + text-decoration: none; +} +.clickable a { + color: #36414C; +} caption { padding-top: 8px; padding-bottom: 8px; @@ -708,6 +727,10 @@ img.blog-cover-image, padding: 1rem; margin-bottom: 2rem; } +.with-border:hover { + border-color: #6c7680; + background-color: #fafbfc; +} /* individual elements */ .domain-links { font-size: 1.5rem; diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less index ea69a226..37f3172f 100644 --- a/foundation/public/less/erpnext-org-theme.less +++ b/foundation/public/less/erpnext-org-theme.less @@ -1,5 +1,4 @@ @import (css) "reset.css"; -/*@import (css) "bootstrap-temp.css";*/ @import "variables.less"; @import "indicator.less"; @@ -117,7 +116,6 @@ a { padding-left: 0; } /*utilities*/ - .gray-bg { background-color: @light-bg; } @@ -222,6 +220,12 @@ a { justify-content: space-between; } +.three-column .columns { + max-width: 33.33%; +} +.two-column{ + max-width: 50%; +} .list-unstyled { padding: 0; margin: 0; @@ -353,7 +357,23 @@ hr { } /* loaned from bootstrap*/ +.fade.in { + opacity: 1; +} + +.with-border { + a{ + text-decoration: none; + + &:hover{ + text-decoration: none; + } + } +} +.clickable a { + color: @text-color; +} caption { padding-top: 8px; padding-bottom: 8px; @@ -717,12 +737,12 @@ img.blog-cover-image, .blog-text img, .screenshot { margin-top: 0; } .with-border { - border: @border; - border-radius: 0.25em; - padding: 1rem; - margin-bottom: 2rem; + border: @border; + border-radius: 0.25em; + padding: 1rem; + margin-bottom: 2rem; &:hover{ - border-color: @text-light:; + border-color: @text-light; background-color: @light-bg; } } diff --git a/foundation/templates/base.html b/foundation/templates/base.html index e447117a..1961bbb8 100644 --- a/foundation/templates/base.html +++ b/foundation/templates/base.html @@ -23,6 +23,7 @@ {% endif %} {%- endblock -%} + {%- block head_include %}{{ head_include or "" }}{% endblock -%} {%- block style %}{%- endblock -%}