cahrens
|
39714a17d9
|
Merge branch 'master' into bug/christina/cursor-move
Conflicts:
cms/static/js/base.js
|
2013-03-22 16:03:52 -04:00 |
|
cahrens
|
eebef1e647
|
Don't save subsection and unit names until the change event. Fixes bugs #18 and #228.
|
2013-03-22 15:32:13 -04:00 |
|
Brian Talbot
|
7051a94e7b
|
resolved local master merge conflicts with studio sass
|
2013-03-21 16:15:19 -04:00 |
|
cahrens
|
0a063342cf
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
|
2013-03-21 13:56:32 -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
|
67c6852b5c
|
studio - checklists: removing not needed sass variable for animating height
|
2013-03-21 10:01:39 -04:00 |
|
Brian Talbot
|
3b80a90bd0
|
studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss
|
2013-03-20 16:54:14 -04:00 |
|
Brian Talbot
|
994ced3c61
|
studio - notifications: organizing base variables
|
2013-03-20 16:34:21 -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
|
c901cecdea
|
studio - tender widget: added compromise of style given iframe and clunky DOM elements that tender is using. meh.
|
2013-03-18 16:23:30 -04:00 |
|
cahrens
|
49ee903eda
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
|
2013-03-18 15:30:19 -04:00 |
|
Brian Talbot
|
16f9f6ef4f
|
studio - tender widget: added initial reference and behavior
|
2013-03-18 13:15:01 -04:00 |
|
Brian Talbot
|
cdcdfd49e0
|
studio - alerts: resolving local master merge conflcits
|
2013-03-18 10:58:16 -04:00 |
|
Brian Talbot
|
a1ba97376a
|
studio - sass cleanup: further revisions and box-sizing all elements for consistency
|
2013-03-16 12:18:35 -04:00 |
|
Brian Talbot
|
06b118ae33
|
studio - sass cleanup: resolved static pages display issue after local merge master
|
2013-03-15 15:23:03 -04:00 |
|
Brian Talbot
|
84a5475d5a
|
studio - sass cleanup: resolving conflicts with local master merge
|
2013-03-15 12:42:33 -04:00 |
|
Brian Talbot
|
97b44446a0
|
studio - checklists: added animation to collapse/expand toggle
|
2013-03-14 16:30:48 -04:00 |
|
Brian Talbot
|
13c38fa173
|
studio - checklists: revised input/label HTML and adjusted styling for each
|
2013-03-14 16:17:47 -04:00 |
|
Brian Talbot
|
0aea85a4d9
|
studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators
|
2013-03-14 12:55:44 -04:00 |
|
Brian Talbot
|
7b74d972a1
|
studio - checklists: defaulting checklist visual progress to 0%
|
2013-03-13 19:18:47 -04:00 |
|
Brian Talbot
|
16f6744aef
|
studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states
|
2013-03-13 19:13:26 -04:00 |
|
Brian Talbot
|
bf71f099d4
|
studio - checklists: finished static styling, initial checklist content import, and some basic JS
|
2013-03-13 14:09:18 -04:00 |
|
Brian Talbot
|
66a8735a58
|
studio - Checklists: initial design and front end proofing/firming up - WIP
|
2013-03-13 10:50:34 -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
|
82a00104c2
|
studio - settings: revised markup and styling around disabled/readonly fields
|
2013-03-11 12:24:43 -04:00 |
|
Brian Talbot
|
603d11577f
|
studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI
|
2013-03-11 11:40:36 -04:00 |
|
Brian Talbot
|
72a7ec9e07
|
studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata
|
2013-03-11 11:31:48 -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
|
786ffd1092
|
studio - further small cleanup on Sass
|
2013-03-08 12:44:24 -05:00 |
|
Brian Talbot
|
e9a2413c04
|
studio - further small cleanup on Sass
|
2013-03-08 12:35:28 -05:00 |
|
Brian Talbot
|
6418d033dd
|
studio - adding files I forgot to add when cleaning up Sass and originally committing
|
2013-03-08 12:20:40 -05:00 |
|
Brian Talbot
|
3b2c970248
|
studio - reorganized and documented used Sass for studio
|
2013-03-08 11:47:11 -05:00 |
|
Brian Talbot
|
62514d85a3
|
studio - alerts: loosely wired advanced settings with new notification and alert messages
|
2013-03-06 15:36:38 -05:00 |
|
Brian Talbot
|
9a7b6c7eaf
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-06 15:04:34 -05:00 |
|
Arthur Barrett
|
c9b2a6a203
|
updated CSS to use the new advanced icon
|
2013-03-05 10:52:39 -05:00 |
|
Brian Talbot
|
cbdf9ea25b
|
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
|
2013-03-05 09:57:14 -05:00 |
|
Brian Talbot
|
cc3b9557f9
|
studio - open ended and annotations: added in component button icon assets and styling
|
2013-03-04 17:02:59 -05:00 |
|
Brian Talbot
|
eb1658730a
|
studio - alerts: revised border styling on all elements and button/color inheritance
|
2013-03-04 12:30:04 -05:00 |
|
Brian Talbot
|
72c58cd454
|
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
|
2013-03-03 20:44:48 -05:00 |
|
Brian Talbot
|
bc0b1b0958
|
studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working
|
2013-03-02 22:06:55 -05:00 |
|
Vik Paruchuri
|
f8b0338dee
|
Change name of annotatable, add in sass for advanced module
|
2013-03-01 16:26:48 -05:00 |
|
Brian Talbot
|
8552b2d614
|
local merge with master - WIP
|
2013-03-01 15:47:23 -05:00 |
|
Brian Talbot
|
ad70581b80
|
studio - alerts: more progress including prompts
|
2013-03-01 15:43:07 -05:00 |
|
Vik Paruchuri
|
9f020e228b
|
Add in some dummy values
|
2013-03-01 14:50:40 -05:00 |
|
Brian Talbot
|
73ae818958
|
studio - fixing padding of codeMirror fields to match height of others given new line height
|
2013-02-27 13:08:56 -05:00 |
|
Brian Talbot
|
cdd6ce708e
|
studio - reducing line height for codemirror JSON lines
|
2013-02-27 13:07:58 -05:00 |
|
Brian Talbot
|
524f48b68e
|
studio - fixing padding of codeMirror fields to match height of others given new line height
|
2013-02-27 13:03:36 -05:00 |
|
Brian Talbot
|
45520fe124
|
studio - fixing line heights not syncing with code mirror lines and cursor
|
2013-02-27 12:59:25 -05:00 |
|