Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for Rollup (#12924)

Browse Source 
* Changes for rollup

* remove variables.less
This commit is contained in:
Faris Ansari 2018-02-20 14:21:50 +05:30 committed by GitHub
parent e2558308f6
commit 7c744acc49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/build.json
View File

@ -1,6 +1,6 @@
{ {
"css/erpnext.css": [ "css/erpnext.css": [
"public/css/erpnext.css" "public/less/erpnext.less"
], ],
"js/erpnext-web.min.js": [ "js/erpnext-web.min.js": [
"public/js/website_utils.js", "public/js/website_utils.js",

2
erpnext/public/js/shopping_cart.js
View File

@ -64,7 +64,7 @@ $.extend(shopping_cart, {
}, },
set_cart_count: function() { set_cart_count: function() {
var cart_count = getCookie("cart_count"); var cart_count = frappe.get_cookie("cart_count");
if(frappe.session.user==="Guest") { if(frappe.session.user==="Guest") {
cart_count = 0; cart_count = 0;
} }

2
erpnext/public/less/erpnext.less
View File

@ -1,4 +1,4 @@
@import "../../../../frappe/frappe/public/less/variables.less"; @import "variables.less";
.erpnext-footer { .erpnext-footer {
margin: 11px auto; margin: 11px auto;

4
erpnext/templates/includes/projects/project_search_box.html
View File

@ -11,8 +11,8 @@
<script> <script>
frappe.ready(function() { frappe.ready(function() {
if(get_url_arg("q")){ if(frappe.utils.get_url_arg("q")){
var txt = get_url_arg("q"); var txt = frappe.utils.get_url_arg("q");
$(".project-search-results").html("Search results for : " + encodeURIComponent(txt)); $(".project-search-results").html("Search results for : " + encodeURIComponent(txt));
$(".clear").toggle(true); $(".clear").toggle(true);
} }

2
erpnext/templates/pages/product_search.html
View File

@ -9,7 +9,7 @@
<script> <script>
frappe.ready(function() { frappe.ready(function() {
var txt = get_url_arg("search"); var txt = frappe.utils.get_url_arg("search");
$(".search-results").html("{{ _('Search results for') }}: " + encodeURIComponent(txt)); $(".search-results").html("{{ _('Search results for') }}: " + encodeURIComponent(txt));
window.search = txt; window.search = txt;
window.start = 0; window.start = 0;