Ingo Schommer 56f7ce1dcf Merge remote-tracking branch 'origin/3.0' ... Conflicts: control/Cookie.php control/Director.php control/HTTPResponse.php model/Database.php model/MySQLDatabase.php model/SQLQuery.php view/Requirements.php view/SSViewer.php		2012-10-03 16:16:19 +02:00
..
themes	ENHANCEMENT visual enhancements, cms tabs, main menu drop shadow adjusted, actions panel top gradient replaced	2012-05-22 16:06:49 +12:00
_forms.scss	ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen.	2012-09-20 13:25:57 +12:00
_ieShared.scss	Merge branch '7501-grid-field-filters' of https://github.com/adrexia/sapphire into adrexia-7501-grid-field-filters	2012-06-20 14:13:39 +02:00
_menu.scss	BUG: Logo padding in collapsed Menu	2012-07-26 15:41:44 +12:00
_mixins.scss	ENHANCEMENT: Change media insertion to use button and apply design	2012-06-11 10:54:48 +02:00
_ModelAdmin.scss	Merge branch 'integration'	2012-04-11 16:31:12 +02:00
_SecurityAdmin.scss	ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab.	2012-09-28 16:37:35 +02:00
_sprites.scss	MINOR: Made all icons consistently 16x16, and show them inside .ui-widget-content elements.	2012-05-12 18:49:56 +10:00
_style.scss	Merge branch '3.0'	2012-08-28 16:08:57 +12:00
_tree.scss	BUG If a nested page editable but parent not, user can't expand tree	2012-09-28 12:18:34 +12:00
_typography.scss	ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, putting each importer into	2012-03-24 13:20:19 +13:00
_uitheme.scss	ENHANCEMENT: Refactored ToggleCompositeField.	2012-06-13 14:20:27 +10:00
ie7.scss	BUGFIX: Padding in navigation elements in IE7	2012-06-21 11:48:39 +12:00
ie8.scss	BUGFIX:fixed action buttons on edit page content - stopped them from overlapping in ie8.	2012-07-10 16:57:58 +12:00
screen.scss	BUG FIX: Support for gradients in editor in IE9	2012-03-09 15:04:26 +13:00