git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

Browse Source
This commit is contained in:
Aung Myo
2017-10-19 18:21:45 +06:30
parent 0809965edf 264318966e
commit 575d1b0638
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/application.js
View File

@@ -16,6 +16,7 @@
//= require bootstrap/js/popper.min //= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min //= require bootstrap/js/bootstrap-material-design.min
//= require jquery_ujs //= require jquery_ujs
//= require jquery-confirm
//= require turbolinks //= require turbolinks
//= require cable //= require cable
//= require settings/processing_items //= require settings/processing_items

4
app/views/print_settings/index.html.erb
View File

@@ -10,7 +10,7 @@
</ol> </ol>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9"> <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
<div class="m-b-10 clearfix"> <div class="m-b-10 clearfix">
<%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> <%= link_to t("views.btn.new"),new_print_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div> </div>
@@ -59,7 +59,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<div class="body"> <div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod

4
app/views/settings/order_queue_stations/index.html.erb
View File

@@ -12,7 +12,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9"> <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
<div class="m-b-10 clearfix"> <div class="m-b-10 clearfix">
<%= link_to t("views.btn.new"),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> <%= link_to t("views.btn.new"),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div> </div>
@@ -56,7 +56,7 @@
<%= paginate @settings_order_queue_stations %> <%= paginate @settings_order_queue_stations %>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<div class="body"> <div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod