From f23bdfe2d2776b14050a8ece9f064a807fb27ad5 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 2 Feb 2015 14:11:25 +0530 Subject: [PATCH] [design] desktop padding and fixed listing new --- frappe/core/page/desktop/desktop_icon_grid.html | 2 +- frappe/public/css/desktop.css | 1 - frappe/public/css/mobile.css | 8 ++++---- frappe/public/css/navbar.css | 8 ++++---- frappe/public/js/frappe/ui/listing.js | 1 + frappe/public/less/desktop.less | 1 - frappe/public/less/mixins.less | 8 ++++---- frappe/public/less/navbar.less | 2 +- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/frappe/core/page/desktop/desktop_icon_grid.html b/frappe/core/page/desktop/desktop_icon_grid.html index 5e4fb77a23..c588f70092 100644 --- a/frappe/core/page/desktop/desktop_icon_grid.html +++ b/frappe/core/page/desktop/desktop_icon_grid.html @@ -1,4 +1,4 @@ -
+
{% for (var i=0, l=desktop_items.length; i < l; i++) { var module = frappe.get_module(desktop_items[i]); diff --git a/frappe/public/css/desktop.css b/frappe/public/css/desktop.css index add5119f12..756596d97f 100644 --- a/frappe/public/css/desktop.css +++ b/frappe/public/css/desktop.css @@ -5,7 +5,6 @@ body[data-route="desktop"] .navbar-default { } #page-desktop { min-width: 100%; - padding-top: calc(55px); margin-top: 0px; border: 0px; position: absolute; diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css index 35f803ead4..3fe036f02e 100644 --- a/frappe/public/css/mobile.css +++ b/frappe/public/css/mobile.css @@ -103,11 +103,11 @@ display: inline-block; speak: none; color: #c0c9d2; - font-size: 14px; + font-size: 24px; transition: 0.2s; position: relative; - top: 1px; - content: "\f053" !important; + top: 3px; + content: "\f104" !important; margin-right: 5px !important; } body[data-route^="Module"] .navbar .navbar-home:hover:before, @@ -125,7 +125,7 @@ vertical-align: middle; } #navbar-breadcrumbs > li > a:before { - content: "\f053" !important; + content: "\f104" !important; margin-right: 5px !important; } #navbar-breadcrumbs li:not(:nth-last-child(-n+1)) { diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css index b64fd35103..465c723d27 100644 --- a/frappe/public/css/navbar.css +++ b/frappe/public/css/navbar.css @@ -73,11 +73,11 @@ display: inline-block; speak: none; color: #c0c9d2; - font-size: 14px; + font-size: 24px; transition: 0.2s; position: relative; - top: 1px; - content: "\f054"; + top: 3px; + content: "\f105"; margin-right: 15px; } #navbar-breadcrumbs > li > a:hover:before, @@ -86,5 +86,5 @@ color: #36414c; } #navbar-breadcrumbs > li > a { - padding: 10px 15px 10px 0px; + padding: 6px 15px 10px 0px; } diff --git a/frappe/public/js/frappe/ui/listing.js b/frappe/public/js/frappe/ui/listing.js index ffebd139f8..83fcaac98c 100644 --- a/frappe/public/js/frappe/ui/listing.js +++ b/frappe/public/js/frappe/ui/listing.js @@ -116,6 +116,7 @@ frappe.ui.Listing = Class.extend({ }, set_primary_action: function() { + var me = this; if(this.new_doctype) { var make_new_doc = function() { (me.custom_new_doc || me.make_new_doc).apply(me, [me.new_doctype]); }; this.page.set_primary_action(__("New"), function() { make_new_doc(); }, "octicon octicon-plus"); diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index c21e2203d1..a0a829594f 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -10,7 +10,6 @@ body[data-route=""] .navbar-default, body[data-route="desktop"] .navbar-default #page-desktop { min-width: 100%; - padding-top: calc(40px + 15%); margin-top: 0px; border: 0px; position: absolute; diff --git a/frappe/public/less/mixins.less b/frappe/public/less/mixins.less index 8a40ec618f..80ca166a83 100644 --- a/frappe/public/less/mixins.less +++ b/frappe/public/less/mixins.less @@ -21,18 +21,18 @@ display: inline-block; speak: none; color: @breadcrumb-divider-color; - font-size: 14px; + font-size: 24px; transition: 0.2s; position: relative; - top: 1px; + top: 3px; } .breadcrumb-divider-left() { - content: "\f053" !important; + content: "\f104" !important; margin-right: 5px !important; } .breadcrumb-divider-right() { - content: "\f054"; + content: "\f105"; margin-right: 15px; } diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less index d960b2dabd..4a07c62f35 100644 --- a/frappe/public/less/navbar.less +++ b/frappe/public/less/navbar.less @@ -99,6 +99,6 @@ } #navbar-breadcrumbs > li > a { - padding: 10px 15px 10px 0px; + padding: 6px 15px 10px 0px; }