Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

2019-05-30 14:01:03 +06:30
parent 453435f8fa c02305e386
commit 0016318611
9 changed files with 107 additions and 69 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -129,6 +129,7 @@ i.logout_icon{
@media screen and (max-width: 785px) {
  #setting{ display: none;}
  .menu-up{ display: none;}
+  .card-btn{padding: 0px 35px;}
 }

@media screen and (max-width: 785px) {
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -122,5 +122,9 @@
@media screen and (max-width: 785px) {
  .login_pwd{width: 90%;}
  .login_ent{width: 10%;}
+  // .card-btn{padding: 0px 35px;}
+  // .nav-tabs{padding: 0px 44px;}
+  .box{margin: unset;}
+  .mbl-btn-usrgp{width: 48%;}

 }