Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drupal integration - further sass refinment and hiding example error states

Browse Source
This commit is contained in:
Brian Talbot
2013-01-21 18:48:54 -05:00
committed by John Jarvis
parent 009ac06d4d
commit eaeae03315
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/static/sass/multicourse/_account.scss
View File

@@ -128,6 +128,8 @@
margin: 0 0 ($baseline/4) 0;
color: tint($black, 20%);
font-size: em(16);
font-weight: 600;
text-transform: uppercase;
}
p, ul, ol, dl, blockquote {
@@ -368,13 +370,13 @@
// forms - messages/status
.status {
@include box-sizing(border-box);
@include box-shadow(inset 0 -1px 2px 0 rgba(0,0,0,0.1));
@include box-shadow(inset 0 -1px 2px 0 tint($yellow, 85%));
border-top: 2px solid $yellow;
border-bottom: 1px solid tint($m-gray,70%);
background: tint($yellow,70%);
.message-title {
margin: 0 0 ($baseline/4) 0;
color: shade($yellow, 50%);
font-size: em(14);
font-weight: 600;
}
@@ -392,7 +394,9 @@
}
.submission-error, .system-error {
background: tint($red,95%);
@include box-shadow(inset 0 -1px 2px 0 tint($red, 85%));
border-top: 2px solid tint($red,65%);
background: tint($red,98%);
.message-title {
color: shade($red, 10%);

8
lms/templates/login.html
View File

@@ -48,12 +48,12 @@
<form role="form" id="login-form" method="post" data-remote="true" action="/login">
<!-- status messages -->
<div role="alert" class="status message">
<div role="alert" class="status message is-hidden">
<h3 class="message-title">We're Sorry, edX accounts are unavailable currently</h3>
<p class="message-copy">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
</div>
<div role="alert" class="status message submission-error">
<div role="alert" class="status message submission-error is-hidden">
<h3 class="message-title">The following errors occured while logging you in: </h3>
<ul class="message-copy">
<li>Your email or password is incorrect</li>
@@ -108,11 +108,11 @@
</header>
% if settings.MITX_FEATURES.get('AUTH_USE_OPENID'):
<div class="cta cta-login-options-openid">
<!-- <div class="cta cta-login-options-openid">
<h3>Login via OpenID</h3>
<p>You can now start learning with edX by logging in with your <a rel="external" href="http://openid.net/">OpenID account</a>.</p>
<a class="action action-login-openid" href="#">Login via OpenID</a>
</div>
</div> -->
% endif
<div class="cta cta-forgotpw">

8
lms/templates/register.html
View File

@@ -54,12 +54,12 @@
<form role="form" id="register-form" method="post" data-remote="true" action="/create_account">
<!-- status messages -->
<div role="alert" class="status message">
<div role="alert" class="status message is-hidden">
<h3 class="message-title">We're sorry, edX enrollment is not available in your region</h3>
<p class="message-copy">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
</div>
<div role="alert" class="status message submission-error">
<div role="alert" class="status message submission-error is-hidden">
<h3 class="message-title">The following errors occured while processing your registration: </h3>
<ul class="message-copy">
<li>You must accept the terms of service.</li>
@@ -68,12 +68,12 @@
</ul>
</div>
<div role="alert" class="status message submission-error">
<div role="alert" class="status message submission-error is-hidden">
<h3 class="message-title">The following errors occured while processing your registration: </h3>
<p class="message-copy">To enroll, you must follow the honor code</p>
</div>
<div role="alert" class="status message system-error">
<div role="alert" class="status message system-error is-hidden">
<h3 class="message-title">We're sorry, our systems seem to be having trouble processing your registration now.</h3>
<p class="message-copy">Someone has been made aware of this issue. Please try again shortly. Please <a href="">contact us</a> about any concerns you have.</p>
</div>