From d0b61fc54502da2bab8201c019671c74223749b1 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 7 Nov 2007 06:28:21 +0000 Subject: [PATCH] Fixes to flash popup - removed float which broke other sections git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44458 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- css/TinyMCEImageEnhancement.css | 6 +----- css/cms_right.css | 2 ++ css/layout.css | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/css/TinyMCEImageEnhancement.css b/css/TinyMCEImageEnhancement.css index 2fa14019..58c742d7 100644 --- a/css/TinyMCEImageEnhancement.css +++ b/css/TinyMCEImageEnhancement.css @@ -2,12 +2,8 @@ display: inline; margin-left: 2px; } -.middleColumn -{ +.middleColumn { margin-bottom: 2px; - float: left; -} -.addFolder{ } .link { text-decoration: none; diff --git a/css/cms_right.css b/css/cms_right.css index a30a13ad..6a25dbc4 100644 --- a/css/cms_right.css +++ b/css/cms_right.css @@ -107,10 +107,12 @@ width:120px; } #Form_EditorToolbarImageForm fieldset span, +#Form_EditorToolbarFlashForm fieldset span, #Form_EditorToolbarLinkForm fieldset span { float: left; } #Form_EditorToolbarLinkForm fieldset li span, +#Form_EditorToolbarFlashForm fieldset li span, #Form_EditorToolbarImageForm fieldset li span { float: none; } diff --git a/css/layout.css b/css/layout.css index 71558d98..dd607dfc 100644 --- a/css/layout.css +++ b/css/layout.css @@ -476,6 +476,26 @@ iframe { #Form_EditorToolbarFlashForm #Flash { margin: 5px; } +#Form_EditorToolbarImageForm fieldset label.left, +#Form_EditorToolbarFlashForm fieldset label.left, +#Form_EditorToolbarLinkForm fieldset label.left { + float:left; + margin-left:0px; + color: #000; + line-height: 18px; + font-size: 12px; + width:120px; +} +#Form_EditorToolbarImageForm fieldset span, +#Form_EditorToolbarFlashForm fieldset span, +#Form_EditorToolbarLinkForm fieldset span { + float: left; +} +#Form_EditorToolbarLinkForm fieldset li span, +#Form_EditorToolbarFlashForm fieldset li span, +#Form_EditorToolbarImageForm fieldset li span { + float: none; +} #Form_EditorToolbarImageForm #Image img { border: 2px solid #e4e3e3; }