Merge branch 'r-1902001-01' into foodcourt

2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
    <div class="row clearfix">
        <!-- Column One -->
        <div class="col-lg-10 col-md-10 col-sm-10">
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-fluid m-top-100">
  <div class="row">
  <!-- Column One -->
    <div class="col-lg-5 col-md-5 col-sm-5">