silverstripe-framework/admin/scss
Damian Mooyman 88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.md
	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
	docs/en/01_Tutorials/03_Forms.md
	docs/en/01_Tutorials/04_Site_Search.md
	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
	docs/en/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
..
themes Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00
_actionTabs.scss FIX: Update references to ID values from 79c9433 2013-05-26 11:11:55 +12:00
_CMSSecurity.scss API Enable re-authentication within the CMS if a user session is lost 2014-10-14 15:19:48 +13:00
_forms.scss Revert "Style destructive actions destructively" 2013-10-24 11:37:40 +02:00
_ieShared.scss Fix for ie8 styles for preview switch and modes 2012-12-17 23:11:05 +01:00
_menu.scss Fix the display of long CMS menu item titles. 2013-09-26 22:24:59 +10:00
_mixins.scss API Full-width HTMLEditorField by default 2013-05-22 16:15:16 +02:00
_ModelAdmin.scss Side-by-side preview options styling. 2012-12-10 17:52:01 +01:00
_preview.scss Preview Background styling 2013-06-04 12:57:09 +12:00
_retina.scss Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00
_SecurityAdmin.scss Permission list styling improvements (#8100) 2012-12-13 16:45:32 +01:00
_sprites.scss Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00
_style.scss MINOR: Fix broken 'Insert From CMS' layout 2014-11-19 10:52:08 +10:30
_tree.scss Dialog icon size 2013-12-21 16:11:06 +13:00
_typography.scss ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, putting each importer into 2012-03-24 13:20:19 +13:00
_uitheme.scss MINOR:added padding to ui-dialog-title so that it doesn't sit flush with the edge of the dialog box 2012-12-18 15:04:14 +13:00
editor.scss Render broken link in HtmlEditorField 2013-08-09 11:51:18 +02:00
ie7.scss BUGFIX: fix for broken layout in insert media dialog - Trac #8232 2013-02-07 21:43:34 +01:00
ie8.scss Side-by-side preview options fixes. 2012-12-10 17:52:01 +01:00
screen.scss Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00