ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix edit assignment styles 

Fixes CNVS-25014

Test Plan:
* As a teacher, edit any assignment
* The edit assignment page should appear, correctly formatted
  for all browsers, with new styles enabled as well as for the legacy
  styles

Change-Id: Ia14134497b5d6910942842634f08fbcdcd7ee844
Reviewed-on: https://gerrit.instructure.com/68233
Tested-by: Jenkins
Reviewed-by: Sterling Cobb <sterling@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
This commit is contained in:
Dan Minkevitch 2015-12-08 09:13:37 -08:00
parent 2b703a1272
commit d239d5a531
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/stylesheets/bundles/assignments_edit.scss
View File

@ -1,7 +1,7 @@
@import "base/environment"; @import "base/environment";
/* for labels */ /* for labels */
div.form-column-left { div.form-column-left {
min-width: 150px; min-width: 145px;
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
display: inline-block; display: inline-block;
@ -25,6 +25,7 @@ div.form-column-left {
/* for grouped and un-grouped form els */ /* for grouped and un-grouped form els */
div.form-column-right, div.overrides-column-right { div.form-column-right, div.overrides-column-right {
display: inline-block; display: inline-block;
width: 380px;
/* for groups of form els ONLY */ /* for groups of form els ONLY */
.border { .border {
@ -77,10 +78,6 @@ div.form-column-right, div.overrides-column-right {
} }
} }
div.form-column-right {
width: 380px;
}
.assignment-edit-group-alert, .assignment-edit-external-tool-alert{ .assignment-edit-group-alert, .assignment-edit-external-tool-alert{
margin: 15px 20px 0; margin: 15px 20px 0;
} }

16
app/stylesheets/jst/assignments/DueDateOverride.scss
View File

@ -6,8 +6,11 @@ $assign-border-color: #ccc;
// Overrides for New Assign section // Overrides for New Assign section
// Note: a lot of these are overrides due to // Note: a lot of these are overrides due to
// legacy code. // legacy code.
.overrides-column-right.overrideFormFlex { #edit_assignment_wrapper .overrides-column-right.overrideFormFlex {
width: 500px; // only needed for legacy layout support @if $use_new_styles == false {
width: 500px; // only needed for legacy layout support
}
select, .subtitle { select, .subtitle {
margin-left: 0; margin-left: 0;
} }
@ -37,7 +40,10 @@ $assign-border-color: #ccc;
font-weight: 500; font-weight: 500;
} }
.ContainerDueDate { .ContainerDueDate {
width: 500px; @if $use_new_styles == false {
width: 500px;
}
margin: 20px 0; // matches legacy margins margin: 20px 0; // matches legacy margins
} }
@ -66,11 +72,11 @@ $assign-border-color: #ccc;
.UnlockLockInput { .UnlockLockInput {
display: inline; display: inline;
width: 150px; width: 90px;
} }
.DueDateInput { .DueDateInput {
width: 407px; width: 285px;
display: inline; display: inline;
} }