From eab356233cd312795e2a469c73ce84451e0c5e3b Mon Sep 17 00:00:00 2001
From: Min Zeya Phyo <zeya@code2lab.co>
Date: Sat, 3 Jun 2017 15:04:53 +0630
Subject: [PATCH] add new model - shop - it will be use to define what is setup

---
 app/assets/stylesheets/application.scss | 25 ++++++++++++++++++++++++-
 app/views/layouts/application.html.erb  |  1 -
 config/application.rb                   |  3 +++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 7aa6d6c5..9456be10 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,6 +9,29 @@
 //   padding-top: 4.5rem;
 // }
 
+.setting_nav{
+	background-color: #2f5663;
+}
+
+ul.navbar-nav li a{
+	text-decoration :none;
+	color :#e6e6e6;
+}
+
+ul.dropdown-menu li a{
+	text-decoration :none;
+	color :#525252;
+}
+
+.setting_breadcrumb{
+	background-color: transparent !important;
+	margin-bottom: 0px !important;
+}
+.page-header{
+	border-bottom :0px solid #000 !important;
+	margin :0px !important;
+}
+
 /*----- Order Processing Items -----*/
 .opi_ul {
   display:block;
@@ -33,4 +56,4 @@
 
 /*----- Header Bar -----*/
 
-/*----- Header Bar -----*/
\ No newline at end of file
+/*----- Header Bar -----*/
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 44624a43..04d23403 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,7 +10,6 @@
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
diff --git a/config/application.rb b/config/application.rb
index 9ca67743..90f088bd 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,5 +14,8 @@ module SXRestaurants
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
 
+    # config.generators do |g|
+    #   g.orm :active_record, primary_key_type: :uuid
+    # end
   end
 end