remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30
parent c124a5fb77 a59d692569
commit 9f6505fd95
65 changed files with 415 additions and 57 deletions
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -134,7 +134,7 @@ select.form-control {
 }

 .credit-color{
-	background-color:#FF5722;
+	background-color:#FFA500;
 }

 .other-payment-color{
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -68,6 +68,15 @@
  background-color: #ccc;
 }

+/*Shop Info color in navbar*/
+.shopinfo {
+  color: #212529;
+}
+
+.link-buttoon {
+  text-decoration: none;
+}
+
@media (min-width: 768px){
  .dropdown-menu {
      padding: .3rem 0;