diff --git a/app/assets/images/SX-Logo-small.png b/app/assets/images/SX-Logo-small.png new file mode 100644 index 00000000..be14a5c9 Binary files /dev/null and b/app/assets/images/SX-Logo-small.png differ diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 4fdf37bc..29ef2e6e 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -8,10 +8,18 @@ } .login-page { - margin: 1% auto; + margin: 0% auto; background-color: #2790a5; } +.login-page .login-box .logo small { + display: block; + width: 100%; + text-align: center; + color: #000; + margin-top: -5px; +} + .form-group { margin-bottom: 15px; } diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 91d0a7bb..2bf4c073 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -16,7 +16,7 @@ - Logo + Logo SX Restaurant diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 5644ef74..e5836701 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -58,9 +58,11 @@
-
diff --git a/config/locales/en.yml b/config/locales/en.yml index 39bd8303..8e5f1c99 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,13 +10,15 @@ en: transactions: "Transactions" reports: "Reports" zones: "Zones" + dinings: "Dinings" menu: "Menu" cashier: "Cashier" terminal: "Terminal" print: "Print" staff: "Staff" - product: "Product" - promotion: "Promotion" + products: "Products" + promotions: "Promotions" + printer: "Printer" views: diff --git a/config/locales/mm.yml b/config/locales/mm.yml index a4c1c1bb..6013c33e 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -19,6 +19,8 @@ mm: products: "Products" promotions: "Promotions" printer: "Printer" + + views: pagination: first: "« ပထမ"