From 89c6228c318cc4c228174ee1b3340ef3988b1010 Mon Sep 17 00:00:00 2001
From: PhyoTheingi <phyo.theingi@code2lab.com>
Date: Thu, 1 Jun 2017 17:10:04 +0630
Subject: [PATCH] UI phrase 1

---
 app/assets/stylesheets/settings.scss   | 32 ++++++++++++++++++++++++++
 app/views/layouts/_header.html.erb     |  8 +++----
 app/views/layouts/application.html.erb |  1 +
 config/initializers/assets.rb          |  2 ++
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/stylesheets/settings.scss

diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss
new file mode 100644
index 00000000..37064f07
--- /dev/null
+++ b/app/assets/stylesheets/settings.scss
@@ -0,0 +1,32 @@
+@import "bootstrap";
+@import "font-awesome";
+@import "theme";
+
+/* Show it is fixed to the top */
+// body {
+//   min-height: 75rem;
+//   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;
+}
\ No newline at end of file
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index b73cc5ae..47c10ac9 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,8 +1,8 @@
-<nav class="navbar navbar-toggleable-md fixed-top navbar-light">
+<nav class="navbar navbar-toggleable-md fixed-top navbar-light setting_nav">
    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
      <span class="navbar-toggler-icon"></span>
    </button>
-   <a class="navbar-brand" href="#">H</a>
+   <a class="navbar-brand" href="#" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
    <div class="collapse navbar-collapse" id="navbarCollapse">
      <ul class="navbar-nav mr-auto">
         <li class="navbar-nav mr-auto dropdown">
@@ -24,7 +24,7 @@
         </li>
 
         <li class="navbar-nav mr-auto dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Transactions</a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Transactions</a>
           <ul class="dropdown-menu">
             <li><%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
@@ -39,7 +39,7 @@
    <% if current_login_employee %>
      <div class="right">
           <ul class="navbar-nav mr-auto">
-            <li><%= current_login_employee.name %> </li>
+            <li style="color: #959595"><%= current_login_employee.name %> </li>
             <li style="padding-right:10px;padding-left:10px"> | </li>
             <li ><%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
             </li>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 04d23403..44624a43 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,6 +10,7 @@
     <%= 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/initializers/assets.rb b/config/initializers/assets.rb
index 25035088..6f563b42 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -16,3 +16,5 @@ Rails.application.config.assets.precompile += %w( orgiami.js )
 # -- Order Queue Station -----
 Rails.application.config.assets.precompile += %w( OQS.css )
 Rails.application.config.assets.precompile += %w( OQS.js ) 
+
+Rails.application.config.assets.precompile += %w( settings.css )