Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder

2017-08-17 09:54:55 +06:30
parent 865c2c5cdd 0eee1fd0af
commit d4d8961b87
19 changed files with 260 additions and 96 deletions
--- a/app/assets/stylesheets/settings.scss
+++ b/app/assets/stylesheets/settings.scss
@@ -56,4 +56,8 @@ ul.dropdown-menu li a{
 .menu-item-img {
 	margin: 10px;
 	text-align: center;
+ }
+
+ .padding-10 {
+ 	padding: 10px;
 }