fixed confilt

2020-03-20 16:19:13 +06:30
parent dce2441b9a 1c88f722e6
commit 3a0a899458
17 changed files with 1119 additions and 345 deletions
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -311,7 +311,7 @@ i.logout_icon{
  text-align:center;
  font-weight:900;
  color:#fff;
-  font-size:1.5em;
+  font-size:1.2em;
  margin:auto;
 }
 .custom-card-no-img-head{
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -27,6 +27,14 @@ table.fixed-header {
  }
 }

+.bg-gray {
+  background-color: #D7D7D7;
+}
+
+.box-shadow-none {
+  box-shadow: none !important;
+}
+
 .material-icons {
  font-family: 'Material Icons';
  font-weight: normal;