Skip to content

E
edx-platform
Commit e9240f74 by Kyle Fiedler
Options

Added buttons for both pages to make it even more clear to start class

parent a9af3096
Showing with 42 additions and 94 deletions
lms/static/sass/multicourse/_course_about.scss
...@@ -121,6 +121,24 @@ ...@@ -121,6 +121,24 @@
} }
} }
strong {
@include button(shiny, $blue);
@include box-sizing(border-box);
@include border-radius(3px);
display: block;
float: left;
font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px;
padding: 10px 0px;
text-transform: uppercase;
text-align: center;
width: flex-grid(3, 8);
&:hover {
color: rgb(255,255,255);
}
}
span.register { span.register {
background: lighten($blue, 20%); background: lighten($blue, 20%);
border: 1px solid $blue; border: 1px solid $blue;
...@@ -131,15 +149,10 @@ ...@@ -131,15 +149,10 @@
padding: 10px 0px 8px; padding: 10px 0px 8px;
text-transform: uppercase; text-transform: uppercase;
text-align: center; text-align: center;
width: flex-grid(12); float: left;
margin: 1px flex-gutter(8) 0 0;
@include transition(); @include transition();
width: flex-grid(5, 8);
&:hover {
background: lighten($pink, 20%);
border: 1px solid $pink;
color: darken($pink, 20%);
text-decoration: none;
}
} }
} }
} }
......
lms/static/sass/multicourse/_dashboard.scss
...@@ -303,8 +303,12 @@ ...@@ -303,8 +303,12 @@
background: $yellow; background: $yellow;
border: 1px solid rgb(200,200,200); border: 1px solid rgb(200,200,200);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6)); @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
margin-top: 16px; margin-top: 17px;
margin-right: flex-gutter();
padding: 5px; padding: 5px;
width: flex-grid(8);
float: left;
@include box-sizing(border-box);
p { p {
color: $lighter-base-font-color; color: $lighter-base-font-color;
...@@ -314,78 +318,19 @@ ...@@ -314,78 +318,19 @@
} }
} }
.meta { .enter-course {
@include clearfix; @include button(shiny, $blue);
margin-top: 22px; @include box-sizing(border-box);
position: relative; @include border-radius(3px);
@include transition(opacity, 0.15s, linear); display: block;
width: 100%; float: left;
font: normal 1rem/1.6rem $sans-serif;
letter-spacing: 1px;
.course-work-icon { padding: 6px 0px;
@include background-image(url('../images/portal-icons/pencil-icon.png')); text-transform: uppercase;
background-size: cover; text-align: center;
float: left; margin-top: 16px;
height: 22px; width: flex-grid(4);
opacity: 0.7;
width: 22px;
}
.complete {
float: right;
p {
color: $lighter-base-font-color;
font-style: italic;
@include inline-block;
text-align: right;
text-shadow: 0 1px rgba(255,255,255, 0.6);
.completeness {
color: $base-font-color;
font-weight: 700;
margin-right: 5px;
}
}
}
.progress {
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
left: 35px;
position: absolute;
right: 130px;
.meter {
background: rgb(245,245,245);
border: 1px solid rgb(160,160,160);
@include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.15));
@include box-sizing(border-box);
@include border-radius(4px);
height: 22px;
margin: 0 auto;
padding: 2px;
width: 100%;
.meter-fill {
background: $blue;
@include background-image(linear-gradient(-45deg, rgba(255,255,255, 0.15) 25%,
transparent 25%,
transparent 50%,
rgba(255,255,255, 0.15) 50%,
rgba(255,255,255, 0.15) 75%,
transparent 75%));
background-size: 40px 40px;
background-repeat: repeat-x;
border: 1px solid rgb(115,115,115);
@include border-radius(4px);
@include box-sizing(border-box);
content: "";
display: block;
height: 100%;
width: 60%;
}
}
}
} }
} }
......
lms/templates/dashboard.html
...@@ -85,19 +85,9 @@ ...@@ -85,19 +85,9 @@
<h3>${course.number} ${course.title}</h3> <h3>${course.number} ${course.title}</h3>
</hgroup> </hgroup>
<section class="course-status"> <section class="course-status">
<p>Class Starts - <span>${course.start_date_text}</span></div> <p>Class Starts - <span>${course.start_date_text}</span></p>
</section>
<section class="meta">
<div class="course-work-icon"></div>
<div class="progress">
<div class="meter">
<div class="meter-fill"></div>
</div>
</div>
<div class="complete">
##<p><span class="completeness">60%</span> complete</p>
</div>
</section> </section>
<p class="enter-course">View Courseware</p>
</section> </section>
</a> </a>
</article> </article>
......
lms/templates/portal/course_about.html
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
%if show_link: %if show_link:
<a href="${course_target}"> <a href="${course_target}">
%endif %endif
<span class="register disabled">You are registered for this course (${course.number}). <strong>View Courseware.<strong></span> <span class="register disabled">You are registered for this course (${course.number})</span> <strong>View Courseware</strong>
%if show_link: %if show_link:
</a> </a>
%endif %endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment