Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,908 Commits 1 Branch 0 Tags
8a89309338fce8564cf3554466e500844b178d66
Commit Graph

138 Commits

Author SHA1 Message Date
Calen Pennington
8a89309338 Merge branch 'master' into asset-pipeline 
Conflicts:
	static/js/application.js
 2012-05-21 14:53:16 -04:00
Edward Loveall
4b842e7ac8 Adds ARIA labels to page elements 
This includes calculator open/close button, navigation, profile, and
book's table of content.
 2012-05-21 11:23:55 -04:00
Calen Pennington
d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! 2012-05-18 15:37:57 -04:00
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00
Kyle Fiedler
ba8fb95d72 added fix for lists in updates 2012-05-17 16:55:44 -04:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline 
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
 2012-05-17 16:32:39 -04:00
Prem Sichanugrist
5c82af3a5c Update files after use guard to compile sources 2012-05-17 15:41:47 -04:00
Galen Frechette
cb8224cbcd cleans up visual style of accordion and sidebar links and fixes border alignment issues 2012-05-17 11:47:28 -04:00
Galen Frechette
2bb7a77d01 changes the border and box-shadow of headings in courseware content so bottom border is not hidden 2012-05-17 09:08:51 -04:00
Galen Frechette
1652ec38de changes text color of highlited section in courseware index from red to black 2012-05-17 09:06:16 -04:00
Galen Frechette
2d7e36b409 improves communication of current selection in the courseware index sidebar 2012-05-17 09:06:16 -04:00
Galen Frechette
2b4437c951 handles the case of no title or sub title in the courseware index links 2012-05-17 09:06:16 -04:00
Galen Frechette
12eb7cf6f3 wip more defined week headings 2012-05-17 09:06:15 -04:00
Galen Frechette
825cf0e03e wip better communication of current page in course ware 2012-05-17 09:06:15 -04:00
Kyle Fiedler
e45eb9fbe1 minor fixes for IE bugs 2012-05-16 17:16:40 -04:00
Edward Loveall
5148746d0a Fixes border radius overflow issue on course content wrapper 2012-05-16 14:48:53 -04:00
Kyle Fiedler
b17d83a459 Cleaned up unused functions now in bourbon and unused variables 2012-05-16 10:45:31 -04:00
Kyle Fiedler
60bd63a594 Removed print.scss, moved index to marketing, started to alphabatize 2012-05-15 16:55:53 -04:00
Galen Frechette
d0a7326738 refactors some of the sequence nav styles 2012-05-15 16:34:21 -04:00
Galen Frechette
709faa4718 makes the sequence nav more semantic and replaces js hover with css 2012-05-15 16:00:27 -04:00
Kyle Fiedler
89afc98f76 Made links in sidebar all in p> 2012-05-14 16:39:44 -04:00
Isaac Chuang
232e758c7a Integrating some of Ike's courseware changes 2012-05-13 19:36:01 -04:00
Piotr Mitros
0028b3345e jsonify in postJSON from multiple choice did -- indeed -- break things. Removed. 2012-05-11 14:02:09 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Lyla Fischer
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -04:00
Lyla Fischer
13a095fc1e checkboxes 2012-05-07 21:04:10 -04:00
Kyle Fiedler
24b6636a62 Fix issue with calculator zindex 2012-05-02 13:51:37 -04:00
Kyle Fiedler
4cc3e30d94 Redesign sequence bottom arrows 2012-05-02 13:46:48 -04:00
Reda Lemeden
2992fb3dab Added edX logo to announecment 2012-05-01 19:08:48 -04:00
Reda Lemeden
8178acaa53 Removed sass/css comments 2012-05-01 16:34:41 -04:00
Reda Lemeden
2fb6b56ca4 Added the edx announcement to the MITx marketing page + Other content updates 2012-05-01 10:13:01 -04:00
Kyle Fiedler
83f4e1eda3 Added fix for the bottom sequnce navigation 2012-04-27 16:55:42 -04:00
Kyle Fiedler
bd56116b33 Fix calculator zindex issue 2012-04-27 16:25:42 -04:00
Kyle Fiedler
28a9e51348 Merge branch 'kf-amplifier' 2012-04-27 14:32:38 -04:00
Kyle Fiedler
7f6481b9f1 Fixed som issues with the calculator with ios 2012-04-27 14:29:33 -04:00
Kyle Fiedler
8f22127d45 Fix bugs with video player list styles 2012-04-27 10:21:13 -04:00
Kyle Fiedler
128ba351a6 Added better styles for play button 2012-04-26 17:02:07 -04:00
Kyle Fiedler
89fbd4611b Fixed margin padding issue for top of sliders 2012-04-26 16:58:04 -04:00
Kyle Fiedler
bd8adcce97 Added styles for tabs 2012-04-26 16:52:47 -04:00
Kyle Fiedler
b7cf6438e4 added generated css 2012-04-26 14:02:56 -04:00
Kyle Fiedler
38422b2c50 Shortened first column for controls 2012-04-26 14:01:19 -04:00
Kyle Fiedler
c858ab0342 Added some slight text modification for amplifier 2012-04-26 14:01:19 -04:00
Kyle Fiedler
3464e8bca9 More tweeks to the amp 2012-04-26 14:01:19 -04:00
Kyle Fiedler
6362977ace Added some small tweeks to the amplifier 2012-04-26 14:01:19 -04:00
Kyle Fiedler
954397be34 More tweeks for the amplifier 2012-04-26 14:01:18 -04:00
Kyle Fiedler
32f154d7fb Added new styles for amplifier 2012-04-26 14:01:18 -04:00
Reda Lemeden
74613b1f62 Merge pull request #16 from MITx/kf-tutorials 
Added new styles for tutorials
 2012-04-26 10:49:47 -07:00
Kyle Fiedler
05196249c1 Important :/ 2012-04-26 13:33:27 -04:00
Kyle Fiedler
eef6fee0dd added styles to fix bullets showing up in sequence nav 2012-04-26 13:31:28 -04:00
Kyle Fiedler
7771c1d1de Added styles for headers for tutorials 2012-04-26 13:29:28 -04:00