diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss index 818a3b3191..b600ed169a 100644 --- a/cms/static/sass/_settings.scss +++ b/cms/static/sass/_settings.scss @@ -141,6 +141,11 @@ border-color: $blue; outline: 0; } + + &:disabled { + color: $darkGrey; + background: $lightGrey; + } } ::-webkit-input-placeholder { @@ -564,14 +569,14 @@ } .grade-slider { - float: left; - width: 560px; - height: 60px; + float: right; + width: 95%; + height: 80px; .grade-bar { position: relative; width: 100%; - height: 40px; + height: 50px; background: $lightGrey; .increments { @@ -579,7 +584,7 @@ li { position: absolute; - top: 42px; + top: 52px; width: 30px; margin-left: -15px; font-size: 9px; @@ -637,7 +642,7 @@ li { position: absolute; top: 0; - height: 40px; + height: 50px; text-align: right; &:hover, @@ -647,6 +652,11 @@ } } + &.is-dragging { + + + } + .remove-button { display: none; position: absolute; @@ -678,16 +688,16 @@ .letter-grade { display: block; - margin: 7px 5px 0 0; - font-size: 14px; + margin: 10px 15px 0 0; + font-size: 16px; font-weight: 700; line-height: 14px; } .range { display: block; - margin-right: 5px; - font-size: 9px; + margin-right: 15px; + font-size: 10px; line-height: 12px; } @@ -695,14 +705,16 @@ position: absolute; top: 0; right: -1px; - height: 40px; + height: 50px; width: 2px; background-color: #fff; + @include box-shadow(-1px 0 3px rgba(0,0,0,0.1)); + cursor: ew-resize; @include transition(none); &:hover { - width: 4px; + width: 6px; right: -2px; } } diff --git a/cms/templates/settings.html b/cms/templates/settings.html index ef0ae0a1d0..58c9a7a9ce 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -36,7 +36,7 @@ $('.new-grade-button').bind('click', addNewGrade); $body.on('click', '.remove-button', removeGrade); - $('.set-date').datepicker(); + $('.set-date').datepicker({ 'dateFormat': 'm/d/yy' }); })(); function addNewGrade(e) { @@ -133,7 +133,7 @@
- +
@@ -142,7 +142,7 @@
- +
@@ -151,7 +151,7 @@
- + e.g. 101x
@@ -170,7 +170,7 @@
- + First day the class begins
@@ -180,7 +180,7 @@
- + Last day the class begins
@@ -280,7 +280,6 @@
-
@@ -621,6 +620,12 @@ remove +
  • + F + 0-50 + + remove +