Skip to content

Commit bb514d7

Browse files
author
Chris Hart
committed
Fix button styles in Rubric edit mode - especially IE10
https://instructure.atlassian.net/browse/CNVS-2985 Change-Id: I42236b1968762d8ae827650541a87aaad033819c Reviewed-on: https://gerrit.instructure.com/17252 Reviewed-by: Ryan Florence <ryanf@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> QA-Review: Myller de Araujo <myller@instructure.com>
1 parent 9814b3a commit bb514d7

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

app/views/shared/_rubric_criterion_dialog.html.erb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
</div>
44
<div class="editing">
55
<textarea class="long_description" name="long_description" style="width: 370px;"></textarea>
6-
<div class="button-container">
7-
<button type="button" class="btn save_button"><%= t 'buttons.update_description', "Update Description" %></button>
8-
<button type="button" class="btn button-secondary cancel_button"><%= t '#buttons.cancel', "Cancel" %></button>
6+
<div class="button-container button-container-right-aligned">
7+
<button type="button" class="btn btn-small cancel_button"><%= t '#buttons.cancel', "Cancel" %></button>
8+
<button type="button" class="btn btn-small btn-primary save_button"><%= t 'buttons.update_description', "Update Description" %></button>
99
</div>
1010
</div>
1111
<div class="displaying">
@@ -19,9 +19,9 @@
1919
<div class="editing">
2020
<%= before_label :additional_comments, "Additional Comments" %>
2121
<textarea class="criterion_comments" name="criterion_comments" style="width: 370px;"></textarea>
22-
<div class="button-container">
23-
<button type="button" class="btn save_button"><%= t 'buttons.update_comments', "Update Comments" %></button>
24-
<button type="button" class="btn button-secondary cancel_button"><%= t '#buttons.cancel', "Cancel" %></button>
22+
<div class="button-container button-container-right-aligned">
23+
<button type="button" class="btn btn-small cancel_button"><%= t '#buttons.cancel', "Cancel" %></button>
24+
<button type="button" class="btn btn-small btn-primary save_button"><%= t 'buttons.update_comments', "Update Comments" %></button>
2525
</div>
2626
</div>
2727
<div class="displaying">

app/views/shared/_rubric_forms.html.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<form id="edit_criterion_form">
33
<input type="text" class="criterion_description" style="min-width: 100px; width: 90%;" name="description"/>
44
<div class="button-container">
5-
<button type="submit" class="ok_button"><%= t '#buttons.ok', "OK" %></button>
6-
<button type="button" class="cancel_button button-secondary"><%= t '#buttons.cancel', "Cancel" %></button>
5+
<button type="button" class="cancel_button btn btn-mini"><%= t '#buttons.cancel', "Cancel" %></button>
6+
<button type="submit" class="ok_button btn btn-mini btn-primary"><%= t '#buttons.ok', "OK" %></button>
77
</div>
88
</form>
99
</div>
@@ -12,8 +12,8 @@
1212
<input type="text" class="rating_description" style="min-width: 100px; width: 90%;" name="description"/>
1313
<div class='button-container button-container-right-aligned' style="text-align:center;">
1414
<%= t :points, "%{points} pts", :points => '<input type="text" size="2" name="points"/>'.html_safe %>
15-
<button type="submit" class="ok_button btn btn-small"><%= t '#buttons.ok', "OK" %></button>
16-
<button type="button" class="cancel_button button-secondary"><%= t '#buttons.cancel', "Cancel" %></button>
15+
<button type="button" class="cancel_button btn btn-mini"><%= t '#buttons.cancel', "Cancel" %></button>
16+
<button type="submit" class="ok_button btn btn-mini btn-primary"><%= t '#buttons.ok', "OK" %></button>
1717
</div>
1818
</form>
1919
</div>

0 commit comments

Comments
 (0)