Brian Talbot
|
cb456ad228
|
studio - alerts: converted transition-based animation to keyframe/css animation and added in a demo for a fleeting notification
|
2013-02-27 12:45:44 -05:00 |
|
Carlos Andrés Rocha
|
2ca303c95d
|
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
|
2013-02-27 09:02:07 -08:00 |
|
Brian Talbot
|
d09927e8dd
|
studio - alerts: small styling tweaks for the close button on help notifications
|
2013-02-26 12:38:46 -05:00 |
|
Brian Talbot
|
0926395445
|
studio - alerts: added in close buttons and basic JS to control them/moved demo JS to alerts.html page
|
2013-02-26 12:32:20 -05:00 |
|
Brian Talbot
|
95ea01689f
|
studio - alerts: firmed up status-based notifications
|
2013-02-25 16:30:36 -05:00 |
|
Brian Talbot
|
d809df913d
|
studio - alerts: moved all states and documentation into new /alerts view
|
2013-02-25 14:45:27 -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
|
b1f5d67a96
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-22 14:39:49 -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
|
d7bbfbc707
|
studio - alerts: basic layout and general alert styling WIP
|
2013-02-22 13:52:24 -05:00 |
|
Brian Talbot
|
22639adc63
|
studio - alerts WIP
|
2013-02-21 14:31:24 -05:00 |
|
Brian Talbot
|
8b5f088eb9
|
studio - fixed alignment of new section field and controls
|
2013-02-20 16:43:13 -05:00 |
|
Brian Talbot
|
4b850f4da9
|
studio - notifications: made icon/copy area more bulletproof for longer lines of text
|
2013-02-20 16:24:50 -05:00 |
|
Brian Talbot
|
7b60ec380a
|
Merge branch 'master' into feature/cas/manual-policy-merged
|
2013-02-20 14:58:50 -05:00 |
|
Brian Talbot
|
e157fd26c8
|
studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields
|
2013-02-20 14:58:19 -05:00 |
|
Brian Talbot
|
c7f5b74225
|
studio - manual policy editor: converting to new page layout and styling
|
2013-02-20 14:46:54 -05:00 |
|
Brian Talbot
|
ad770a5ec8
|
studio - manual policy editor: converting to new page layout - WIP
|
2013-02-20 14:24:13 -05:00 |
|
Brian Talbot
|
453e249f16
|
studio - manual policy editor: converting to new page layout - WIP
|
2013-02-20 13:54:19 -05:00 |
|
cahrens
|
f91060d197
|
Merge branch 'master' into feature/cas/manual-policy
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/settings/course_grading_policy.js
cms/static/js/views/settings/main_settings_view.js
cms/static/sass/_settings.scss
cms/templates/settings.html
cms/urls.py
|
2013-02-19 13:27:35 -05:00 |
|
Brian Talbot
|
fca98c19a5
|
studio - adding in info icon to page intro help and making icon classes consistent in all new references
|
2013-02-19 12:13:08 -05:00 |
|
Brian Talbot
|
3c6caa611c
|
resolving local merge
|
2013-02-15 14:24:42 -05:00 |
|
Brian Talbot
|
a5e2b5c53a
|
resolving merge conflict and missing Sass mixin
|
2013-02-15 14:10:52 -05:00 |
|
Brian Talbot
|
9feb810006
|
studio - final prep of introduction areas (with fix for current page content margins)
|
2013-02-14 13:16:10 -05:00 |
|
Brian Talbot
|
c81f958788
|
studio - final prep of introduction areas (with fix for current page content margins)
|
2013-02-14 13:00:14 -05:00 |
|
Brian Talbot
|
9b09d043bd
|
studio - adding introduction areas to all templates and infrastructure for its contnet
|
2013-02-14 12:49:58 -05:00 |
|
Brian Talbot
|
1a1be106ae
|
studio - page headers: added in view live links to course dashboard
|
2013-02-14 10:14:10 -05:00 |
|
Brian Talbot
|
2024f9eeca
|
studio - page headers: added view course button to course outline
|
2013-02-14 09:48:19 -05:00 |
|
Brian Talbot
|
6ade6983ae
|
studio - page headers: added in logic to style page actions' height based on title having a subtitle or not
|
2013-02-14 09:38:32 -05:00 |
|
Brian Talbot
|
ff0b85ed0d
|
studio - manual policy editor: revised CodeMirror string color for JSON fields specifically
|
2013-02-14 09:24:16 -05:00 |
|
Brian Talbot
|
41dc655cce
|
resolving local merge conflict
|
2013-02-14 09:03:46 -05:00 |
|
Brian Talbot
|
54cc51bccf
|
studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature
|
2013-02-14 09:02:51 -05:00 |
|
Brian Talbot
|
c250bc8b59
|
studio - page headers: setting up needed future CSS
|
2013-02-13 16:59:56 -05:00 |
|
Brian Talbot
|
e23c99961d
|
studio - page headers: completed basic styling and simple page set-ups
|
2013-02-13 15:03:26 -05:00 |
|
Brian Talbot
|
8ec4c09615
|
local merge conflict resolution
|
2013-02-13 13:41:35 -05:00 |
|
Brian Talbot
|
0af6b991f0
|
studio - nav: generalizing is-selected styling
|
2013-02-13 13:40:46 -05:00 |
|
Brian Talbot
|
e13db29efc
|
resolving merge from feature/btalbot/studio-softlanding
|
2013-02-13 12:42:15 -05:00 |
|
Brian Talbot
|
d3e67be766
|
studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling
|
2013-02-13 12:03:30 -05:00 |
|
Brian Talbot
|
fdd809409f
|
studio - nav: resolved Firefox browser chrome page-shifting bug
|
2013-02-13 11:37:47 -05:00 |
|
Brian Talbot
|
fccb3d7a73
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:36:36 -05:00 |
|
Brian Talbot
|
0a2b74110e
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:03:48 -05:00 |
|
Brian Talbot
|
dd50313f82
|
studio - revised manual policy editor scss to have value field height match key values' and condensed error message UI
|
2013-02-12 15:19:08 -05:00 |
|
Brian Talbot
|
70e11e823c
|
studio - made all page heading chrome have consistent markup
|
2013-02-12 15:07:32 -05:00 |
|
Brian Talbot
|
540710f553
|
studio - nav revamp: added in dynamic course org and number to header
|
2013-02-12 14:22:42 -05:00 |
|
Brian Talbot
|
e5c0bdf7a1
|
studio - added in manual policy editor CodeMirror styles and removed unused classes on CodeMirror instance in other settings tabs
|
2013-02-12 13:13:37 -05:00 |
|
Brian Talbot
|
22b959d657
|
studio - link wiring and spot styling changes for new nav/soft landing/settings work
|
2013-02-12 11:16:37 -05:00 |
|
Brian Talbot
|
8976818c78
|
studio - header UI: in progress markup changes WIP
|
2013-02-12 09:16:24 -05:00 |
|
Brian Talbot
|
8f5d8a98c7
|
studio - resolved sidebar content organization and styling
|
2013-02-11 16:20:25 -05:00 |
|
Brian Talbot
|
2150386a21
|
studio - resolved scss that hid works in progress
|
2013-02-11 16:16:10 -05:00 |
|
Brian Talbot
|
715cea51a4
|
studio - resolved scss that relied on old body classes
|
2013-02-11 16:09:33 -05:00 |
|
Brian Talbot
|
707e781148
|
studio - manual policy editor: stubbed in notification UI and testing code
|
2013-02-11 15:16:45 -05:00 |
|