Skip to content

Commit

Permalink
Merge pull request openedx#389 from MITx/feature/tomg/fall-design
Browse files Browse the repository at this point in the history
Feature/tomg/fall design
  • Loading branch information
cpennington committed Aug 13, 2012
2 parents 6173af8 + c058395 commit f1e5c8f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 16 deletions.
15 changes: 14 additions & 1 deletion common/lib/xmodule/xmodule/css/capa/display.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,19 @@ div {
}
}

&.processing {
p.status {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
width: 20px;
}

input {
border-color: #aaa;
}
}

&.incorrect, &.ui-icon-close {
p.status {
@include inline-block();
Expand Down Expand Up @@ -146,7 +159,7 @@ div {
width: 14px;
}

&.processing, &.ui-icon-check {
&.processing, &.ui-icon-processing {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
Expand Down
23 changes: 9 additions & 14 deletions lms/static/sass/multicourse/_dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -203,28 +203,23 @@
display: block;
left: 0px;
position: absolute;
z-index: 50;
top: 0px;
@include transition(all, 0.15s, linear);
right: 0px;
}

.arrow {
border-top: 8px solid;
border-left: 8px solid;
border-color: rgba(0,0,0, 0.7);
@include box-shadow(inset 0 1px 0 0 rgba(255,255,255, 0.8), -1px 0 1px 0 rgba(255,255,255, 0.8));
content: "";
display: block;
height: 55px;
left: 50%;
margin-left: -10px;
margin-top: -30px;
opacity: 0;
position: absolute;
top: 50%;
@include transform(rotate(-45deg));
z-index: 100;
width: 100%;
font-size: 70px;
line-height: 110px;
text-align: center;
text-decoration: none;
color: rgba(0, 0, 0, .7);
opacity: 0;
@include transition(all, 0.15s, linear);
width: 55px;
}

&:hover {
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h2>Current Courses</h2>
%>
<a href="${course_target}" class="cover" style="background-image: url('${course_image_url(course)}')">
<div class="shade"></div>
<div class="arrow"></div>
<div class="arrow">&#10095;</div>
</a>
<section class="info">
<hgroup>
Expand Down

0 comments on commit f1e5c8f

Please sign in to comment.