Commit Graph

616 Commits

Author SHA1 Message Date
marco
67a29ea94a hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div 2013-06-02 12:48:54 -04:00
marco
72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed 2013-05-31 12:40:40 -04:00
marco
c0aef206ae Merge branch 'style/btalbot/metadata-ui' into feature/christina/metadata-ui 2013-05-24 09:49:57 -04:00
Frances Botsford
8b76afb938 converted undo image in component settings list to FontAwesome 2013-05-24 08:51:14 -04:00
Brian Talbot
7940ca54ad studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits. 2013-05-23 13:27:22 -04:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-05-23 11:41:12 -04:00
Brian Talbot
2359c43855 studio - revises z-index/element depth levels for modals, notifications, prompts, and alerts to use universal .depth Sass extends 2013-05-22 15:55:56 -04:00
Brian Talbot
bc6e480103 studio - corrects some errand new icon-based typography rules to use the line-height() mixin 2013-05-22 15:55:55 -04:00
Frances Botsford
fa330784d3 removed symbolset, replaced with fontawesome for gradable status; added transform-origin for saving notification animation to remove wobble 2013-05-22 15:55:55 -04:00
Brian Talbot
bb0460cc0d studio - changes all specific ss-icon-based selectors to use Font Awesome/generic icon- class name in notifications/prompts/alerts Sass 2013-05-22 15:55:55 -04:00
Frances Botsford
4e79d064a0 removed symbolset, replaced with fontawesome for alerts, notifications, and all references in js files 2013-05-22 15:55:55 -04:00
Brian Talbot
0fd3bb6079 studio - removes the .is-fleeting class/animation that is handled by backbone's min/max time for notifications 2013-05-22 15:55:53 -04:00
Frances Botsford
9effdc57b1 removed symbolset, replaced with fontawesome for settings 2013-05-22 15:55:48 -04:00
Frances Botsford
571ebb1fcd removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons 2013-05-22 15:55:48 -04:00
Frances Botsford
88dd9244f3 removed symbolset, replaced with fontawesome for sock and static pages 2013-05-22 15:55:48 -04:00
Frances Botsford
81cb921e32 removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style 2013-05-22 15:55:48 -04:00
Frances Botsford
9a62433797 removed symbolset, replaced with fontawesome for asset upload 2013-05-22 15:55:47 -04:00
Frances Botsford
118a8884b2 removed symbolset, replaced with fontawesome for checklists 2013-05-22 15:55:47 -04:00
Frances Botsford
67df257d40 cleaned up some test styles for fontawesome deployment 2013-05-22 15:55:47 -04:00
Brian Talbot
2be2e2f20d studio - plumbs in Font Awesome icons into header dropdown menus and user nav 2013-05-22 15:55:47 -04:00
Brian Talbot
033826746b studio - adding in perset type sizes for icons (future/general use) 2013-05-22 15:55:47 -04:00
Brian Talbot
45b9155e4b studio - adds in Font Awesome typeface, styling, and Sass import reference 2013-05-22 15:55:46 -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
Brian Talbot
8bbbe992fe studio - references new line-height() Sass mixin when declaring typography archetypes 2013-05-20 15:20:17 -04:00
Brian Talbot
31b5c4ab61 studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet 2013-05-20 15:20:17 -04:00
cahrens
4d7c7f866a Merge branch 'master' into feature/christina/metadata-ui 2013-05-20 15:06:40 -04:00
marco
c0cff81e5e styled firefox number buttons 2013-05-20 14:39:37 -04:00
marco
c356904027 css styles for firefox input number fields 2013-05-20 12:06:30 -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
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
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
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
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
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
marco
56df114edb style changes to component header 2013-05-15 11:41:19 -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