Brian Talbot
45b9155e4b
studio - adds in Font Awesome typeface, styling, and Sass import reference
2013-05-22 15:55:46 -04:00
Brian Talbot
f069c1a1a1
Studio: style reorg
...
typography, SASS import, mixins/extends
2013-05-14 17:15:07 -04:00
Calen Pennington
729daf5cbf
Move xmodule asset gathering out of server startup
...
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Brian Talbot
512e4fe3bd
resolving local merge with master and sprucing style and templates for merge with master
2013-04-05 15:13:21 -04:00
Christina Roberts
33d39a85a9
Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock
...
Studio Help Sock
2013-04-05 11:37:57 -07:00
Brian Talbot
ea1387a5f9
Merge branch 'master' into feature/btalbot/studio-alerts
2013-04-03 15:50:00 -04:00
Brian Talbot
b0021e7346
studio - resolved z-index issue with release date modal and JQUI timepicker + conslidated all vendor styling overrides/extensions
2013-04-03 15:35:22 -04:00
Brian Talbot
d87c4e3866
resolving local merge with master
2013-04-03 15:01:55 -04:00
Brian Talbot
57e5eb683b
studio - basic design, interaction, and content for static in-page help
2013-04-01 16:54:56 -04:00
Brian Talbot
c8ab45cc57
studio - footer help ui revamp - animation, structure, styling - WIP
2013-03-27 17:40:24 -04:00
Brian Talbot
756f75951d
studio - in progress work on help UI
2013-03-27 16:28:49 -04:00
Brian Talbot
6889b2015b
studio - added in revised footer styles and fix for smoothscroll
2013-03-27 01:24:31 -04:00
Brian Talbot
175e1b46e9
studio - in progress styling of tender help widget
2013-03-26 08:32:49 -04:00
Brian Talbot
7051a94e7b
resolved local master merge conflicts with studio sass
2013-03-21 16:15:19 -04:00
cahrens
8ca6e324af
Merge branch 'master' into feature/btalbot/studio-checklists
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/sass/base-style.scss
cms/urls.py
2013-03-21 12:23:13 -04:00
Brian Talbot
8cf2cc6f78
studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles
2013-03-20 10:42:35 -04:00
Brian Talbot
1b5f040021
studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI
2013-03-12 21:57:40 -04:00
Brian Talbot
a496cc0a1e
studio - Sass Cleanup: moved all page/view specific css to their own views and created forms specific sheet
2013-03-11 13:28:28 -04:00
Brian Talbot
7a9fdb9069
studio - sass clean up: in progress business with git ignore issues
2013-03-11 11:04:43 -04:00
Brian Talbot
3bc73de1b4
studio - changed order of Sass import to account for variables needed in architecture
2013-03-08 12:56:00 -05:00
Brian Talbot
e9a2413c04
studio - further small cleanup on Sass
2013-03-08 12:35:28 -05:00
Brian Talbot
3b2c970248
studio - reorganized and documented used Sass for studio
2013-03-08 11:47:11 -05:00
Brian Talbot
8179b9fadc
studio - alerts: initial pass at alert styling and markup complete
2013-02-25 14:19:22 -05:00
Brian Talbot
ecbe297936
studio - soft landing UI: how it works pathing, html and basic layout styling
2013-02-04 09:39:36 -05:00
Brian Talbot
5a1795db85
studio - soft landing UI: basic signin/sign up styling and sign up markup/templating
2013-02-04 00:19:26 -05:00
Brian Talbot
1144b0eeed
studio - soft landing UI: initial header and templating work
2013-02-03 22:22:11 -05:00
Brian Talbot
d0d0296310
studio - revising course-based navigation - initial scss setup
2013-02-01 19:57:17 -05:00
Brian Talbot
ed3f3b02d6
studio - course export UI alpha - roughing in states/views
2012-12-26 09:10:05 -05:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
Tom Giannattasio
a98cead8ee
added basic lms styles
2012-11-20 13:02:08 -05:00
Tom Giannattasio
d68945de33
started adding settings page
2012-10-30 15:04:21 -04:00
Tom Giannattasio
f10d1773c7
added open sans pull
2012-10-15 14:44:53 -04:00
Tom Giannattasio
c7cdaf8080
styled import page
2012-10-12 11:58:43 -04:00
Chris Dodge
14a1a7da31
allow importing of .tar.gz packages of courseware
2012-10-12 10:33:31 -04:00
Tom Giannattasio
b685af44eb
started calendar styles
2012-10-11 14:53:45 -04:00
Tom Giannattasio
fec710abde
added edge logo; added edge temp landing page
2012-10-11 12:29:14 -04:00
Tom Giannattasio
07ac0d0642
styled/tweaked users page
2012-10-10 15:46:59 -04:00
Tom Giannattasio
4c50f13e99
added templates/styles for static pages
2012-10-09 14:47:15 -04:00
Tom Giannattasio
6b4d9ba0cd
setup landing template
2012-10-03 17:26:14 -04:00
Tom Giannattasio
44d4a4b0d9
started asset library template -wip
2012-10-02 17:02:47 -04:00
Tom Giannattasio
8478f7af64
styled course list page
2012-10-01 16:37:24 -04:00
Tom Giannattasio
8f0b068459
styled log in form
2012-10-01 16:30:28 -04:00
Calen Pennington
96a914216c
Fix up overview page with new design mockup
2012-10-01 15:28:12 -04: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
44805ca383
Make discussion js work for cms as well as lms so that inline discussion xmodules load
2012-10-01 15:16:54 -04:00
Calen Pennington
ea8ab0f809
Add basic overview.html from tom's wireframe to CMS
2012-10-01 15:12:29 -04:00
Kyle Fiedler
d53e4bd38f
Added more styles includeing the index page more color changes and header styles
2012-07-30 09:51:49 -04:00
Calen Pennington
8a0270ea2b
Allow for modular css from XModules, and split capa module css out as a test
2012-07-24 16:14:04 -04:00
Kyle Fiedler
8a4d860a1e
put normalize in vendor folder
2012-07-09 11:26:46 -04:00
