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

fixed conflic app.css

Browse Source
This commit is contained in:
Aung Myo
2017-10-13 15:58:06 +06:30
parent ae482b91f9 9a761e5402
commit 37d84c5361
11 changed files with 167 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -99,7 +99,7 @@ ruby 2.4.1p111
> BUTTON > BUTTON
1. Submit/Add/Edit/Confirm buttons => btn-primary 1. Submit/Add/Edit/Confirm buttons => btn-primary (theme color)
2. Show/Detail Buttons => btn-info 2. Show/Detail Buttons => btn-info
3. Delete => btn-delete 3. Delete => btn-delete
4. Cancel/Back => btn-default 4. Cancel/Back => btn-default

2
app/assets/javascripts/BSBMaterial/demo.js
View File

@@ -78,7 +78,7 @@ function activateNotificationAndTasksScroll() {
} }
//Google Analiytics ====================================================================================== //Google Analiytics ======================================================================================
addLoadEvent(loadTracking); // addLoadEvent(loadTracking);
var trackingId = 'UA-30038099-6'; var trackingId = 'UA-30038099-6';
function addLoadEvent(func) { function addLoadEvent(func) {

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

@@ -62,6 +62,7 @@ $(document).on('turbolinks:load', function() {
$(function(){ $(function(){
$('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
$('#custom-slimscroll').slimScroll({ $('#custom-slimscroll').slimScroll({

16
app/assets/stylesheets/BSBMaterial/style.css
View File

@@ -7445,6 +7445,22 @@ fieldset[disabled] .form-control {
margin-right: 7px; margin-right: 7px;
margin-top: 2px; margin-top: 2px;
font-size: 20px; } font-size: 20px; }
.dropdown-menu > li > span > div.switch {
padding: 7px 18px;
color: #666;
-moz-transition: all 0.5s;
-o-transition: all 0.5s;
-webkit-transition: all 0.5s;
transition: all 0.5s;
font-size: 14px;
line-height: 25px; }
.dropdown-menu > li > span > div.switch:hover {
background-color: rgba(0, 0, 0, 0.075); }
.dropdown-menu > li > span > div.switch i.material-icons {
float: left;
margin-right: 7px;
margin-top: 2px;
font-size: 20px; }
.dropdown-animated { .dropdown-animated {
-webkit-animation-duration: .3s !important; -webkit-animation-duration: .3s !important;

9
app/assets/stylesheets/application.scss
View File

@@ -51,6 +51,10 @@
margin-top: 0px !important; margin-top: 0px !important;
} }
.switch label {
color: #070707 !important;
}
.ls-closed .bars:after, .ls-closed .bars:before { .ls-closed .bars:after, .ls-closed .bars:before {
position: absolute; position: absolute;
top: 8px; top: 8px;
@@ -138,6 +142,11 @@ section.content {
.list-group-item{ .list-group-item{
padding:0.75rem 1rem; padding:0.75rem 1rem;
} }
.btn:not(.btn-link):not(.btn-circle) span {
position: relative;
top: 0px;
margin-left: 0px;
}
/* End Reset Theme */ /* End Reset Theme */
/* *************************************************** */ /* *************************************************** */

9
app/views/layouts/_header.html.erb
View File

@@ -26,6 +26,15 @@
<!-- <i class="material-icons">keyboard_arrow_down</i> --> <!-- <i class="material-icons">keyboard_arrow_down</i> -->
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<!-- For Translation
<li>
<div class="switch">
<label>
<input type="checkbox" id="localize">
မြန်မာ
</label>
</div>
</li> -->
<li> <li>
<%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %> <%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
<!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> --> <!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> -->

2
app/views/layouts/application.html.erb
View File

@@ -19,7 +19,7 @@
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="theme-blue"> <body class="theme-red">
<!-- Page Loader --> <!-- Page Loader -->
<div class="page-loader-wrapper"> <div class="page-loader-wrapper">
<div class="loader"> <div class="loader">

8
app/views/settings/zones/index.html.erb
View File

@@ -10,7 +10,7 @@
</div> </div>
<br> <br>
<div class="m-b-10 clearfix"> <div class="m-b-10 clearfix">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> <%= link_to t('.new', :default => t("views.btn.new")),new_settings_zone_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div> </div>
<div class="row"> <div class="row">
@@ -37,9 +37,9 @@
<td><%= settings_zone.created_by %></td> <td><%= settings_zone.created_by %></td>
<% end %> <% end %>
<td> <td>
<%= link_to 'Show', settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %> <%= link_to (t :show), settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %>
<%= link_to 'Edit', edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %> <%= link_to (t :edit), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %>
<%= link_to 'Destroy', settings_zone_path(settings_zone), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> <%= link_to (t :destroy), settings_zone_path(settings_zone), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
</td> </td>
</tr> </tr>
<% end %> <% end %>

2
config/application.rb
View File

@@ -13,7 +13,7 @@ module SXRestaurants
# Settings in config/environments/* take precedence over those specified here. # Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers # Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded. # -- all .rb files in that directory are automatically loaded.
config.i18n.default_locale = :'en' config.i18n.default_locale = :'mm' # English 'en'
config.active_record.time_zone_aware_types = [:datetime, :time] config.active_record.time_zone_aware_types = [:datetime, :time]
config.active_job.queue_adapter = :sidekiq config.active_job.queue_adapter = :sidekiq

62
config/locales/en.yml
View File

@@ -25,8 +25,70 @@ en:
top: "Top" top: "Top"
orders: "Orders" orders: "Orders"
credit: "Credit" credit: "Credit"
home: "Home"
simple_menu_item: "Simple Menu Item"
set_menu_item: "Set Menu Item"
table: "Table"
room: "Room"
item_set: "Item Set"
category: "Category"
processed: "Processed"
competed: "Completed"
views: views:
btn:
create: "Create"
new: "New"
add: "Add"
edit: "Edit"
update: "Update"
cancel: "Cancel"
back: "Back"
show: "Show"
remove: "Remove"
delete: "Delete"
destroy: "Destroy"
submit: "Submit"
reset: "Reset"
search: "Search"
enter: "Enter"
clear: "Clear"
finish: "Finish"
filter: "Filter"
del: "DEL"
clr: "CLR"
print_order_summary: "Print Order Summary"
memeber_card: "Member Card"
qr_code: "QR Code"
cash_in: "CASH IN"
cash_out: "CASH OUT"
close_cashier: "CLOSE CASHIER"
add_order: "ADD ORDER"
customer: "CUSTOMER"
discount: "DISCOUNT"
charges: "CHARGES"
commissions: "COMMISSIONS"
in_duties: "IN DUTIES"
move: "MOVE"
req_bill: "REQ BILL"
first_bill: "FIRST BILL"
pay: "PAY"
void: "VOID"
foc: "FOC"
nett: "NETT"
cash: "CASH"
credit: "CREDIT"
other_payment: "Other Payment"
percentage: "PERCENTAGE"
remove_item_dis: "REMOVE ITEM DISCOUNT"
remove_all: "REMOVE ALL"
new_stock_taking: "NEW STOCK TAKING"
stock_check_report: "STOCK CHECK REPORT"
new_inventory_product: "NEW INVENTORY PRODUCT"
generate_report: "GENERATE REPORT"
exp_to_excel: "EXPORT TO EXCEL"
pagination: pagination:
first: "&laquo; First" first: "&laquo; First"
last: "Last &raquo;" last: "Last &raquo;"

62
config/locales/mm.yml
View File

@@ -25,8 +25,70 @@ mm:
top: "အရောင်းရဆုံး" top: "အရောင်းရဆုံး"
orders: "အော်ဒါများ" orders: "အော်ဒါများ"
credit: "အကြွေး" credit: "အကြွေး"
home: "Home"
simple_menu_item: "Simple Menu Item"
set_menu_item: "Set Menu Item"
table: "Table"
room: "Room"
item_set: "Item Set"
category: "Category"
processed: "Processed"
competed: "Completed"
views: views:
btn:
create: "Create"
new: "New"
add: "Add"
edit: "Edit"
update: "Update"
cancel: "Cancel"
back: "Back"
show: "Show"
remove: "Remove"
delete: "Delete"
destroy: "Destroy"
submit: "Submit"
reset: "Reset"
search: "Search"
enter: "Enter"
clear: "Clear"
finish: "Finish"
filter: "Filter"
del: "DEL"
clr: "CLR"
print_order_summary: "Print Order Summary"
memeber_card: "Member Card"
qr_code: "QR Code"
cash_in: "CASH IN"
cash_out: "CASH OUT"
close_cashier: "CLOSE CASHIER"
add_order: "ADD ORDER"
customer: "CUSTOMER"
discount: "DISCOUNT"
charges: "CHARGES"
commissions: "COMMISSIONS"
in_duties: "IN DUTIES"
move: "MOVE"
req_bill: "REQ BILL"
first_bill: "FIRST BILL"
pay: "PAY"
void: "VOID"
foc: "FOC"
nett: "NETT"
cash: "CASH"
credit: "CREDIT"
other_payment: "Other Payment"
percentage: "PERCENTAGE"
remove_item_dis: "REMOVE ITEM DISCOUNT"
remove_all: "REMOVE ALL"
new_stock_taking: "NEW STOCK TAKING"
stock_check_report: "STOCK CHECK REPORT"
new_inventory_product: "NEW INVENTORY PRODUCT"
generate_report: "GENERATE REPORT"
exp_to_excel: "EXPORT TO EXCEL"
pagination: pagination:
first: "&laquo; ပထမ" first: "&laquo; ပထမ"
last: "အဆံုး &raquo;" last: "အဆံုး &raquo;"