From b379bf88ae1c949ba2b6fbc6f22e6f7e9840314a Mon Sep 17 00:00:00 2001 From: Zach Effman Date: Fri, 26 Feb 2016 16:02:46 -0500 Subject: [PATCH] Fix UI issues Closes #1492 - Change big-numbers mixin so font does not overflow table - Adjust equipment_model show table columns to align better - Add table_woo to CSS formatting to center rows vertically - Left-align checkbox when resetting ToS --- app/assets/stylesheets/_mixins.scss | 2 +- app/assets/stylesheets/app_configs/_edit.css.scss | 1 + app/assets/stylesheets/application.css.scss | 1 + app/assets/stylesheets/equipment_models/_table.scss | 2 +- app/views/equipment_models/show.html.erb | 6 +++--- 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 app/assets/stylesheets/app_configs/_edit.css.scss diff --git a/app/assets/stylesheets/_mixins.scss b/app/assets/stylesheets/_mixins.scss index 713a573a3..1a2c89bc3 100644 --- a/app/assets/stylesheets/_mixins.scss +++ b/app/assets/stylesheets/_mixins.scss @@ -1,5 +1,5 @@ @mixin giant-number { - font-size: $font-size-base * 3; + font-size: $font-size-base * 2.5; } @mixin placeholder-extended ($color: $placeholderText, $font-style: italic){ diff --git a/app/assets/stylesheets/app_configs/_edit.css.scss b/app/assets/stylesheets/app_configs/_edit.css.scss new file mode 100644 index 000000000..dcd3b6b0e --- /dev/null +++ b/app/assets/stylesheets/app_configs/_edit.css.scss @@ -0,0 +1 @@ +#app_config_reset_tos_for_users { width: auto; } \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 718973eca..e39dcf344 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -56,3 +56,4 @@ @import "users/*"; @import "equipment_models/*"; @import "blackouts/*"; +@import "app_configs/*"; diff --git a/app/assets/stylesheets/equipment_models/_table.scss b/app/assets/stylesheets/equipment_models/_table.scss index 2d7f1bc49..348abb817 100644 --- a/app/assets/stylesheets/equipment_models/_table.scss +++ b/app/assets/stylesheets/equipment_models/_table.scss @@ -1,4 +1,4 @@ -#table_equipment_models { +#table_equipment_models, #table_woo { th, td { vertical-align: middle; } diff --git a/app/views/equipment_models/show.html.erb b/app/views/equipment_models/show.html.erb index 50feea4c3..b27324a97 100644 --- a/app/views/equipment_models/show.html.erb +++ b/app/views/equipment_models/show.html.erb @@ -94,10 +94,10 @@

Details


-
+

Late Fee

- <%= number_to_currency @equipment_model.late_fee %> / day + <%= number_to_currency @equipment_model.late_fee %>/day
@@ -106,7 +106,7 @@ <%= number_to_currency @equipment_model.replacement_fee %>
-
+

Max. Per User

<%= intify @equipment_model.maximum_per_user %>