Przeglądaj źródła

[design] desktop padding and fixed listing new

version-14
Anand Doshi 10 lat temu
rodzic
commit
f23bdfe2d2
8 zmienionych plików z 15 dodań i 16 usunięć
  1. +1
    -1
      frappe/core/page/desktop/desktop_icon_grid.html
  2. +0
    -1
      frappe/public/css/desktop.css
  3. +4
    -4
      frappe/public/css/mobile.css
  4. +4
    -4
      frappe/public/css/navbar.css
  5. +1
    -0
      frappe/public/js/frappe/ui/listing.js
  6. +0
    -1
      frappe/public/less/desktop.less
  7. +4
    -4
      frappe/public/less/mixins.less
  8. +1
    -1
      frappe/public/less/navbar.less

+ 1
- 1
frappe/core/page/desktop/desktop_icon_grid.html Wyświetl plik

@@ -1,4 +1,4 @@
<div style="background: none; text-align: center; margin: 0px auto;">
<div style="text-align: center; padding-top: calc(40px + 4%)">
<div id="icon-grid"> <div id="icon-grid">
{% for (var i=0, l=desktop_items.length; i < l; i++) { {% for (var i=0, l=desktop_items.length; i < l; i++) {
var module = frappe.get_module(desktop_items[i]); var module = frappe.get_module(desktop_items[i]);


+ 0
- 1
frappe/public/css/desktop.css Wyświetl plik

@@ -5,7 +5,6 @@ body[data-route="desktop"] .navbar-default {
} }
#page-desktop { #page-desktop {
min-width: 100%; min-width: 100%;
padding-top: calc(55px);
margin-top: 0px; margin-top: 0px;
border: 0px; border: 0px;
position: absolute; position: absolute;


+ 4
- 4
frappe/public/css/mobile.css Wyświetl plik

@@ -103,11 +103,11 @@
display: inline-block; display: inline-block;
speak: none; speak: none;
color: #c0c9d2; color: #c0c9d2;
font-size: 14px;
font-size: 24px;
transition: 0.2s; transition: 0.2s;
position: relative; position: relative;
top: 1px;
content: "\f053" !important;
top: 3px;
content: "\f104" !important;
margin-right: 5px !important; margin-right: 5px !important;
} }
body[data-route^="Module"] .navbar .navbar-home:hover:before, body[data-route^="Module"] .navbar .navbar-home:hover:before,
@@ -125,7 +125,7 @@
vertical-align: middle; vertical-align: middle;
} }
#navbar-breadcrumbs > li > a:before { #navbar-breadcrumbs > li > a:before {
content: "\f053" !important;
content: "\f104" !important;
margin-right: 5px !important; margin-right: 5px !important;
} }
#navbar-breadcrumbs li:not(:nth-last-child(-n+1)) { #navbar-breadcrumbs li:not(:nth-last-child(-n+1)) {


+ 4
- 4
frappe/public/css/navbar.css Wyświetl plik

@@ -73,11 +73,11 @@
display: inline-block; display: inline-block;
speak: none; speak: none;
color: #c0c9d2; color: #c0c9d2;
font-size: 14px;
font-size: 24px;
transition: 0.2s; transition: 0.2s;
position: relative; position: relative;
top: 1px;
content: "\f054";
top: 3px;
content: "\f105";
margin-right: 15px; margin-right: 15px;
} }
#navbar-breadcrumbs > li > a:hover:before, #navbar-breadcrumbs > li > a:hover:before,
@@ -86,5 +86,5 @@
color: #36414c; color: #36414c;
} }
#navbar-breadcrumbs > li > a { #navbar-breadcrumbs > li > a {
padding: 10px 15px 10px 0px;
padding: 6px 15px 10px 0px;
} }

+ 1
- 0
frappe/public/js/frappe/ui/listing.js Wyświetl plik

@@ -116,6 +116,7 @@ frappe.ui.Listing = Class.extend({
}, },


set_primary_action: function() { set_primary_action: function() {
var me = this;
if(this.new_doctype) { if(this.new_doctype) {
var make_new_doc = function() { (me.custom_new_doc || me.make_new_doc).apply(me, [me.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"); this.page.set_primary_action(__("New"), function() { make_new_doc(); }, "octicon octicon-plus");


+ 0
- 1
frappe/public/less/desktop.less Wyświetl plik

@@ -10,7 +10,6 @@ body[data-route=""] .navbar-default, body[data-route="desktop"] .navbar-default


#page-desktop { #page-desktop {
min-width: 100%; min-width: 100%;
padding-top: calc(40px + 15%);
margin-top: 0px; margin-top: 0px;
border: 0px; border: 0px;
position: absolute; position: absolute;


+ 4
- 4
frappe/public/less/mixins.less Wyświetl plik

@@ -21,18 +21,18 @@
display: inline-block; display: inline-block;
speak: none; speak: none;
color: @breadcrumb-divider-color; color: @breadcrumb-divider-color;
font-size: 14px;
font-size: 24px;
transition: 0.2s; transition: 0.2s;
position: relative; position: relative;
top: 1px;
top: 3px;
} }


.breadcrumb-divider-left() { .breadcrumb-divider-left() {
content: "\f053" !important;
content: "\f104" !important;
margin-right: 5px !important; margin-right: 5px !important;
} }


.breadcrumb-divider-right() { .breadcrumb-divider-right() {
content: "\f054";
content: "\f105";
margin-right: 15px; margin-right: 15px;
} }

+ 1
- 1
frappe/public/less/navbar.less Wyświetl plik

@@ -99,6 +99,6 @@
} }


#navbar-breadcrumbs > li > a { #navbar-breadcrumbs > li > a {
padding: 10px 15px 10px 0px;
padding: 6px 15px 10px 0px;
} }



Ładowanie…
Anuluj
Zapisz