diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 4fc3560e..417cf8c6 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -814,7 +814,7 @@ JS; * The application name is customisable by calling * LeftAndMain::setApplicationName("Something New") */ - static $application_name = "SilverStripe CMS", $application_logo_text = "SilverStripe CMS"; + static $application_name = "SilverStripe CMS", $application_logo_text = "SilverStripe"; static function setApplicationName($name, $logoText = null) { self::$application_name = $name; self::$application_logo_text = $logoText ? $logoText : $name; diff --git a/css/cms_right.css b/css/cms_right.css index be01f34a..8c852eab 100644 --- a/css/cms_right.css +++ b/css/cms_right.css @@ -38,18 +38,29 @@ font-size: 11px; width: 96%; } -#Form_EditorToolbarImageForm fieldset label.left { +#Form_EditorToolbarImageForm 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_EditorToolbarImageForm fieldset span, +#Form_EditorToolbarLinkForm fieldset span { float: left; + width: 350px; + background: none; } -body div.TreeDropdownField span.items { +#Form_EditorToolbarLinkForm fieldset li span, +#Form_EditorToolbarImageForm fieldset li span { + float: none; +} +#right .TreeDropdownField { width: 300px; + float: left; + background: #fff; font-size: 12px; } .right form textarea, diff --git a/css/layout.css b/css/layout.css index 66a6b79f..d11e3c96 100644 --- a/css/layout.css +++ b/css/layout.css @@ -330,6 +330,7 @@ div.spacer, li.spacer { * than any DOM-elemnt under it. * @see http://www.aplus.co.yu/lab/z-pos/ */ + overflow: hidden; z-index: 1001; } diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss index f135ca2c..8760e8a8 100644 --- a/templates/LeftAndMain.ss +++ b/templates/LeftAndMain.ss @@ -36,7 +36,7 @@