diff --git a/frappe/public/scss/desk/icons.scss b/frappe/public/scss/common/icons.scss similarity index 100% rename from frappe/public/scss/desk/icons.scss rename to frappe/public/scss/common/icons.scss diff --git a/frappe/public/scss/desk/modal.scss b/frappe/public/scss/common/modal.scss similarity index 100% rename from frappe/public/scss/desk/modal.scss rename to frappe/public/scss/common/modal.scss diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index 50fc09ce05..f3d62d826d 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -25,7 +25,7 @@ body { &.full-width { @include media-breakpoint-up(md) { - .container { + .container { width: 90%; max-width: 100%; } diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss index 834e15fffb..7ed40d69e0 100644 --- a/frappe/public/scss/desk/index.scss +++ b/frappe/public/scss/desk/index.scss @@ -2,6 +2,7 @@ @import "css_variables"; @import "../common/mixins.scss"; @import "../common/global.scss"; +@import "../common/icons.scss"; @import "~bootstrap/scss/bootstrap"; @import "global"; @@ -11,7 +12,7 @@ @import "print_preview"; @import "list"; @import "navbar"; -@import "modal"; +@import "../common/modal"; @import "slides"; @import "toast"; @import "breadcrumb"; @@ -20,7 +21,6 @@ @import "page"; @import "timeline"; @import "avatar"; -@import "icons"; @import "notification"; @import "global_search"; @import "desktop"; diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss index 384a9b12cf..9c27ecec56 100644 --- a/frappe/public/scss/website/index.scss +++ b/frappe/public/scss/website/index.scss @@ -4,8 +4,10 @@ @import '~bootstrap/scss/bootstrap'; @import "../common/mixins.scss"; @import "../common/global.scss"; +@import "../common/icons.scss"; @import 'base'; @import "../common/buttons"; +@import "../common/modal"; @import 'multilevel_dropdown'; @import 'website_image'; @import 'website_avatar'; @@ -187,12 +189,13 @@ h5.modal-title { } .form-section { - margin-right: -45px; + // margin-right: -45px; + margin: 0px; } .form-section .section-body { width: 100%; - padding: 15px; + margin: 0; @extend .row; } diff --git a/frappe/public/scss/website/navbar.scss b/frappe/public/scss/website/navbar.scss index a34a41e7a4..cc6359da26 100644 --- a/frappe/public/scss/website/navbar.scss +++ b/frappe/public/scss/website/navbar.scss @@ -2,6 +2,33 @@ border-bottom: 1px solid $border-color; } +.navbar-primary { + background-color: var(--blue-500); + + .nav-item { + .nav-link { + color: white; + font-weight: 400; + } + } + + .navbar-search { + background-color: var(--blue-400); + width: 300px; + margin-right: 10px; + color: white; + + &::placeholder { + color: white; + } + } + + + svg use { + --icon-stroke: white; + } +} + .navbar-brand { img { display: inline-block; diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 63646f6f02..495e07add0 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -59,6 +59,7 @@ + {% include "public/icons/timeless/symbol-defs.svg" %} {%- block banner -%} {% include "templates/includes/banner_extension.html" ignore missing %} diff --git a/frappe/templates/includes/navbar/navbar_items.html b/frappe/templates/includes/navbar/navbar_items.html index 17843754cf..99b7b3aec4 100644 --- a/frappe/templates/includes/navbar/navbar_items.html +++ b/frappe/templates/includes/navbar/navbar_items.html @@ -59,6 +59,7 @@ {%- endif %} diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 678fa956c2..a18e7f14e4 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -178,6 +178,14 @@ def nowdate(): def today(): return nowdate() +def get_abbr(string, max_len=2): + abbr='' + for part in string.split(' '): + if len(abbr) < max_len: + abbr += part[0] + + return abbr or '?' + def nowtime(): """return current time in hh:mm""" return now_datetime().strftime(TIME_FORMAT) @@ -370,7 +378,7 @@ def format_duration(seconds, hide_days=False): example: converts 12885 to '3h 34m 45s' where 12885 = seconds in float """ - + seconds = cint(seconds) total_duration = { @@ -1401,4 +1409,4 @@ def validate_json_string(string): try: json.loads(string) except (TypeError, ValueError): - raise frappe.ValidationError + raise frappe.ValidationError \ No newline at end of file diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 2aacf5eda8..4a86012d01 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -290,5 +290,6 @@ VALID_UTILS = ( "md_to_html", "is_subset", "generate_hash", -"formatdate" +"formatdate", +"get_abbr" ) \ No newline at end of file diff --git a/frappe/website/js/bootstrap-4.js b/frappe/website/js/bootstrap-4.js index dbe837b101..54b82151a0 100644 --- a/frappe/website/js/bootstrap-4.js +++ b/frappe/website/js/bootstrap-4.js @@ -21,15 +21,15 @@ $('.dropdown-menu a.dropdown-toggle').on('click', function (e) { frappe.get_modal = function(title, content) { return $( `