From add2c26722816101faf567de1ae9afd4a2769e15 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 3 Oct 2017 18:44:27 +0630
Subject: [PATCH] updating

---
 app/assets/stylesheets/BSBMaterial/style.css |  4 ++--
 app/assets/stylesheets/application.scss      | 16 ++++++++++++++++
 app/views/settings/zones/edit.html.erb       |  9 ++++++---
 app/views/settings/zones/index.html.erb      | 16 ++++++++++------
 app/views/settings/zones/new.html.erb        | 13 ++++++++++++-
 app/views/settings/zones/show.html.erb       |  8 ++++----
 6 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/BSBMaterial/style.css b/app/assets/stylesheets/BSBMaterial/style.css
index 638e41fc..8b5b3ffe 100644
--- a/app/assets/stylesheets/BSBMaterial/style.css
+++ b/app/assets/stylesheets/BSBMaterial/style.css
@@ -2363,7 +2363,7 @@
 
 /* General ===================================== */
 body {
-  background-color: #e9e9e9;
+  /*background-color: #e9e9e9;*/
   -moz-transition: all 0.5s;
   -o-transition: all 0.5s;
   -webkit-transition: all 0.5s;
@@ -5156,7 +5156,7 @@ fieldset[disabled] .form-control {
   -moz-border-radius: 0;
   -ms-border-radius: 0;
   border-radius: 0;
-  background-color: transparent;
+  /*background-color: transparent;*/
   font-size: 13px;
   margin-bottom: 10px; }
   .breadcrumb li a {
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index ab90685b..3a50565d 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -75,3 +75,19 @@ section.content {
   margin-bottom: 20px;
 }
 
+.checkbox label, label.checkbox-inline {
+  padding-left: 0;
+}
+
+.checkbox label input[type=checkbox], label.checkbox-inline input[type=checkbox] {
+  position: relative; 
+  left: 0; 
+  z-index: -1; 
+  width: 13px; 
+  height: 13px; 
+  margin: 5px 5px 0 0;
+  overflow: hidden;
+  pointer-events: none;
+  opacity: 1; 
+}
+
diff --git a/app/views/settings/zones/edit.html.erb b/app/views/settings/zones/edit.html.erb
index b9b19f7e..d6b60075 100644
--- a/app/views/settings/zones/edit.html.erb
+++ b/app/views/settings/zones/edit.html.erb
@@ -1,9 +1,12 @@
 <div class="span12">
 		<div class="page-header">
 		 <ul class="breadcrumb">
-		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_zones_path %>">Zones</a></li>
-		  	<li>Edit</li>
+		   	<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+  			<li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
+		  	<li class="breadcrumb-item active">Edit</li>
+		  	<span class="float-right">
+		    	<%= link_to 'Back', settings_zones_path %>
+		  	</span>
 		 </ul>
 		</div>
     <%= render 'form', settings_zone: @settings_zone %>
diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb
index cdbe1f80..05719080 100644
--- a/app/views/settings/zones/index.html.erb
+++ b/app/views/settings/zones/index.html.erb
@@ -1,16 +1,20 @@
 
 <div class="page-header">
  <ul class="breadcrumb">
-  <li><a href="<%= root_path %>">Home</a></li>
-  <li>Zones</li>
-  <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-primary btn-sm' %>
+  <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+  <li class="breadcrumb-item active">Zones</li>
+  <span class="float-right">
+    <%= link_to 'Back', dashboard_path %>
   </span>
  </ul>
 </div>
+<br />
 
-<br>
-<div class="card">
+<div class="m-b-10 clearfix">
+<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-outline-primary float-right' %>
+</div>
+
+<div class="card">    
   <table class="table table-striped">
     <thead>
       <tr>
diff --git a/app/views/settings/zones/new.html.erb b/app/views/settings/zones/new.html.erb
index 937bfd2f..69f2e11b 100644
--- a/app/views/settings/zones/new.html.erb
+++ b/app/views/settings/zones/new.html.erb
@@ -1,4 +1,15 @@
-<h1>New Settings Zone</h1>
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= root_path %>">Home</a></li>
+  <li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
+  <li class="breadcrumb-item active">Details</li>
+  <span class="float-right">
+    <%= link_to 'Back', settings_zones_path %>
+  </span>
+ </ul>
+</div>
+
+<h3>New Settings Zone</h3>
 
 <%= render 'form', settings_zone: @settings_zone %>
 
diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb
index 33e8487c..a7b2f4e9 100644
--- a/app/views/settings/zones/show.html.erb
+++ b/app/views/settings/zones/show.html.erb
@@ -1,9 +1,9 @@
 <div class="page-header">
  <ul class="breadcrumb">
-  <li><a href="<%= root_path %>">Home</a></li>
-  <li><a href="<%= settings_zones_path %>">Zones</a></li>
-  <li>Details</li>
-  <span style="float: right">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+  <li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
+  <li class="breadcrumb-item active">Details</li>
+  <span class="float-right">
     <%= link_to 'Back', settings_zones_path %>
   </span>
  </ul>