Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

app/assets/stylesheets/CRM.scss

@@ -151,3 +151,9 @@ nav.pagination .page a:hover,
   text-decoration: none;
 
 }
+
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}

app/assets/stylesheets/OQS.scss

@@ -100,3 +100,8 @@ select.form-control {
   border-left:1px solid #fff;
 }
 
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}

app/assets/stylesheets/addorder.scss

@@ -158,3 +158,9 @@ section.content{
 .add_icon{
    cursor: pointer; 
 }
+
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}

app/assets/stylesheets/inventory_definitions.scss

@@ -275,3 +275,8 @@ tr.discount-item-row:hover {
   -moz-opacity: 1; /* mozilla */
 
 }
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}

app/assets/stylesheets/origami.scss

@@ -361,3 +361,9 @@ tr.discount-item-row:hover {
 }
 
 /* End Payment Page */
+
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}

app/views/settings/menu_categories/show.html.erb

@@ -45,7 +45,7 @@
             <td><%= @settings_menu_category.menu.name %></td>
             <td><%= @settings_menu_category.name  rescue "-" %></td>
             <td><%= @settings_menu_category.alt_name %></td>
-            <td><%= settings_menu_category.is_available rescue false%></td>
+            <td><%= @settings_menu_category.is_available rescue false%></td>
             <!-- <td><%= @settings_menu_category.order_by %></td> -->
             <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
             <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>