silverstripe-framework/admin/scss
Damian Mooyman 0b1f297873 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
2014-11-18 12:45:54 +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 fixed RemoteURL css for issue 1086 2014-10-22 14:57:59 +13:00
_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