diff --git a/app/assets/images/SX-logo.png b/app/assets/images/SX-logo.png new file mode 100644 index 00000000..6c1a1437 Binary files /dev/null and b/app/assets/images/SX-logo.png differ diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 1338f196..4fdf37bc 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -3,14 +3,33 @@ @import "animate-css/animate"; @import "BSBMaterial/style"; +.login_dashboard{ + background-color: #2790a5; +} + .login-page { margin: 1% auto; + background-color: #2790a5; } .form-group { margin-bottom: 15px; } +.emp-body{ + cursor: pointer; + margin-bottom: 0px !important; + margin-top:5px !important; +} +.emp-body .body{ + padding: 15px 5px; + text-align: center; + border-radius: 3px; +} +.empBtn{ + margin-top: -10px; +} + .padding-10 { padding: 10px; } diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 030eea4a..6c9d6ed2 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -4,8 +4,8 @@ class HomeController < ApplicationController def index @employees = Employee.all_emp_except_waiter.order("name asc") - @login_form = LoginForm.new() - render "layouts/login", layout: false + @login_form = LoginForm.new() + render "layouts/login_dashboard", layout: false end def show diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index 8e0df686..9af8fcac 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -151,7 +151,7 @@
- © <%= Time.now.strftime("%Y") %> Code2Lab - SX Restaurant. + © <%= Time.now.strftime("%Y") %> Code2Lab.
Version: 1.0.1 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7059543f..bf72ee3c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -38,12 +38,12 @@ <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - +
-