From 6066eb2a4fcf3d7a20e8055a81a749c277567b93 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Oct 2017 12:22:05 +0630 Subject: [PATCH] update tab and select --- app/assets/javascripts/application.js | 6 +- app/assets/stylesheets/application.scss | 41 ++++++- app/views/crm/customers/show.html.erb | 15 ++- app/views/origami/home/show.html.erb | 148 ++++++++++++------------ app/views/origami/rooms/show.html.erb | 2 +- 5 files changed, 117 insertions(+), 95 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b5511d6e..ae6d1c12 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -21,6 +21,7 @@ //= require settings/processing_items //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker +//= require bootstrap/js/bootstrap.js //= require multi-select/js/jquery.multi-select.js //= require jquery-slimscroll/jquery.slimscroll.js //= require node-waves/waves.js @@ -58,11 +59,6 @@ $(document).on('turbolinks:load', function() { }); - // Material Select Initialization - $(document).ready(function() { - $('.mdb-select').material_select(); - }); - $(function(){ $('body').bootstrapMaterialDesign(); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d40e3c86..43839a2b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -5,7 +5,6 @@ @import "sweetalert/sweetalert.css"; @import "multi-select/css/multi-select.css"; @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker"; - @import "morrisjs/morris"; @import "fileinput.min"; @import "BSBMaterial/style"; @@ -81,10 +80,6 @@ section.content { top: 50px; } -.nav-tabs li a.active { - color: #000 !important; -} - .info-box { margin-bottom: 20px; } @@ -148,7 +143,43 @@ section.content { top: 0px; margin-left: 0px; } +.nav { + padding-left: 0; + margin-bottom: 0; + list-style: none; +} +.nav > li > a { + position: relative; + display: block; + padding: 10px 15px; +} + +.nav-tabs > li { + float: left; + margin-bottom: -1px; +} + +.nav-tabs li a.active { + color: #000 !important; + border-bottom: 2px solid #2196F3 !important; +} + +.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { + color: #555; + cursor: default; + background-color: #fff; + border: 1px solid #ddd; + border-bottom-color: transparent; +} +.nav-tabs > li > a { + margin-right: 2px; + line-height: 1.42857143; + text-decoration:none; +} +.nav-tabs .nav-link { + padding: 0.7286em .8575em; +} /* End Reset Theme */ /* *************************************************** */ diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index c07e0830..4527f7cf 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -1,18 +1,17 @@
- -
    + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index d3774135..3f48ac92 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -2,13 +2,10 @@
    - -
    -
    - - -
    -
    - <% @complete.each do |sale| %> -
    -
    - <%= sale.receipt_no %> - <%= sale.sale_status %> +
    + +
    +
    + <% @complete.each do |sale| %> +
    +
    + <%= sale.receipt_no %> + <%= sale.sale_status %> +
    -
    - <% end %> + <% end %> +
    -
    - -
    -
    - <% @tables.each do |table| %> - <% if table.status == 'occupied' %> + +
    +
    + <% @tables.each do |table| %> + <% if table.status == 'occupied' %> - <% if table.get_booking.nil? %> -
    -
    - <%= table.name %> - billed -
    + <% if table.get_booking.nil? %> +
    +
    + <%= table.name %> + billed +
    +
    -
    - <% else %> -
    -
    - <%= table.name %> - new + <% else %> +
    +
    + <%= table.name %> + new +
    + <% end %> + <% else %> +
    +
    + <%= table.name %> + new
    - <% end %> - <% else %> -
    -
    - <%= table.name %> - new
    -
    - <% end %> - <% end %> + <% end %> + <% end %> +
    -
    - -
    -
    - <% @rooms.each do |room| %> - <% if room.status == 'occupied' %> + +
    +
    + <% @rooms.each do |room| %> + <% if room.status == 'occupied' %> -
    -
    - <%= room.name %> - <% if room.get_booking.nil? %> - billed - <% else %> - new - <% end %> +
    +
    + <%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %> +
    -
    - <% else %> -
    -
    - <%= room.name %> - + <% else %> +
    +
    + <%= room.name %> + +
    -
    - <% end %> - <% end %> + <% end %> + <% end %> +
    -
    - -
    -
    - <% @orders.each do |order| %> -
    -
    - <%= order.order_id %> + +
    +
    + <% @orders.each do |order| %> +
    +
    + <%= order.order_id %> +
    -
    - <% end %> + <% end %> +
    -
    diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index d04ab835..5128e6f5 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -20,7 +20,7 @@
-
+