From 600a17b0f1a4212947547651220dea54155ee721 Mon Sep 17 00:00:00 2001 From: EikhantMon Date: Fri, 7 Sep 2018 13:40:25 +0630 Subject: [PATCH] login dashboard & origami css --- app/assets/stylesheets/login.scss | 11 ++++++++++- app/assets/stylesheets/origami.scss | 18 ++++++++++++++++++ app/views/layouts/login_dashboard.html.erb | 6 +++--- app/views/origami/payments/show.html.erb | 4 ++-- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index a1058d25..2a7b0b16 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -82,19 +82,24 @@ } .p-card{ - margin: 20px 0; + margin: 20px -8px; text-align: center; } .p-name{ + padding-left: 6px; + padding-right: 6px; padding-bottom: 20px; font-size: 14px; + weight : 30px; + height : 48px; } .style_image{ height : 138px; padding : 20px 0 20px 0; width : 70%; + opacity: 0.7; } .style_icon{ @@ -108,4 +113,8 @@ font-size: 21px; font-weight: bold; margin : 0 0 20px 0; +} + +.box { + margin : 0 -60px 0 -60px; } \ No newline at end of file diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 6d784645..dc60703c 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -524,4 +524,22 @@ nav.pagination .page a:hover, background-color:#ffab51; color:#fff; +} + + +/*----chane font_size (Amount Due && Balance)----*/ +#balance{ + height: 50%; + font-size: 20px; +} + +.amount_balance{ + height: 50%; + font-size: 20px; +} + + +#amount_due{ + height: 50%; + font-size: 20px; } \ No newline at end of file diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index 10d9def1..e7027c16 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -72,7 +72,7 @@ -
+
@@ -122,14 +122,14 @@ -
+
<% @roles.each do |role| %> <%if role != "administrator" %>
<% @employees.each do |employee| %> <%if employee.role == role %> -
+
<%if employee.image_path.present? %> diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 245467f9..c182e5a5 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -166,7 +166,7 @@
-
Amount Due <% if !@sale_payment.nil? %>( Credit )<% end %>
+
Amount Due <% if !@sale_payment.nil? %>( Credit )<% end %>
-
Balance
+
Balance
<%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>