codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-13 09:11:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
phoenixeliot 2016-07-26 13:13:13 -07:00
commit 0f974381cd
2 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/styles/courses/teacher-classes-view.sass
View file

@ -38,6 +38,18 @@
padding: 20px padding: 20px
display: flex display: flex
.flex-right
display: flex
flex-grow: 1
justify-content: flex-end
.progress-col
display: flex
align-self: center
align-items: center
flex-wrap: wrap
justify-content: flex-end
.class:nth-child(2n+1) .class:nth-child(2n+1)
background-color: #ebebeb background-color: #ebebeb
@ -46,38 +58,26 @@
.view-class-arrow .view-class-arrow
color: $gray-darker color: $gray-darker
// height: 100%
font-size: 35px font-size: 35px
line-height: 35px line-height: 35px
margin-left: 15px
align-self: center align-self: center
.view-class-arrow-inner .view-class-arrow-inner
color: $gray-light color: $gray-light
&:hover &:hover
text-decoration: none text-decoration: none
.progress-col
display: flex
align-self: center
align-items: center
.progress-dot .progress-dot
display: inline-block display: inline-block
margin-right: 20px margin: 10px
width: 62px width: 62px
height: 62px height: 62px
border-radius: 50% border-radius: 50%
margin-top: 23px
margin-bottom: 23px
background: $gray-light background: $gray-light
position: relative display: flex
justify-content: center
align-items: center
.dot-label .dot-label
color: $gray-dark
position: absolute
left: 50%
top: 50%
.text-h6
margin-left: -50%
margin-top: -50%
color: white color: white
.progress-dot.forest .progress-dot.forest

10
app/templates/courses/teacher-classes-view.jade
View file

@ -54,7 +54,7 @@ block content
mixin classRow(classroom) mixin classRow(classroom)
.class.row .class.row
.col-xs-6 .class-details-col
.text-h4.semibold .text-h4.semibold
= classroom.get('name') = classroom.get('name')
.language.small .language.small
@ -72,7 +72,8 @@ mixin classRow(classroom)
a.edit-classroom.text-h6(data-i18n='teacher.edit_class_settings' data-classroom-id=classroom.id data-event-action="Teachers Classes Edit Class Started") a.edit-classroom.text-h6(data-i18n='teacher.edit_class_settings' data-classroom-id=classroom.id data-event-action="Teachers Classes Edit Class Started")
a.archive-classroom.text-h6(data-i18n='teacher.archive_class' data-classroom-id=classroom.id data-event-action="Teachers Classes Archive Class") a.archive-classroom.text-h6(data-i18n='teacher.archive_class' data-classroom-id=classroom.id data-event-action="Teachers Classes Archive Class")
.progress-col.col-xs-5 .flex-right
.progress-col
if classroom.get('members').length == 0 if classroom.get('members').length == 0
+addStudentsButton(classroom) +addStudentsButton(classroom)
else else
@ -83,7 +84,7 @@ mixin classRow(classroom)
if view.courseInstances.findWhere({ classroomID: classroom.id, courseID: course.id }) if view.courseInstances.findWhere({ classroomID: classroom.id, courseID: course.id })
- var label = courseLabelsArray[index]; - var label = courseLabelsArray[index];
+progressDot(classroom, course, label) +progressDot(classroom, course, label)
.view-class-arrow.col-xs-1 .view-class-arrow
a.view-class-arrow-inner.glyphicon.glyphicon-chevron-right.view-class-btn(data-classroom-id=classroom.id data-event-action="Teachers Classes View Class Chevron") a.view-class-arrow-inner.glyphicon.glyphicon-chevron-right.view-class-btn(data-classroom-id=classroom.id data-event-action="Teachers Classes View Class Chevron")
@ -118,8 +119,7 @@ mixin progressDot(classroom, course, label)
+progressDotLabel(label) +progressDotLabel(label)
mixin progressDotLabel(label) mixin progressDotLabel(label)
.dot-label .dot-label.text-h6= label
.text-h6= label
mixin archivedClassRow(classroom) mixin archivedClassRow(classroom)
.class.row .class.row