Commit Graph

764 Commits

Author SHA1 Message Date
Brian Talbot
3c3a6e7503 studio - adding in view-based banners UI tweaks and removing global banner UI for now 2013-04-04 16:46:38 -04:00
Brian Talbot
9ab5710a2a studio - removing unused footer-height variable 2013-04-04 15:32:42 -04:00
Brian Talbot
8e67f63eb6 studio - syncing up hover color of sock control with other buttons 2013-04-04 15:27:02 -04:00
Brian Talbot
ea1387a5f9 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-03 15:50:00 -04:00
Brian Talbot
e3d35afb7a studio - changing visual padding around alerts 2013-04-03 15:49:26 -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
eb6f2d8c09 studio - revising outline layout per date changes and gradable status UI issue 2013-04-03 15:22:27 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio
Fix due date bug.
2013-04-03 10:26:40 -07:00
Brian Talbot
2b749b9728 studio - tweaking the depth/shadow on the help sock UI 2013-04-03 09:00:56 -04:00
Brian Talbot
bf82af9db6 Merge branch 'master' into feature/btalbot/studio-helpsock 2013-04-02 15:40:41 -04:00
Brian Talbot
6952b8e63b studio - revising design, interaction, and FED of help sock 2013-04-02 15:37:49 -04:00
Brian Talbot
8b9ecd9367 studio - reverting footer UI to existing 2013-04-02 12:53:11 -04:00
Brian Talbot
899714a3c2 studio - resolving broken nav width 2013-04-02 10:19:17 -04:00
Brian Talbot
769e209091 resolving local merge 2013-04-01 16:56:11 -04:00
Brian Talbot
57e5eb683b studio - basic design, interaction, and content for static in-page help 2013-04-01 16:54:56 -04:00
Christina Roberts
ac180ca2b9 Merge pull request #1765 from MITx/feature/btalbot/studio-tenderwidget
Adding in reference and UI for Tender discussion submission widget
2013-04-01 13:17:06 -07:00
cahrens
42b4ffdcf9 Cleanup. 2013-04-01 13:40:32 -04:00
Brian Talbot
9c2dbb91b4 studio - resolving a bug where JQUI sets the z-index of our datepickers to 1, which is less than our dynamic tooltips, causing visual display/access issues. 2013-04-01 10:34:31 -04:00
Brian Talbot
2cd8f448f7 studio - resolving merge with tender widget branch 2013-03-28 12:48:42 -04:00
Brian Talbot
bc248a1d4a studio - tender widget: revised styling with spam protection back in place 2013-03-28 12:47:08 -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
754e30240d studio - adjusting tender widget window height based on field removal 2013-03-27 11:01:25 -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
7e56e98c58 firming up behavior/styling for tender widget - including errors 2013-03-26 14:46:38 -04:00
Brian Talbot
7c68508b85 studio - finalized tender widget styling 2013-03-26 12:42:30 -04:00
Brian Talbot
87f545329a studio - adding in tender-widget sass file 2013-03-26 11:05:33 -04:00
Brian Talbot
175e1b46e9 studio - in progress styling of tender help widget 2013-03-26 08:32:49 -04:00
Brian Talbot
66ba0f9b81 studio - resolving local merge with master 2013-03-25 15:21:25 -04:00
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