Permalink
Browse files

BUGFIX: Alignment of http label in insert media

  • Loading branch information...
1 parent cffb952 commit 5713a37a32b0484f6f1850fc6b47dae8af431b27 @adrexia adrexia committed with sminnee Jun 22, 2012
Showing with 47 additions and 12 deletions.
  1. +9 −3 admin/css/screen.css
  2. +29 −1 admin/scss/_style.scss
  3. +9 −8 forms/HtmlEditorField.php
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1448,13 +1448,14 @@ body.cms-dialog {
border:none;
@include box-shadow-none;
width:55%;
+ max-width:512px;
float:left;
position: relative;
label {
position: absolute;
left: 8px;
- top: 0px;
+ top: 13px;
font-weight: normal; color: #888;
}
@@ -1467,6 +1468,7 @@ body.cms-dialog {
}
}
button.add-url{
+ margin-top:13px;
padding-top:15px;
@include clearfix;
border:none;
@@ -1577,6 +1579,32 @@ body.cms-dialog {
}
}
+ .ss-uploadfield{
+ &.from-web, &.from-CMS{
+ margin-bottom:48px;
+ .middleColumn {
+ width:auto;
+ background:none;
+ border:none;
+ margin-top:13px;
+ }
+ }
+
+ &.from-CMS{
+ margin-top:33px;
+ h4{
+ margin-top:3px;
+ }
+ .middleColumn {
+ margin-top:0;
+ .TreeDropdownField{
+ margin-top:23px;
+ }
+ }
+ }
+
+ }
+
.ss-uploadfield-editandorganize {
display: none;
}
View
@@ -380,22 +380,23 @@ function MediaForm() {
$numericLabelTmpl = '<span class="step-label"><span class="flyout">%d</span><span class="arrow"></span><strong class="title">%s</strong></span>';
$fromCMS = new CompositeField(
- new LiteralField('headerSelect', '<h4 class="field header-select">' . sprintf($numericLabelTmpl, '1', _t('HtmlEditorField.Find', 'Find')) . '</h4>'),
- $selectComposite = new CompositeField(
- new TreeDropdownField('ParentID', _t('HtmlEditorField.FOLDER', 'Folder'), 'Folder'),
- $fileField
- )
+ new LiteralField('headerSelect', '<h4>' . sprintf($numericLabelTmpl, '1', _t('HtmlEditorField.FindInFolder', 'Find in Folder')) . '</h4>'),
+ $select = new TreeDropdownField('ParentID', "", 'Folder'),
+ $fileField
);
+
+ $fromCMS->addExtraClass('content ss-uploadfield from-CMS');
+ $select->addExtraClass('content-select');
- $fromCMS->addExtraClass('content');
- $selectComposite->addExtraClass('content-select');
$fromWeb = new CompositeField(
- new LiteralField('headerURL', '<h4 class="field header-url">' . sprintf($numericLabelTmpl, '1', _t('HtmlEditorField.ADDURL', 'Add URL')) . '</h4>'),
+ new LiteralField('headerURL', '<h4>' . sprintf($numericLabelTmpl, '1', _t('HtmlEditorField.ADDURL', 'Add URL')) . '</h4>'),
$remoteURL = new TextField('RemoteURL', 'http://'),
new LiteralField('addURLImage', '<button class="action ui-action-constructive ui-button field add-url" data-icon="addMedia"></button>')
);
+
$remoteURL->addExtraClass('remoteurl');
+ $fromWeb->addExtraClass('content ss-uploadfield from-web');
Requirements::css(FRAMEWORK_DIR . '/css/AssetUploadField.css');
$computerUploadField = Object::create('UploadField', 'AssetUploadField', '');

0 comments on commit 5713a37

Please sign in to comment.