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

2020-06-08 15:48:13 +06:30
parent 7a09ed0108 f9db23b500
commit 62fb440850
65 changed files with 2049 additions and 1842 deletions
--- a/app/assets/stylesheets/BSBMaterial/style.css
+++ b/app/assets/stylesheets/BSBMaterial/style.css
@@ -11,7 +11,7 @@
  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
  border: none;
  position: fixed;
-  top: 0;
+  /*top: 0;*/
  left: 0;
  z-index: 12;
  width: 100%; }
@@ -6649,7 +6649,7 @@ fieldset[disabled] .form-control {
  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
  border: none;
  position: fixed;
-  top: 0;
+  /*top: 0;*/
  left: 0;
  z-index: 12;
  width: 100%; }