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

45 Commits

Author SHA1 Message Date
Brian Talbot
e41214b1ed Studio: revises the styling for the export view to sync with the import view's UI 2013-11-01 16:01:11 -04:00
Brian Talbot
3a639ece1f updating Neat generated utility files 2013-10-18 11:35:25 -04:00
Frances Botsford
4b49a6514e fix for missing sass variable for LTI 2013-10-15 10:40:12 -04:00
cahrens
61cfb91218 Cleanup to drag and drop implementation. 
Also includes RequireJS changes.

Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
 2013-10-07 17:18:40 -04:00
Brian Talbot
8815962356 Studio: Converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-18 14:14:11 -04:00
Brian Talbot
611dab077f Studio: places 'add team member' call to course team view 2013-07-29 17:29:15 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship 
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
 2013-07-22 12:15:42 -04:00
Brian Talbot
388724c485 Studio: updates Sass mixins/extend references based on textbook/Sass cleanup 2013-07-15 10:12:51 -04:00
Brian Talbot
34e9a21da8 Studio: renames and simplifies .cont-trucated Sass extend 2013-07-15 10:12:50 -04:00
Brian Talbot
91a6e34769 Studio: adds further comment/prefix revisions to Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
88d06a16e5 Studio: renames and re-orgs app-wide Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
c75041e168 Studio: adds in disabled/submitting state and logic for course creation button 2013-07-12 14:25:32 -04:00
Peter Fogg
6e94960488 Fix many validation bugs and failing tests. 2013-07-11 16:09:59 -04:00
Frances Botsford
a0962cc3b9 updated sass transitions to use newer bourbon syntax 2013-07-10 09:18:00 -04:00
Brian Talbot
d046fdf743 resolves local Sass warnings/errors around missing mixins referenced in xmodule styling 2013-07-10 09:17:59 -04:00
Brian Talbot
41d9fa3785 Studio: syncs up syntax, ordering, and timing for all Sass transition mixins 2013-07-10 09:17:59 -04:00
David Baumgold
40585b2bbb Added neat grid framework 
http://neat.bourbon.io/
 2013-07-10 09:17:58 -04:00
David Baumgold
5bd79a8669 Changed @include box-shadow() to box-shadow 
Bourbon's box-shadow mixin has been deprecated, and they recommend to use the
official spec.
 2013-07-10 09:17:58 -04:00
David Baumgold
41374838cb Changed @include border-radius() to border-radius 
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
 2013-07-10 09:17:58 -04:00
David Baumgold
1388684194 Sass 3.2.9, Bourbon 3.1.8 2013-07-10 09:17:58 -04:00
Frances Botsford
6814163a45 cleanup and tweaks from feeback to PDF Textbooks FED and Sass 2013-07-09 19:16:44 -04:00
Frances Botsford
2321a2c563 more updates to PDF textbook UI 2013-07-09 19:16:09 -04:00
David Baumgold
33a78eaeb7 Fix missing } from bad rebase 2013-07-09 19:16:05 -04:00
Frances Botsford
e237cdca84 round 2 on html and sass for textbook upload 2013-07-09 19:15:59 -04:00
Frances Botsford
9d59a1313c initial html and sass for textbook upload 2013-07-09 19:15:59 -04:00
Brian Talbot
b7b2f91e79 studio - revising the visual design of UI well pattern 2013-06-20 12:30:25 -04:00
Brian Talbot
d2f0d85085 studio - adds in basic rules for notices UI 2013-06-19 18:09:09 -04:00
Brian Talbot
31b5c4ab61 studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet 2013-05-20 15:20:17 -04:00
Brian Talbot
8b77111d58 Studio: more styling changes 
typography, SASS, imports
 2013-05-14 17:16:53 -04:00
Brian Talbot
f069c1a1a1 Studio: style reorg 
typography, SASS import, mixins/extends
 2013-05-14 17:15:07 -04:00
Brian Talbot
7051a94e7b resolved local master merge conflicts with studio sass 2013-03-21 16:15:19 -04:00
Brian Talbot
caae29a8ac studio - fixing a default mixin value used when defining font-size for elements 2013-03-21 12:21:02 -04:00
Brian Talbot
786ffd1092 studio - further small cleanup on Sass 2013-03-08 12:44:24 -05:00
Brian Talbot
3b2c970248 studio - reorganized and documented used Sass for studio 2013-03-08 11:47:11 -05:00
Brian Talbot
bb24a079a1 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:28:13 -05:00
Brian Talbot
f1ad05059c studio - correcting an image-replacement Sass mixin 2013-02-13 09:18:23 -05:00
Brian Talbot
1b679750ad studio - settings: more revamp of tabs to views WIP 2013-02-08 12:36:21 -05:00
Brian Talbot
b456281a8f studio - soft landing/nav: added in functionality/content to soft landing view and started punch list 2013-02-05 11:34:28 -05:00
Brian Talbot
1144b0eeed studio - soft landing UI: initial header and templating work 2013-02-03 22:22:11 -05:00
Brian Talbot
83ad950887 studio - revised course nav: plumbed in current html and scss progress into header 2013-02-01 20:48:59 -05:00
Brian Talbot
d0d0296310 studio - revising course-based navigation - initial scss setup 2013-02-01 19:57:17 -05:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Calen Pennington
4381674ec5 Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms 2012-10-01 15:17:40 -04:00
Calen Pennington
d240b5b1eb Consolidate bourbon and link to it from both cms and lms 2012-10-01 15:17:40 -04:00