cahrens
|
c8eeea240b
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 16:27:11 -04:00 |
|
cahrens
|
4facd262bd
|
Jasmine test for metadata model.
|
2013-05-20 16:26:48 -04:00 |
|
marco
|
3cf915005b
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 15:22:31 -04:00 |
|
marco
|
79c78cbccd
|
made firefox input number increment objects positioned as % to respond to page size accordingly
|
2013-05-20 15:22:21 -04:00 |
|
cahrens
|
4d7c7f866a
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-20 15:06:40 -04:00 |
|
marco
|
7641e128de
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 14:39:50 -04:00 |
|
marco
|
c0cff81e5e
|
styled firefox number buttons
|
2013-05-20 14:39:37 -04:00 |
|
cahrens
|
25388dec96
|
Minor cleanup.
|
2013-05-20 13:31:55 -04:00 |
|
cahrens
|
2020923f2d
|
Prevent invalid numeric entries.
|
2013-05-20 13:26:27 -04:00 |
|
marco
|
c356904027
|
css styles for firefox input number fields
|
2013-05-20 12:06:30 -04:00 |
|
cahrens
|
3229aaf503
|
Call polyfill at right time.
|
2013-05-20 11:16:20 -04:00 |
|
marco
|
aa41aed9d1
|
prototype for polyfill on number input fields, minimal styling to up down buttons
|
2013-05-20 09:45:33 -04:00 |
|
Brian Talbot
|
bf8df49728
|
studio - revising line height between course nav titles and prefixes
|
2013-05-20 08:40:28 -04:00 |
|
Brian Talbot
|
098a5dda48
|
studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing
|
2013-05-20 08:39:18 -04:00 |
|
cahrens
|
b16e17a250
|
Some i18n work and other minor cleanup.
|
2013-05-17 14:57:25 -04:00 |
|
Frances Botsford
|
e69b5c4792
|
adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over
|
2013-05-17 14:07:06 -04:00 |
|
Brian Talbot
|
85f2be44b5
|
studio - resolves line-height issue that core typography settings creates with tooltip rendering
|
2013-05-17 10:46:58 -04:00 |
|
marco
|
1f43fa163a
|
internationalization stripped out
|
2013-05-17 10:29:24 -04:00 |
|
marco
|
29b7778461
|
initial i18n changes to unit.html, component.html, and the individual setting type template files
|
2013-05-16 17:17:43 -04:00 |
|
marco
|
f58deb4c3c
|
removed latex compiler buttom from settings tab
|
2013-05-16 15:42:29 -04:00 |
|
cahrens
|
01ff8396e3
|
Fix CodeMirror initialization problem.
|
2013-05-16 12:34:39 -04:00 |
|
cahrens
|
235ecff28b
|
In progress.
|
2013-05-16 10:40:48 -04:00 |
|
marco
|
ef14155306
|
cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill
|
2013-05-16 09:50:16 -04:00 |
|
marco
|
bbb6a3c60d
|
resolved metadata-edit conflict, adding in latex item into settings
|
2013-05-15 16:27:04 -04:00 |
|
marco
|
12dae84a07
|
commented out firefox polyfill ad well as xmodule css editor changes
|
2013-05-15 16:07:45 -04:00 |
|
Brian Talbot
|
d1c629882c
|
studio - fixes Sass variable defintion to ensure the older -serif references the proper new -sans-serif variable
|
2013-05-15 15:42:59 -04:00 |
|
cahrens
|
c85cc5a3a7
|
Fix bad merge.
|
2013-05-15 15:35:18 -04:00 |
|
cahrens
|
d72b6b05bf
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
cms/static/sass/views/_static-pages.scss
|
2013-05-15 15:29:27 -04:00 |
|
cahrens
|
724678dd3e
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 15:26:02 -04:00 |
|
marco
|
ba11d37ba9
|
clear button to match help icon visually
|
2013-05-15 13:58:08 -04:00 |
|
marco
|
2f8e8f4881
|
border around course introduction which was lost in code mirror styling for component editors
|
2013-05-15 13:50:19 -04:00 |
|
marco
|
cbdadaee1d
|
updates moved slightly, will not use new styling
|
2013-05-15 13:39:38 -04:00 |
|
cahrens
|
305b555d63
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 13:33:41 -04:00 |
|
marco
|
b3e41d19f6
|
styling for static pages updated
|
2013-05-15 13:29:35 -04:00 |
|
marco
|
0422350e8c
|
final changes to codemirror styling, and clean up style for settings button clearing
|
2013-05-15 12:05:43 -04:00 |
|
cahrens
|
06d315484f
|
Set "editing" name.
|
2013-05-15 11:52:38 -04:00 |
|
marco
|
5f4bded3db
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 11:41:24 -04:00 |
|
marco
|
56df114edb
|
style changes to component header
|
2013-05-15 11:41:19 -04:00 |
|
cahrens
|
a16740691f
|
Minor update.
|
2013-05-15 11:39:07 -04:00 |
|
cahrens
|
4152e4602d
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
Conflicts:
cms/static/coffee/src/views/module_edit.coffee
|
2013-05-15 11:36:32 -04:00 |
|
cahrens
|
faf31d9728
|
Get toggling between Editor and Settings working.
|
2013-05-15 11:34:49 -04:00 |
|
marco
|
63960ee4a2
|
style change for is-set
|
2013-05-15 11:26:34 -04:00 |
|
marco
|
e157173c11
|
styling adjustments to codemirror and wrapped polyfill into a function
|
2013-05-15 10:53:54 -04:00 |
|
marco
|
b9fc3f9e07
|
updated styles for input type numbers
|
2013-05-15 00:04:41 -04:00 |
|
marco
|
47a4d6b6a1
|
initial polyfill implementation and metadata number entry javascript validation
|
2013-05-14 23:55:34 -04:00 |
|
marco
|
98e692d15e
|
fixed broken coffee script caused by errant pseudo code I checked in
|
2013-05-14 23:03:33 -04:00 |
|
marco
|
81e95f27db
|
basic tab switching added
|
2013-05-14 22:31:11 -04:00 |
|
David Baumgold
|
1afe556161
|
Merge pull request #2039 from edx/fix-course-updates
Fix "Course Updates" page
|
2013-05-14 16:14:20 -07:00 |
|
Frances Botsford
|
6c119fa3ab
|
refixed extend for text-sr and text-hide
|
2013-05-14 17:17:43 -04:00 |
|
frances botsford
|
24b7defb43
|
removed mixin for text-sr and text-hide, replaced with extend
|
2013-05-14 17:17:42 -04:00 |
|