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 |
|