7 Commits

Author	SHA1	Message	Date
Daniel Hensby	679185514d	Merge 3.3 into 3 ... Conflicts: admin/css/screen.css.map	2016-04-26 00:24:59 +01:00
Jonathon Menz	2923787352	NEW consistent file icons ... File icons have been updated for consistency and a StripThumbnail method added to File for icon display in gridfield instances (such as file selection interface)	2016-03-19 10:36:11 -07:00
divzpatel123@gmail.com	fbc68f433f	Minor: update background colors	2016-01-22 16:32:52 +13:00
Meeeeeeow	4301ae20bf	Changed the link colours	2016-01-19 15:46:29 +13:00
Damian Mooyman	48a30909f3	Merge remote-tracking branch 'origin/3.2' into 3 ... # Conflicts: # admin/javascript/LeftAndMain.BatchActions.js # css/UploadField.css # forms/HtmlEditorField.php	2015-12-22 14:07:52 +13:00
Dan Hensby	64ceba133c	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: admin/css/screen.css	2015-07-20 14:08:36 +00:00
David Craig	e4447698b5	Update compass config ... - Add sourcemaps for debugging - More consistant builds across environments	2015-07-09 10:11:00 +12:00