Ingo Schommer 23148b959a Merge pull request #402 from ohararyan/sapphire ... --- http://open.silverstripe.org/ticket/7214 Added watermark to show current state of preview. Removed button styling from Draft and Preview and added styling to show current selected state. Designs signed off by Paul Conflicts: admin/css/screen.css		2012-05-07 13:01:00 +02:00
..
code	ENHANCEMENT Section icons in CMS (#7269)	2012-05-03 13:49:19 +02:00
css	Merge pull request #402 from ohararyan/sapphire	2012-05-07 13:01:00 +02:00
images	Merge pull request #395 from silverstripe-big-o/sapphire	2012-05-03 11:26:12 +02:00
javascript	ENHANCEMENT: Style change to buttons for preview states. Removed open in new window (TRAC-7214)	2012-05-04 13:53:33 +12:00
scss	Merge pull request #402 from ohararyan/sapphire	2012-05-07 13:01:00 +02:00
templates	Merge pull request #402 from ohararyan/sapphire	2012-05-07 13:01:00 +02:00
tests	MINOR Disabled MainMenu caching in LeftAndMain	2012-05-03 14:19:07 +02:00
thirdparty	BUGFIX: 7117 Fixes	2012-05-01 17:14:16 +12:00
_config.php	BUGFIX Fixing reference to moved editor_plugin_src.js in HtmlEditorConfig settings	2012-04-17 11:56:59 +12:00
.gitignore	MINOR Removing executable flag from all files (thanks miiihi)	2011-09-18 22:04:02 +02:00
config.rb	MINOR Removing compass asset_cache_buster functionality, as it wrongly changes the hashes even if files haven't changed, causing merging hassles - leave cache control to the webserver	2011-12-20 17:46:43 +01:00