From b5302a192fd2d0ab2cc55b0ea077e00c1b59c93d Mon Sep 17 00:00:00 2001 From: Frances Botsford Date: Fri, 23 Aug 2013 16:49:01 -0400 Subject: [PATCH] refinements to the vcert requirements page --- lms/static/sass/views/_verification.scss | 418 ++++++++++-------- lms/templates/verify_student/face_upload.html | 25 +- .../verify_student/photo_id_upload.html | 2 +- .../verify_student/show_requirements.html | 106 +++-- 4 files changed, 294 insertions(+), 257 deletions(-) diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index 2f558c0eac..f42c7ddfd9 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -4,10 +4,15 @@ body.register.verification { font-family: 'Open Sans', sans-serif; +// some nasty resets and standard styles h1, h2, h3, h4, h5, h6, p, input { font-family: 'Open Sans', sans-serif; } + p { + margin-bottom: ($baseline*.75); + } + input { font-style: normal; font-weight: 400; @@ -43,7 +48,7 @@ body.register.verification { } - +// basic reusable bits .content-wrapper { background: none repeat scroll 0 0 #F7F7F7; padding-bottom: 0; @@ -81,95 +86,6 @@ body.register.verification { font-weight: bold; } - .select { - @include clearfix(); - - .divider { - display: block; - clear: both; - width: 60%; - margin: $baseline $baseline 0 $baseline; - border-top: 2px solid #ddd; - - p { - position: relative; - top: -$baseline; - width: 40px; - margin: 0 auto; - padding: 0 $baseline; - background-color: #fff; - font-size: 24px; - color: #aaa; - text-align: center; - } - } - - .block { - position: relative; - float: left; - margin: 0 $baseline ($baseline*1.5) 0; - border-top: 5px solid #32A5D9; - background-color: #eee; - padding: $baseline ($baseline*1.5) ($baseline*2) ($baseline*1.5); - width: 60%; - - - &.block-cert { - border-top: 5px solid #008801; - - .ribbon { - background: transparent url('../images/vcert-ribbon-s.png') no-repeat 0 0; - position: absolute; - top: -($baseline*1.5); - right: $baseline; - display: block; - width: ($baseline*3); - height: ($baseline*4); - } - } - - - p, li, dl { - color: $lighter-base-font-color; - } - - .wrap-copy { - width: 60%; - display: inline-block; - vertical-align: middle; - } - - .title { - @extend .t-title7; - } - - .m-btn-primary { - position: absolute; - bottom: ($baseline*1.5); - right: ($baseline*1.5); - } - - - } - - hr { - margin: 1em 0 2em 0; - } - - .more { - margin-top: ($baseline/2); - border-top: 1px solid #ccc; - } - - .tips { - float: right; - width: 32%; - - p { - font-size: 14px; - } - } - } .pay-options { @@ -187,6 +103,7 @@ body.register.verification { &.other1 { margin-right: -($baseline/4); padding-right: ($baseline/4); + min-height: 25px; } &.other2 { padding: ($baseline/4) ($baseline*.75) ($baseline/4) 0; @@ -204,9 +121,13 @@ body.register.verification { } .m-btn-primary { + margin-bottom: 0; + padding: 0; a { color: $very-light-text; + display: block; + padding: ($baseline*.75) $baseline; &:hover { text-decoration: none; @@ -215,7 +136,7 @@ body.register.verification { } &.disabled, &[disabled], &.is-disabled { - background-color: #A0B6CD; + background-color: #ccc; box-shadow: none; pointer-events: none; @@ -250,135 +171,258 @@ body.register.verification { } - // for dev placement only - .placeholder-cam, - .placeholder-photo { - height: 300px; - background-color: #eee; - position: relative; - p { - position: absolute; - top: 40%; - left: 40%; - color: #ccc; - } - } - .block-photo { - @include clearfix(); - background-color: $white; - .title { - font-weight: bold; - } - .wrapper-up, - .wrapper-down { +// select a track page + &.select-track { + + .select { @include clearfix(); - } - .cam { - width: 45%; - float: left; - padding-right: $baseline; - } + .divider { + display: block; + clear: both; + width: 60%; + margin: $baseline $baseline 0 $baseline; + border-top: 2px solid #ddd; - .photo-controls { - background-color: #ddd; + p { + position: relative; + top: -$baseline; + width: 40px; + margin: 0 auto; + padding: 0 $baseline; + background-color: #fff; + font-size: 24px; + color: #aaa; + text-align: center; + } + } - .controls-list { - @include clearfix(); + .block { position: relative; - margin: 0; - padding: ($baseline*.25) ($baseline*.75); - list-style-type: none; + float: left; + margin: 0 $baseline ($baseline*1.5) 0; + border-top: 5px solid #32A5D9; + background-color: #eee; + padding: $baseline ($baseline*1.5) ($baseline*2) ($baseline*1.5); + width: 60%; - .control { - display: inline-block; - .action { - @extend .button-primary; + &.block-cert { + border-top: 5px solid #008801; + + .ribbon { + background: transparent url('../images/vcert-ribbon-s.png') no-repeat 0 0; + position: absolute; + top: -($baseline*1.5); + right: $baseline; display: block; - background-color: $blue; - color: $white; - padding: ($baseline*.25) ($baseline*.5); - border: none; - - &:hover { - - } - + width: ($baseline*3); + height: ($baseline*4); } + } - &.is-hidden { - visibility: hidden; - } + p, li, dl { + color: $lighter-base-font-color; + } - &.is-shown { - visibility: visible; - } + .wrap-copy { + width: 60%; + display: inline-block; + vertical-align: middle; + } + + .title { + @extend .t-title7; + } + + .m-btn-primary { + position: absolute; + bottom: ($baseline*1.5); + right: ($baseline*1.5); + } - &.control-do { - position: relative; - left: 45%; - } + } - &.control-redo { - position: absolute; - left: ($baseline/2); - } + hr { + margin: 1em 0 2em 0; + } - &.control-approve { - position: absolute; - right: ($baseline/2); - } + .more { + margin-top: ($baseline/2); + border-top: 1px solid #ccc; + } - &.approved a { - background-color: $green; - } + .tips { + float: right; + width: 32%; + + p { + font-size: 14px; } } } + } - .faq { +// requirements page + &.requirements { + .req { + width: 30%; + display: inline-block; + margin-right: $baseline; + text-align: center; + vertical-align: top; + } + + .next-step { + float: right; + } + + } + +// take and review photos page + &.photos { + // for dev placement only + .placeholder-cam, + .placeholder-photo { + height: 300px; + background-color: #eee; + position: relative; + + p { + position: absolute; + top: 40%; + left: 40%; + color: #ccc; + } + } + + .block-photo { + @include clearfix(); + background-color: $white; + + .title { + font-weight: bold; + } + + .wrapper-up, + .wrapper-down { + @include clearfix(); + } + + .cam { + width: 45%; + float: left; + padding-right: $baseline; + } + + .photo-controls { + background-color: #ddd; + + .controls-list { + @include clearfix(); + position: relative; + margin: 0; + padding: ($baseline*.25) ($baseline*.75); + list-style-type: none; + + .control { + display: inline-block; + + .action { + @extend .button-primary; + display: block; + background-color: $blue; + color: $white; + padding: ($baseline*.25) ($baseline*.5); + border: none; + + &:hover { + + } + + } + + + &.is-hidden { + visibility: hidden; + } + + &.is-shown { + visibility: visible; + } + + + &.control-do { + position: relative; + left: 45%; + } + + &.control-redo { + position: absolute; + left: ($baseline/2); + } + + &.control-approve { + position: absolute; + right: ($baseline/2); + } + + &.approved a { + background-color: $green; + } + } + } + } + + .faq { + width: 45%; + float: left; + padding-right: $baseline; + } + + } + + .photo-tips { width: 45%; float: left; - padding-right: $baseline; + + ul { + margin: 0; + padding: 0; + list-style-type: none; + } + + li { + margin-bottom: $baseline; + } + + + } - } + .next-step { + width: 45%; + float: right; + } - .photo-tips { - width: 45%; - float: left; - } + .support { + margin-top: ($baseline*2); + } - .actions { - width: 45%; - float: right; + .review-photo { + width: 45%; + float: left; + } - ul { - padding: 0; - margin: 0; - list-style-type: none; + #review-facephoto { + margin-right: $baseline; } } - .support { - margin-top: ($baseline*2); - } - - .review-photo { - width: 45%; - float: left; - } - - #review-facephoto { - margin-right: $baseline; - } - - } diff --git a/lms/templates/verify_student/face_upload.html b/lms/templates/verify_student/face_upload.html index 8a92fa438d..6018d3540f 100644 --- a/lms/templates/verify_student/face_upload.html +++ b/lms/templates/verify_student/face_upload.html @@ -121,15 +121,11 @@ $(document).ready(function() { -
-
@@ -193,15 +189,11 @@ $(document).ready(function() { -
-
@@ -247,7 +239,7 @@ $(document).ready(function() { - +

Check Your Contribution

@@ -279,21 +271,14 @@ $(document).ready(function() {
-