Commit Graph

73 Commits

Author SHA1 Message Date
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
Brian Talbot
7b75703556 resolving Sass issues caused by previous merge conflict resolution in branch 2013-01-03 11:44:09 -05:00
Don Mitchell
4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor
Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html
2013-01-02 17:39:27 -05:00
Brian Talbot
59f1b1d1f5 styling - re-aligned unit controls for unit editing and styled standard delete button 2012-12-13 15:15:30 -05:00
Brian Talbot
69c26a08e3 settings/style - general UI clean up - wip 2012-12-13 13:06:56 -05:00
Tom Giannattasio
2be1f852e7 clean up of users page 2012-12-13 11:28:59 -05:00
Tom Giannattasio
5b81d6b8cc cleaned up subsection and unit page 2012-12-13 11:28:59 -05:00
Tom Giannattasio
052b6f695a cleaned up editor styles; cleaned up static tabs page 2012-12-13 11:26:10 -05:00
Tom Giannattasio
39a882e278 more defined header, new icons, cleaner static tabs page 2012-12-13 11:25:15 -05:00
Tom Giannattasio
95dfc730dc new header styles; collapse all button added to courseware 2012-12-13 11:20:30 -05:00
Tom Giannattasio
8294b05802 style tweaks to tabs and static pages; key bindings for new user form 2012-12-13 11:20:30 -05:00
Tom Giannattasio
197ea33235 tweaked body color and window styles; adjusting new buttons 2012-12-13 11:20:30 -05:00
Tom Giannattasio
74ce3d225f removed new course button on click to prevent multiple instantiations 2012-12-13 11:19:22 -05:00
Brian Talbot
a3579e3183 added in basic styles and plug-in reference for tool tip UI across Studio + Courseware Overview tool tip text 2012-12-10 13:02:55 -05:00
Tom Giannattasio
6cfabb76c1 finished styling for static tabs; required some rework of global styles 2012-11-28 15:39:43 -05:00
Tom Giannattasio
6ad8a9aced most of the styling and function changes made 2012-11-28 15:10:46 -05:00
Tom Giannattasio
b38072207e primary tiny mce integration 2012-11-20 07:19:34 -05:00
Tom Giannattasio
44fb9561e8 added a ton of speed editor goodness 2012-11-20 07:19:33 -05:00
Calen Pennington
4005cbf455 Hide/show wips w/ press of 'w' key 2012-10-12 15:11:02 -04:00
Tom Giannattasio
c7cdaf8080 styled import page 2012-10-12 11:58:43 -04:00
Tom Giannattasio
fec710abde added edge logo; added edge temp landing page 2012-10-11 12:29:14 -04:00
Calen Pennington
bfb49133d1 Merge pull request #843 from MITx/feature/cdodge/subsection-edit-page
Feature/cdodge/subsection edit page
2012-10-10 10:26:27 -07:00
Calen Pennington
7ccdc5d42a Grey out inactive items when changing state in unit editing view 2012-10-10 12:49:52 -04:00
Tom Giannattasio
002f813b75 pulled spinner out into its own class in case we need to add it directly 2012-10-09 15:28:53 -04:00
Chris Dodge
d57aa31545 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-09 10:32:17 -04:00
Chris Dodge
20a8395f4f add/remove policy data from subsection 2012-10-09 10:32:12 -04:00
Tom Giannattasio
446915189f added toast notification styles and basic js implementation 2012-10-09 09:15:10 -04:00
Tom Giannattasio
24247dc0b9 cross-browser css3 2012-10-05 10:29:36 -04:00
Tom Giannattasio
3bb5a003bc asset library styles 2012-10-03 11:26:30 -04:00
Tom Giannattasio
423dbd17b5 new unit publish settings 2012-10-02 10:40:05 -04:00
Tom Giannattasio
8f0b068459 styled log in form 2012-10-01 16:30:28 -04:00
Calen Pennington
60e7914580 Add WIP markers 2012-10-01 15:28:12 -04:00
Calen Pennington
96a914216c Fix up overview page with new design mockup 2012-10-01 15:28:12 -04:00
Calen Pennington
2ad7b11f6a Make padding correct on unit page 2012-10-01 15:28:12 -04:00
Calen Pennington
805798600b Clean up display of templates 2012-10-01 15:19:35 -04:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Calen Pennington
dc062f5668 Make edit and delete buttons show up on cms unit editing page 2012-10-01 15:17:41 -04:00
Calen Pennington
f53217e523 Add padding around courseware content 2012-10-01 15:17:40 -04:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 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
Calen Pennington
d534855b54 Make the overview page pull data from the db, rather than static content 2012-10-01 15:16:30 -04:00
Calen Pennington
ea8ab0f809 Add basic overview.html from tom's wireframe to CMS 2012-10-01 15:12:29 -04:00
Calen Pennington
0492c8e3bd Enable wip flag 2012-09-18 13:17:52 -04:00
Calen Pennington
0758d21d6a Re-enable wip markers in cms css 2012-09-18 10:44:12 -04:00
Kyle Fiedler
7a248f0154 Added fixes to some style and one Cale fix to get things working properly 2012-09-11 14:05:07 -04:00
Kyle Fiedler
8a112b0cca Added fix for cms sass 2012-08-21 16:01:48 -04:00
Kyle Fiedler
20d9e6e86d Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red 2012-08-20 15:45:05 -04:00
Kyle Fiedler
6c3ec99f9e Start to change to ems and remove all of cream 2012-08-01 17:36:10 -04:00
Kyle Fiedler
44168deffc Added styles for buttons 2012-07-30 09:51:50 -04:00
Kyle Fiedler
270f0f3ae4 Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:50 -04:00