Merge branch 'master' into feature/halogenandtoast/calculator
This commit is contained in:
David Ormsbee
@@ -169,7 +169,7 @@ if Backbone?
|
||||
url = URI($elem.attr("action")).addSearch({text: @$(".search-input").val()})
|
||||
@reload($elem, url)
|
||||
|
||||
sort: ->
|
||||
sort: (event) ->
|
||||
$elem = $(event.target)
|
||||
url = $elem.attr("sort-url")
|
||||
@reload($elem, url)
|
||||
|
||||
@@ -3,9 +3,6 @@ $ ->
|
||||
window.$$contents = {}
|
||||
window.$$discussions = {}
|
||||
|
||||
$(".discussion-module").each (index, elem) ->
|
||||
view = new DiscussionModuleView(el: elem)
|
||||
|
||||
$("section.discussion").each (index, elem) ->
|
||||
discussionData = DiscussionUtil.getDiscussionData($(elem).attr("_id"))
|
||||
discussion = new Discussion()
|
||||
|
||||
BIN
lms/static/images/graded.png
Normal file
BIN
lms/static/images/graded.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 571 B |
9
lms/static/js/wiki/cheatsheet.js
Normal file
9
lms/static/js/wiki/cheatsheet.js
Normal file
@@ -0,0 +1,9 @@
|
||||
$(document).ready(function () {
|
||||
$('#cheatsheetLink').click(function() {
|
||||
$('#cheatsheetModal').modal('show');
|
||||
});
|
||||
|
||||
$('#cheatsheetModal .close-btn').click(function(e) {
|
||||
$('#cheatsheetModal').modal('hide');
|
||||
});
|
||||
});
|
||||
@@ -342,6 +342,11 @@ $tag-text-color: #5b614f;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.context{
|
||||
margin-top: 1em;
|
||||
font-size: $comment-font-size;
|
||||
}
|
||||
|
||||
.info {
|
||||
@include discussion-font;
|
||||
color: gray;
|
||||
@@ -501,7 +506,8 @@ $tag-text-color: #5b614f;
|
||||
font-size: inherit;
|
||||
font-weight: bold;
|
||||
margin-left: 1%;
|
||||
padding-top: 9px;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 2px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
||||
@@ -180,6 +180,18 @@ section.course-index {
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
|
||||
&.graded {
|
||||
> a {
|
||||
background-image: url('../images/graded.png');
|
||||
background-repeat: no-repeat;
|
||||
background-position: 97% center;
|
||||
}
|
||||
|
||||
&.active > a {
|
||||
@include background-image(url('../images/graded.png'), linear-gradient(top, #e6e6e6, #d6d6d6));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,12 @@ body.cs188 {
|
||||
margin-bottom: 1.416em;
|
||||
}
|
||||
|
||||
.choicegroup {
|
||||
input[type=checkbox], input[type=radio] {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -391,6 +391,18 @@ section.wiki {
|
||||
line-height: 1.4em;
|
||||
}
|
||||
|
||||
#div_id_content {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#hint_id_content {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 0%;
|
||||
font-size: 12px;
|
||||
text-align:right;
|
||||
}
|
||||
|
||||
.CodeMirror {
|
||||
background: #fafafa;
|
||||
border: 1px solid #c8c8c8;
|
||||
@@ -567,11 +579,73 @@ section.wiki {
|
||||
background: #f00 !important;
|
||||
}
|
||||
|
||||
|
||||
#cheatsheetLink {
|
||||
text-align: right;
|
||||
display: float;
|
||||
}
|
||||
|
||||
#cheatsheetModal {
|
||||
width: 950px;
|
||||
margin-left: -450px;
|
||||
margin-top: -100px;
|
||||
|
||||
.left-column {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.left-column,
|
||||
.right-column {
|
||||
float: left;
|
||||
width: 450px;
|
||||
}
|
||||
|
||||
.close-btn {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: -8px;
|
||||
right: -8px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border-radius: 30px;
|
||||
border: 1px solid #ccc;
|
||||
@include linear-gradient(top, #eee, #d2d2d2);
|
||||
font-size: 22px;
|
||||
line-height: 28px;
|
||||
color: #333;
|
||||
text-align: center;
|
||||
@include box-shadow(0 1px 0 #fff inset, 0 1px 2px rgba(0, 0, 0, .2));
|
||||
}
|
||||
}
|
||||
|
||||
#cheatsheet-body {
|
||||
background: #fff;
|
||||
text-align: left;
|
||||
padding: 20px;
|
||||
font-size: 14px;
|
||||
@include clearfix;
|
||||
|
||||
h3 {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: circle;
|
||||
line-height: 1.4;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
#cheatsheet-body section + section {
|
||||
margin-top: 40px;
|
||||
}
|
||||
|
||||
#cheatsheet-body pre{
|
||||
color: #000;
|
||||
text-align: left;
|
||||
background: #eee;
|
||||
padding: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/*-----------------
|
||||
|
||||
|
||||
@@ -115,6 +115,30 @@
|
||||
}
|
||||
}
|
||||
|
||||
a {
|
||||
&:hover, &:visited {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
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 {
|
||||
background: lighten($blue, 20%);
|
||||
border: 1px solid $blue;
|
||||
@@ -125,7 +149,10 @@
|
||||
padding: 10px 0px 8px;
|
||||
text-transform: uppercase;
|
||||
text-align: center;
|
||||
width: flex-grid(12);
|
||||
float: left;
|
||||
margin: 1px flex-gutter(8) 0 0;
|
||||
@include transition();
|
||||
width: flex-grid(5, 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -261,7 +261,7 @@
|
||||
padding: 12px 0px;
|
||||
width: 100%;
|
||||
|
||||
a.university {
|
||||
.university {
|
||||
background: rgba(255,255,255, 1);
|
||||
border: 1px solid rgb(180,180,180);
|
||||
@include border-radius(3px);
|
||||
@@ -269,17 +269,14 @@
|
||||
color: $lighter-base-font-color;
|
||||
display: block;
|
||||
font-style: italic;
|
||||
font-family: $sans-serif;
|
||||
font-size: 16px;
|
||||
font-weight: 800;
|
||||
@include inline-block;
|
||||
margin-right: 10px;
|
||||
margin-bottom: 0;
|
||||
padding: 5px 10px;
|
||||
|
||||
float: left;
|
||||
|
||||
&:hover {
|
||||
color: $blue;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
h3 {
|
||||
@@ -306,8 +303,12 @@
|
||||
background: $yellow;
|
||||
border: 1px solid rgb(200,200,200);
|
||||
@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;
|
||||
width: flex-grid(8);
|
||||
float: left;
|
||||
@include box-sizing(border-box);
|
||||
|
||||
p {
|
||||
color: $lighter-base-font-color;
|
||||
@@ -317,93 +318,46 @@
|
||||
}
|
||||
}
|
||||
|
||||
.meta {
|
||||
@include clearfix;
|
||||
margin-top: 22px;
|
||||
position: relative;
|
||||
@include transition(opacity, 0.15s, linear);
|
||||
width: 100%;
|
||||
|
||||
|
||||
.course-work-icon {
|
||||
@include background-image(url('../images/portal-icons/pencil-icon.png'));
|
||||
background-size: cover;
|
||||
float: left;
|
||||
height: 22px;
|
||||
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%;
|
||||
}
|
||||
}
|
||||
}
|
||||
.enter-course {
|
||||
@include button(shiny, $blue);
|
||||
@include box-sizing(border-box);
|
||||
@include border-radius(3px);
|
||||
display: block;
|
||||
float: left;
|
||||
font: normal 1rem/1.6rem $sans-serif;
|
||||
letter-spacing: 1px;
|
||||
padding: 6px 0px;
|
||||
text-transform: uppercase;
|
||||
text-align: center;
|
||||
margin-top: 16px;
|
||||
width: flex-grid(4);
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
> a:hover {
|
||||
.cover {
|
||||
.shade {
|
||||
background: rgba(255,255,255, 0.1);
|
||||
@include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.3) 0%,
|
||||
rgba(0,0,0, 0.3) 100%));
|
||||
rgba(0,0,0, 0.3) 100%));
|
||||
}
|
||||
|
||||
.arrow {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.info {
|
||||
background: darken(rgb(250,250,250), 5%);
|
||||
@include background-image(linear-gradient(-90deg, darken(rgb(253,253,253), 3%), darken(rgb(240,240,240), 5%)));
|
||||
border-color: darken(rgb(190,190,190), 10%);
|
||||
|
||||
.course-status {
|
||||
background: darken($yellow, 3%);
|
||||
border-color: darken(rgb(200,200,200), 3%);
|
||||
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -420,5 +374,6 @@
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user