diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 71a9915e..d3bb6ec8 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -52,6 +52,19 @@ background:#A9F5F2; } +.action-btn { + height: 60px; + margin-bottom: 5px; +} + +.bottom-5 { + margin-bottom: 5px; +} + +.fluid { + width: 100%; +} + .long{ width:49%; } diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 56fe5c98..2a063007 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -1,7 +1,6 @@
-
@@ -84,7 +83,7 @@
-
Overall Discount
+
Discount Control
@@ -100,95 +99,89 @@
--> -
-
+
+
-
- <% - @accounts.each do |acc| - %> +
+ <% + @accounts.each do |acc| + %> - <% end %> + <% end %>
-
-
-
- - -
-
+

-
-
-
-
5%
-
-
-
-
1
-
2
-
3
-
-
-
+
+
+
+
+
5%
+
+
+
1
+
2
+
3
+
+
-
-
-
10%
-
-
-
-
4
-
5
-
6
-
-
-
+
+
+
10%
+
+
+
4
+
5
+
6
+
+
-
-
-
20%
-
-
-
-
7
-
8
-
9
-
-
-
+
+
+
20%
+
+
+
7
+
8
+
9
+
+
-
-
-
30%
-
-
-
-
0
-
.
-
00
-
-
-
+
+
+
30%
+
+
+
0
+
.
+
00
+
+
-
-
-
50%
-
-
-
-
-
DEL
-
CLR
-
-
-
-
+
+
+
50%
+
+
+
+
DEL
+
CLR
+
+
+
+ +
+
+ + + +
+
+