Skip to content

Commit aff93c4

Browse files
author
Mark
committed
fix font path
1 parent a889a68 commit aff93c4

File tree

7 files changed

+293
-70
lines changed

7 files changed

+293
-70
lines changed

api/public/assets-backend/app/languages/locale-en-us.json

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
"create_success_msg": "New user has been created.",
8585
"delete_success_msg": "Deleted a user.",
8686
"update_success_msg": "Updated a user.",
87+
"update_error_msg": "Error occurred when trying to update user.",
8788
"delete_before_msg": "This will only delete user with no orders. You cannot recover deleted user, do you wish to continue?",
8889
"delete_error_msg": "Error occurred when trying to delete user."
8990
},
@@ -99,6 +100,7 @@
99100
"create_success_msg": "New role has been created.",
100101
"delete_success_msg": "Deleted a role.",
101102
"update_success_msg": "Updated a role.",
103+
"update_error_msg": "Error occurred when trying to update role.",
102104
"delete_before_msg": "This will only delete role with no orders. You cannot recover deleted role, do you wish to continue?",
103105
"delete_error_msg": "Error occurred when trying to delete role."
104106
},
@@ -112,26 +114,12 @@
112114
"create_success_msg": "New media has been created.",
113115
"delete_success_msg": "Deleted a media.",
114116
"update_success_msg": "Updated a media.",
117+
"update_error_msg": "Error occurred when trying to update media.",
115118
"move_success_msg": "Moved a media.",
116119
"move_error_msg": "Error occurred when trying to move a media.",
117120
"delete_before_msg": "This will only delete media with no orders. You cannot recover deleted media, do you wish to continue?",
118121
"delete_error_msg": "Error occurred when trying to delete media."
119122
},
120-
"employee": {
121-
"employees": "Employees",
122-
"employee": "Employee",
123-
"add_a_employee": "Add a employee",
124-
"edit_employee": "Edit employee",
125-
"remove_employees": "Remove employees",
126-
"delete_employee": "Delete employee",
127-
"published_on": "Published on",
128-
"visibility": "Visibility",
129-
"create_success_msg": "New employee has been created.",
130-
"delete_success_msg": "Deleted a employee.",
131-
"update_success_msg": "Updated a employee.",
132-
"delete_before_msg": "This will only delete employee with no orders. You cannot recover deleted employee, do you wish to continue?",
133-
"delete_error_msg": "Error occurred when trying to delete employee."
134-
},
135123
"post": {
136124
"posts": "Posts",
137125
"post": "Post",
@@ -144,6 +132,7 @@
144132
"create_success_msg": "New post has been created.",
145133
"delete_success_msg": "Deleted a post.",
146134
"update_success_msg": "Updated a post.",
135+
"update_error_msg": "Error occurred when trying to update post.",
147136
"delete_before_msg": "This will only delete post with no orders. You cannot recover deleted post, do you wish to continue?",
148137
"delete_error_msg": "Error occurred when trying to delete post.",
149138
"category": {
@@ -251,60 +240,6 @@
251240
"delete_success_msg": "Deleted a address.",
252241
"update_success_msg": "Updated a address."
253242
},
254-
"category": {
255-
"categories": "Categories",
256-
"category": "Category",
257-
"add_a_category": "Add a category",
258-
"edit_category": "Edit category",
259-
"remove_categories": "Remove categories",
260-
"delete_category": "Delete category",
261-
"create_success_msg": "New category has been created.",
262-
"create_error_msg": "Error occurred when trying to create category.",
263-
"update_success_msg": "Updated a category.",
264-
"update_error_msg": "Error occurred when trying to update category.",
265-
"delete_success_msg": "Deleted a category.",
266-
"delete_before_msg": "This will only delete category with no orders. You cannot recover deleted category, do you wish to continue?",
267-
"delete_error_msg": "Error occurred when trying to delete category."
268-
},
269-
"setting": {
270-
"setting": "Setting",
271-
"general": {
272-
"general": "General",
273-
"store_details": "Store details",
274-
"store_name": "Store Name",
275-
"store_address": "Store Address",
276-
"store_country": "Store Country",
277-
"store_email": "Store Email",
278-
"store_phone": "Store Phone",
279-
"standards_and_formats": "Standards and formats",
280-
"weight_unit": "Weight unit"
281-
},
282-
"create_success_msg": "New setting has been created.",
283-
"update_success_msg": "Updated settings.",
284-
"update_error_msg": "Error occurred when trying to update setting..",
285-
"delete_success_msg": "Deleted a setting.",
286-
"delete_error_msg": "Error occurred when trying to delete setting.",
287-
"notification": {
288-
"notification": "Notification",
289-
"notifications": "Notifications",
290-
"edit_a_notification": "Edit a notification",
291-
"update_success_msg": "Updated notifications.",
292-
"update_error_msg": "Error occurred when trying to update notifications."
293-
}
294-
},
295-
"sample": {
296-
"samples": "Samples",
297-
"sample": "Sample",
298-
"add_a_sample": "Add a sample",
299-
"edit_sample": "Edit sample",
300-
"remove_samples": "Remove samples",
301-
"delete_sample": "Delete sample",
302-
"create_success_msg": "New sample has been created.",
303-
"update_success_msg": "Updated a sample.",
304-
"delete_success_msg": "Deleted a sample.",
305-
"delete_before_msg": "This will only delete sample with no orders. You cannot recover deleted sample, do you wish to continue?",
306-
"delete_error_msg": "Error occurred when trying to delete sample."
307-
},
308243
"button": {
309244
"submit": "Save",
310245
"cancel": "Cancel",

backend/src/app/index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* The list of variables are listed here bower_components/bootstrap/less/variables.less
1111
*/
1212

13-
@icon-font-path: '../../bower_components/bootstrap/fonts/';
13+
@icon-font-path: "../assets/fonts/";
1414
@fa-font-path: "../assets/fonts/";
1515

1616
.browsehappy {
19.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)