diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 6c5f0821..9c5fc64f 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -129,6 +129,7 @@ i.logout_icon{ @media screen and (max-width: 785px) { #setting{ display: none;} .menu-up{ display: none;} + .card-btn{padding: 0px 35px;} } @media screen and (max-width: 785px) { diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 3d2504d0..b9a3f0df 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -122,5 +122,9 @@ @media screen and (max-width: 785px) { .login_pwd{width: 90%;} .login_ent{width: 10%;} + // .card-btn{padding: 0px 35px;} + // .nav-tabs{padding: 0px 44px;} + .box{margin: unset;} + .mbl-btn-usrgp{width: 48%;} } diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 46ccccde..08e2e6c6 100755 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -135,8 +135,6 @@
0
CLR
<% end %> - - diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index f203bd44..407b5952 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -15,10 +15,10 @@ --> <%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %> - + - <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %> @@ -39,8 +39,8 @@ <% flash.each do |type, message| %> - <% - if type == "notice" + <% + if type == "notice" color = "alert-success" elsif type == "error" color = "alert-danger" @@ -49,11 +49,11 @@ else color = "bg-black" end %> - + - <% end %> + <% end %>
@@ -62,25 +62,25 @@

Version - 1.0.1 -

+

- <%= shop_detail.name %> + <%= shop_detail.name %>
-
-
-
+
+
+
-
+

-
+
1
@@ -103,14 +103,14 @@
ENT
-->
BACK
0
-
CLR
-
+
CLR
+
-
-
+
+
-
-
+
+
+ +
@@ -129,7 +129,7 @@
<% @employees.each do |employee| %> <%if employee.role == role %> -
+
<%if employee.image_path.present? %> @@ -138,20 +138,20 @@
<%= employee.name%>
- <% else %> + <% else %> - <% end %> + <% end %>
<% end %> <% end %> -
+
<% end %> <% end %> -
+
@@ -159,7 +159,7 @@ - - - -