diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 4d4c4845d1..d53e08e02f 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -1,12 +1,3 @@ -.underline { - color: inherit; - border-bottom: 1px solid transparent; - margin-bottom: 0.4em; -} -.underline-hover { - border-bottom: 1px solid #212a33; - color: #212a33; -} html { min-height: 100%; } @@ -20,13 +11,6 @@ body { overflow-x: hidden; /* Prevent scroll on narrow devices */ } -.desk-main-section { - width: 100%; - position: fixed; - top: 0px; - bottom: 0px; - overflow-y: auto; -} .desk-main-section-overlay { display: none; cursor: pointer; diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index fa2989a329..aaf3beccc4 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -85,6 +85,9 @@ .list-row-right .modified { margin-top: 3px; } +.list-row-right .list-row-modified { + margin-top: 3px; +} .list-row-right { margin-top: -2px; margin-bottom: -4px; diff --git a/frappe/public/css/mixins.css b/frappe/public/css/mixins.css index bf8678f396..e69de29bb2 100644 --- a/frappe/public/css/mixins.css +++ b/frappe/public/css/mixins.css @@ -1,9 +0,0 @@ -.underline { - color: inherit; - border-bottom: 1px solid transparent; - margin-bottom: 0.4em; -} -.underline-hover { - border-bottom: 1px solid #212a33; - color: #212a33; -} diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css index d9318961ba..f69ebed4af 100644 --- a/frappe/public/css/mobile.css +++ b/frappe/public/css/mobile.css @@ -6,13 +6,9 @@ padding-left: 0px !important; padding-right: 0px !important; } -} -@media (max-width: 991px) { .layout-main-section { - border-color: transparent !important; - } - .form-intro-area { - padding: 15px 0px; + border-left-color: transparent !important; + border-right-color: transparent !important; } .form-grid { margin-left: -17px; @@ -21,30 +17,63 @@ border-right: none !important; border-radius: none; } + .doclist-row { + position: relative; + padding-right: 10px; + } + .doclist-row .list-row-id { + left: 40px; + text-align: left; + margin-top: 3px; + } + .doclist-row .list-row-indicator { + position: absolute; + right: 0px; + margin-top: 2px; + top: -19px; + } + .doclist-row .list-row-modified { + margin-right: -10px; + } + .doclist-row .list-row-right { + float: right; + } + .doclist-row .list-row-right.no-right-column { + position: absolute; + top: 0; + right: 10px; + left: -10px; + width: 100%; + } + .doclist-row .list-row-right.no-right-column .list-row-indicator { + top: 0; + } +} +@media (max-width: 991px) { + .form-intro-area { + padding: 15px 0px; + } .grid-row-open { top: 0; } - .page-title h1 { + body[data-route^="Form"] .page-title h1 { margin-top: 10px; } - .page-title .indicator { + body[data-route^="Form"] .page-title .indicator { display: block; margin-top: -5px; margin-bottom: 3px; } - .page-head .sub-heading { - display: block; - position: absolute; - bottom: -30px; - right: 8px; - } - .page-actions { + body[data-route^="Form"] .page-actions { padding-top: 10px !important; padding-bottom: 0px !important; padding-left: 0px !important; } - .page-head { - min-height: 1px; + body[data-route^="Form"] .page-head .sub-heading { + display: block; + position: absolute; + bottom: -30px; + right: 8px; } .nav > li > a { padding: 10px 0px; @@ -59,25 +88,47 @@ .navbar > .container > .navbar-right { float: right; } - .navbar-brand .octicon-home { - margin-top: 4px; + body[data-route^="Module"] .navbar .navbar-home { + display: inline-block !important; + padding-left: 0px; + margin-left: 0px; + } + body[data-route^="Module"] .navbar .navbar-home:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + *margin-right: .3em; + display: inline-block; + speak: none; + color: #c0c9d2; + font-size: 14px; + transition: 0.2s; + position: relative; + top: 1px; + content: "\f053" !important; + margin-right: 5px !important; } - .navbar .breadcrumb-divider { - margin-top: 12px !important; - margin-right: 3px; + body[data-route^="Module"] .navbar .navbar-home:hover:before, + body[data-route^="Module"] .navbar .navbar-home:focus:before, + body[data-route^="Module"] .navbar .navbar-home:active:before { + color: #36414c; } #navbar-breadcrumbs { margin: 0px; display: inline-block; } - #navbar-breadcrumbs > li { + #navbar-breadcrumbs > li, + #navbar-breadcrumbs > li > a { display: inline-block; vertical-align: middle; } - #navbar-breadcrumbs > li > a { - padding: 10px 0px 0px; + #navbar-breadcrumbs > li > a:before { + content: "\f053" !important; + margin-right: 5px !important; } - #navbar-breadcrumbs li:not(:nth-last-child(-n+2)) { + #navbar-breadcrumbs li:not(:nth-last-child(-n+1)) { display: none; } .navbar-nav { @@ -86,15 +137,21 @@ .offcanvas { transition: 0.25s; } - .offcanvas { + .desk-main-section-overlay { + bottom: 0; + position: fixed; + } + .desk-container, + .offcanvas, + .desk-main-section { position: absolute; left: 0; right: 0; top: 0; bottom: 0; } - .desk-main-section-overlay { - bottom: 0; + .offcanvas.active-left, + .offcanvas.active-right { position: fixed; } .offcanvas.active-left .desk-main-section-overlay, @@ -176,6 +233,9 @@ body[data-route^="Module"] .navbar-center { display: block !important; position: absolute; - top: 10px; + top: 11px; + left: 25%; + right: 25%; + text-align: center; } } diff --git a/frappe/public/css/module.css b/frappe/public/css/module.css index 28b336e9ac..dea5ef4fc1 100644 --- a/frappe/public/css/module.css +++ b/frappe/public/css/module.css @@ -1,6 +1,3 @@ -.module-section { - margin-bottom: 15px; -} .module-item { margin: 0px; padding: 7px; diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css index 067ef294f1..195fcaeb78 100644 --- a/frappe/public/css/navbar.css +++ b/frappe/public/css/navbar.css @@ -10,12 +10,6 @@ font-size: 12px; font-weight: bold; } -.navbar .breadcrumb-divider { - margin-top: 10px; -} -.navbar .breadcrumb-divider i { - color: #C0C9D2; -} .navbar-icon-home { vertical-align: middle; } @@ -70,3 +64,28 @@ font-weight: bold; color: #6c7680; } +#navbar-breadcrumbs > li > a:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + *margin-right: .3em; + display: inline-block; + speak: none; + color: #c0c9d2; + font-size: 14px; + transition: 0.2s; + content: "\f054"; + margin-right: 15px; + position: relative; + top: 1px; +} +#navbar-breadcrumbs > li > a:hover:before, +#navbar-breadcrumbs > li > a:focus:before, +#navbar-breadcrumbs > li > a:active:before { + color: #36414c; +} +#navbar-breadcrumbs > li > a { + padding: 10px 15px 10px 0px; +} diff --git a/frappe/public/css/sidebar.css b/frappe/public/css/sidebar.css index 4918e066af..35540b03c9 100644 --- a/frappe/public/css/sidebar.css +++ b/frappe/public/css/sidebar.css @@ -1,12 +1,3 @@ -.underline { - color: inherit; - border-bottom: 1px solid transparent; - margin-bottom: 0.4em; -} -.underline-hover { - border-bottom: 1px solid #212a33; - color: #212a33; -} .hide-form-sidebar .form-sidebar { display: none !important; } @@ -45,6 +36,9 @@ body[data-route^="Module"] .main-menu .form-sidebar { background-color: #ebeff2; width: 100%; } +.offcanvas .sidebar .badge { + right: 15px !important; +} .offcanvas .sidebar .sidebar-menu > li > a:hover, .offcanvas .sidebar .sidebar-menu > li > a:focus, .offcanvas .sidebar .sidebar-menu > li > a:active { @@ -52,6 +46,7 @@ body[data-route^="Module"] .main-menu .form-sidebar { } .layout-side-section { font-size: 12px; + padding-right: 0px; } .layout-side-section .divider { display: none !important; @@ -73,8 +68,8 @@ body[data-route^="Module"] .main-menu .form-sidebar { } .sidebar-menu .badge { position: absolute; - right: 15px; font-weight: normal; + right: 0px; } .sidebar-menu .octicon { font-size: 12px; @@ -102,7 +97,7 @@ body[data-route^="Module"] .main-menu .form-sidebar { } .form-sidebar a.close { position: absolute; - right: 15px; + right: 5px; } .form-sidebar .attachment-row a.close { margin-top: -5px; diff --git a/frappe/public/js/frappe/form/sidebar.js b/frappe/public/js/frappe/form/sidebar.js index 06b9fd7c47..b14b8fc1e7 100644 --- a/frappe/public/js/frappe/form/sidebar.js +++ b/frappe/public/js/frappe/form/sidebar.js @@ -30,6 +30,8 @@ frappe.ui.form.Sidebar = Class.extend({ // scroll to comments this.comments.on("click", function() { + $(".offcanvas").removeClass("active-left active-right"); + $(window).scrollTop(me.frm.footer.wrapper.find(".form-comments").offset().top - $(".navbar").height() - $(".page-head").height()); }); diff --git a/frappe/public/js/frappe/list/doclistview.js b/frappe/public/js/frappe/list/doclistview.js index ef0b43e407..56fe92bc53 100644 --- a/frappe/public/js/frappe/list/doclistview.js +++ b/frappe/public/js/frappe/list/doclistview.js @@ -89,9 +89,10 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ }, init_headers: function() { - var main = frappe.render_template("list_item_main_head", {columns: this.listview.columns}); - $(frappe.render_template("list_item_row_head", - {main:main, list:this})).appendTo(this.page.main.find(".list-headers")); + var main = frappe.render_template("list_item_main_head", + { columns: this.listview.columns, right_column: this.listview.settings.right_column }); + $(frappe.render_template("list_item_row_head",{ main:main, list:this })) + .appendTo(this.page.main.find(".list-headers")); }, init_listview: function() { diff --git a/frappe/public/js/frappe/list/list_item_main_head.html b/frappe/public/js/frappe/list/list_item_main_head.html index 2ca22508f2..27483d72d5 100644 --- a/frappe/public/js/frappe/list/list_item_main_head.html +++ b/frappe/public/js/frappe/list/list_item_main_head.html @@ -3,6 +3,17 @@ var col = columns[i]; total_cols += parseInt(col.colspan); %} {% if (total_cols <= 12) { %}
{%= col.title || col.label || "" %}
diff --git a/frappe/public/js/frappe/list/list_item_row.html b/frappe/public/js/frappe/list/list_item_row.html index 49f7b16c27..bf8370a998 100644 --- a/frappe/public/js/frappe/list/list_item_row.html +++ b/frappe/public/js/frappe/list/list_item_row.html @@ -1,27 +1,33 @@
-
{%= main %}
- {% if (list.meta.title_field) { %} -
+ {% if (list.meta.title_field) { + var is_different = data.name !== data[list.meta.title_field]; + %} + {% } %} -
-
{%= list.get_indicator_dot(data) %}
-
- - {%= comment_when(data.modified, true) %} +
+
{%= list.get_indicator_dot(data) %}
+ +
+ + {%= comment_when(data.modified, true) %} +
diff --git a/frappe/public/js/frappe/list/list_item_row_head.html b/frappe/public/js/frappe/list/list_item_row_head.html index 905deabdfa..eb5c248bc2 100644 --- a/frappe/public/js/frappe/list/list_item_row_head.html +++ b/frappe/public/js/frappe/list/list_item_row_head.html @@ -1,9 +1,10 @@ -