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

Merge branch 'master' into feature/abarrett/lms-notes-app

Browse Source
This commit is contained in:
Arthur Barrett
2013-03-25 19:04:58 -04:00
parent 63349dab9c 8350fe141b
commit d636f4fab0
161 changed files with 6218 additions and 7137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/static/js/capa/jsme/gwt/chrome/chrome.css
View File

@@ -12,6 +12,8 @@
* }
*/
/* Commented out the following that was messing up the CSS in sequential and had no use anyway when jsme is running inside edX platform.
body, table td, select {
font-family: Arial Unicode MS, Arial, sans-serif;
font-size: small;
@@ -31,6 +33,7 @@ body {
a, a:visited, a:hover {
color: #0000AA;
}
*/
/**
* The reference theme can be used to determine when this style sheet has

3
common/static/js/capa/jsme/gwt/chrome/chrome_rtl.css
View File

@@ -12,6 +12,8 @@
* }
*/
/* Commented out the following that was messing up the CSS in sequential and had no use anyway when jsme is running inside edX platform.
body, table td, select {
font-family: Arial Unicode MS, Arial, sans-serif;
font-size: small;
@@ -31,6 +33,7 @@ body {
a, a:visited, a:hover {
color: #0000AA;
}
*/
/**
* The reference theme can be used to determine when this style sheet has

3
common/static/js/capa/jsme/gwt/chrome/mosaic.css
View File

@@ -26,6 +26,8 @@
zoom: 1;
}
/* Commented out the following that was messing up the CSS in sequential and had no use anyway when jsme is running inside edX platform.
body {
font-family: arial,sans-serif;
}
@@ -45,6 +47,7 @@ a:visited {
a:active {
color:#ff0000;
}
*/
/*** Button ***/

3
common/static/js/capa/jsme/gwt/chrome/mosaic_rtl.css
View File

@@ -26,6 +26,8 @@
zoom: 1;
}
/* Commented out the following that was messing up the CSS in sequential and had no use anyway when jsme is running inside edX platform.
body {
font-family: arial,sans-serif;
}
@@ -45,6 +47,7 @@ a:visited {
a:active {
color:#ff0000;
}
*/
/*** Button ***/

3
common/static/js/capa/jsmolcalc/gwt/clean/clean.css
View File

@@ -12,6 +12,8 @@
* }
*/
/* Commented out the following that was messing up the CSS in sequential and had no use anyway when jsmolcalc is running inside edX platform.
body, table td, select, button {
font-family: Arial Unicode MS, Arial, sans-serif;
font-size: small;
@@ -41,6 +43,7 @@ a:hover {
select {
background: white;
}
*/
/**
* The reference theme can be used to determine when this style sheet has

3
common/static/js/capa/jsmolcalc/gwt/clean/clean_rtl.css
View File

@@ -12,6 +12,8 @@
* }
*/
/* Commented out the following that was messing up the CSS in sequential and had no use anyway when jsmolcalc is running inside edX platform.
body, table td, select, button {
font-family: Arial Unicode MS, Arial, sans-serif;
font-size: small;
@@ -41,6 +43,7 @@ a:hover {
select {
background: white;
}
*/
/**
* The reference theme can be used to determine when this style sheet has

7
common/static/js/vendor/jquery.smooth-scroll.min.js vendored Executable file
View File

@@ -0,0 +1,7 @@
/*!
* Smooth Scroll - v1.4.10 - 2013-03-02
* https://github.com/kswedberg/jquery-smooth-scroll
* Copyright (c) 2013 Karl Swedberg
* Licensed MIT (https://github.com/kswedberg/jquery-smooth-scroll/blob/master/LICENSE-MIT)
*/
(function(l){function t(l){return l.replace(/(:|\.)/g,"\\$1")}var e="1.4.10",o={exclude:[],excludeWithin:[],offset:0,direction:"top",scrollElement:null,scrollTarget:null,beforeScroll:function(){},afterScroll:function(){},easing:"swing",speed:400,autoCoefficent:2},r=function(t){var e=[],o=!1,r=t.dir&&"left"==t.dir?"scrollLeft":"scrollTop";return this.each(function(){if(this!=document&&this!=window){var t=l(this);t[r]()>0?e.push(this):(t[r](1),o=t[r]()>0,o&&e.push(this),t[r](0))}}),e.length||this.each(function(){"BODY"===this.nodeName&&(e=[this])}),"first"===t.el&&e.length>1&&(e=[e[0]]),e};l.fn.extend({scrollable:function(l){var t=r.call(this,{dir:l});return this.pushStack(t)},firstScrollable:function(l){var t=r.call(this,{el:"first",dir:l});return this.pushStack(t)},smoothScroll:function(e){e=e||{};var o=l.extend({},l.fn.smoothScroll.defaults,e),r=l.smoothScroll.filterPath(location.pathname);return this.unbind("click.smoothscroll").bind("click.smoothscroll",function(e){var n=this,s=l(this),c=o.exclude,i=o.excludeWithin,a=0,f=0,h=!0,u={},d=location.hostname===n.hostname||!n.hostname,m=o.scrollTarget||(l.smoothScroll.filterPath(n.pathname)||r)===r,p=t(n.hash);if(o.scrollTarget||d&&m&&p){for(;h&&c.length>a;)s.is(t(c[a++]))&&(h=!1);for(;h&&i.length>f;)s.closest(i[f++]).length&&(h=!1)}else h=!1;h&&(e.preventDefault(),l.extend(u,o,{scrollTarget:o.scrollTarget||p,link:n}),l.smoothScroll(u))}),this}}),l.smoothScroll=function(t,e){var o,r,n,s,c=0,i="offset",a="scrollTop",f={},h={};"number"==typeof t?(o=l.fn.smoothScroll.defaults,n=t):(o=l.extend({},l.fn.smoothScroll.defaults,t||{}),o.scrollElement&&(i="position","static"==o.scrollElement.css("position")&&o.scrollElement.css("position","relative"))),o=l.extend({link:null},o),a="left"==o.direction?"scrollLeft":a,o.scrollElement?(r=o.scrollElement,c=r[a]()):r=l("html, body").firstScrollable(),o.beforeScroll.call(r,o),n="number"==typeof t?t:e||l(o.scrollTarget)[i]()&&l(o.scrollTarget)[i]()[o.direction]||0,f[a]=n+c+o.offset,s=o.speed,"auto"===s&&(s=f[a]||r.scrollTop(),s/=o.autoCoefficent),h={duration:s,easing:o.easing,complete:function(){o.afterScroll.call(o.link,o)}},o.step&&(h.step=o.step),r.length?r.stop().animate(f,h):o.afterScroll.call(o.link,o)},l.smoothScroll.version=e,l.smoothScroll.filterPath=function(l){return l.replace(/^\//,"").replace(/(index|default).[a-zA-Z]{3,4}$/,"").replace(/\/$/,"")},l.fn.smoothScroll.defaults=o})(jQuery);

107
common/static/sass/_mixins.scss
View File

@@ -1,9 +1,12 @@
// studio - utilities - mixins and extends
// ====================
// font-sizing
@function em($pxval, $base: 16) {
@return #{$pxval / $base}em;
}
@mixin font-size($sizeValue: 1.6){
@mixin font-size($sizeValue: 16){
font-size: $sizeValue + px;
font-size: ($sizeValue/10) + rem;
}
@@ -64,4 +67,106 @@
:-ms-input-placeholder {
color: $color;
}
}
// ====================
// extends - visual
.faded-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 1px;
width: 100%;
}
.faded-hr-divider-medium {
@include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%,
rgba(240,240,240, 1) 50%,
rgba(240,240,240, 0)));
height: 1px;
width: 100%;
}
.faded-hr-divider-light {
@include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.8) 50%,
rgba(255,255,255, 0)));
height: 1px;
width: 100%;
}
.faded-vertical-divider {
@include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 100%;
width: 1px;
}
.faded-vertical-divider-light {
@include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.6) 50%,
rgba(255,255,255, 0)));
height: 100%;
width: 1px;
}
.vertical-divider {
@extend .faded-vertical-divider;
position: relative;
&::after {
@extend .faded-vertical-divider-light;
content: "";
display: block;
position: absolute;
left: 1px;
}
}
.horizontal-divider {
border: none;
@extend .faded-hr-divider;
position: relative;
&::after {
@extend .faded-hr-divider-light;
content: "";
display: block;
position: absolute;
top: 1px;
}
}
.fade-right-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1)));
border: none;
}
.fade-left-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%,
rgba(200,200,200, 0)));
border: none;
}
// extends - ui
.window {
@include clearfix();
@include border-radius(3px);
@include box-shadow(0 1px 1px $shadow-l1);
margin-bottom: $baseline;
border: 1px solid $gray-l2;
background: $white;
}
.elem-d1 {
@include clearfix();
@include box-sizing(border-box);
}
.elem-d2 {
@include clearfix();
@include box-sizing(border-box);
}