diff --git a/lms/static/sass/base/_mixins.scss b/lms/static/sass/base/_mixins.scss index 22a1d96dbd..0205fe9875 100644 --- a/lms/static/sass/base/_mixins.scss +++ b/lms/static/sass/base/_mixins.scss @@ -97,6 +97,26 @@ %ui-depth4 { z-index: 10000; } %ui-depth5 { z-index: 100000; } +// extends - UI - utility - nth-type style clearing +%wipe-first-child { + + &:first-child { + margin-top: 0; + border-top: none; + padding-top: 0; + } +} + +// extends - UI - utility - nth-type style clearing +%wipe-last-child { + + &:last-child { + margin-bottom: 0; + border-bottom: none; + padding-bottom: 0; + } +} + // extends -hidden elems - screenreaders %text-sr { border: 0; diff --git a/lms/static/sass/elements/_controls.scss b/lms/static/sass/elements/_controls.scss index 30629537da..a7028efa22 100644 --- a/lms/static/sass/elements/_controls.scss +++ b/lms/static/sass/elements/_controls.scss @@ -231,11 +231,35 @@ cursor: default; pointer-events: none; box-shadow: none; - :hover, :focus { + + &:hover, &:focus { pointer-events: none; } } +// ==================== + +%btn-reset { + background: none; + border: none; + font-size: inherit; + box-shadow: none; + text-shadow: none; +} + +// button that appears visually as a link +%btn-link { + @extend %btn-reset; + color: $link-color; + text-decoration: none; + @include transition(all 0.1s linear 0s); + + &:hover, &:focus { + color: $link-color; + text-decoration: underline; + } +} + // ==================== // application: canned actions diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss index f9c3027ddf..a6ce70251e 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -325,3 +325,42 @@ @extend .modal; } +// -------------------- + +// CASE: language settings +.modal-settings-language { + + // general reset + .list-input, .list-actions { + @extend %ui-no-list; + } + + .settings-language-select .select { + width: 100%; + } + + .list-input { + margin-bottom: $baseline; + } + + .list-actions { + + .action-item { + @extend %wipe-last-child; + display: inline-block; + vertical-align: middle; + margin-right: ($baseline/4); + } + + .action-submit { + color: $white; + padding-top: ($baseline/3); + padding-bottom: ($baseline/3); + } + + .action-cancel { + @extend %btn-link; + } + } +} + diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 47e2abd810..a19c07d3a7 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -193,6 +193,8 @@ ${ user.email | h } + <%include file='dashboard/_dashboard_info_language.html' /> + % if external_auth_map is None or 'shib' not in external_auth_map.external_domain:
  • ${_("Reset Password")}
    @@ -329,6 +331,8 @@ +<%include file='modal/_modal-settings-language.html' /> +