summaryrefslogtreecommitdiff
path: root/skins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-24 14:19:19 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-24 14:21:10 +0200
commita008a3f0e30bcddf6d9ce4a0015495bf8978c8c2 (patch)
tree9af8765ab05550317133a51061835ba7ac2848b9 /skins
parent454021736845af0f645412b600bbc81bb177d807 (diff)
Fix form buttons (#1488548)
Conflicts: skins/default/settings.css
Diffstat (limited to 'skins')
-rw-r--r--skins/default/settings.css4
-rw-r--r--skins/default/templates/folderedit.html14
-rw-r--r--skins/default/templates/identityedit.html13
-rw-r--r--skins/default/templates/settingsedit.html13
4 files changed, 24 insertions, 20 deletions
diff --git a/skins/default/settings.css b/skins/default/settings.css
index c6d4628f9..24c4382b5 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -134,14 +134,14 @@ body.iframe,
#formfooter .footerleft
{
- padding-left: 15px;
+ padding: 0 2px 10px;
white-space: nowrap;
float: left;
}
#formfooter .footerright
{
- padding-right: 15px;
+ padding: 0 2px 10px;
white-space: nowrap;
text-align: right;
float: right;
diff --git a/skins/default/templates/folderedit.html b/skins/default/templates/folderedit.html
index c5fa2490f..28b9a5507 100644
--- a/skins/default/templates/folderedit.html
+++ b/skins/default/templates/folderedit.html
@@ -11,12 +11,14 @@
<div id="folder-details" class="boxcontent">
<roundcube:object name="folderdetails" />
- <p>
- <roundcube:if condition="!strlen(request:_mbox)" />
- <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
- <roundcube:endif />
- <roundcube:button command="save" type="input" class="button mainaction" label="save" />
- </p>
+ <div id="formfooter">
+ <div class="footerleft">
+ <roundcube:if condition="!strlen(request:_mbox)" />
+ <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
+ <roundcube:endif />
+ <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+ </div>
+ </div>
</div>
<script type="text/javascript">rcube_init_tabs('folder-details > form')</script>
diff --git a/skins/default/templates/identityedit.html b/skins/default/templates/identityedit.html
index 3416f414d..3b33752ca 100644
--- a/skins/default/templates/identityedit.html
+++ b/skins/default/templates/identityedit.html
@@ -18,12 +18,15 @@
<div id="identity-title" class="boxtitle"><roundcube:object name="steptitle" /></div>
<div id="identity-details" class="boxcontent">
-<roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
-<script type="text/javascript">rcube_init_tabs('identity-form')</script>
+ <roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
-<div id="formfooter">
- <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
+ <script type="text/javascript">rcube_init_tabs('identity-form')</script>
+
+ <div id="formfooter">
+ <div class="footerleft">
+ <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+ </div>
+ </div>
</div>
</body>
diff --git a/skins/default/templates/settingsedit.html b/skins/default/templates/settingsedit.html
index ec980a8f0..642eb094e 100644
--- a/skins/default/templates/settingsedit.html
+++ b/skins/default/templates/settingsedit.html
@@ -10,13 +10,12 @@
<div id="prefs-title" class="boxtitle"><roundcube:object name="sectionname" /></div>
<div id="prefs-details" class="boxcontent">
-<roundcube:object name="userprefs" form="form" />
-</div>
-
-<div id="formfooter">
-<div class="footerleft">
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
+ <roundcube:object name="userprefs" form="form" />
+ <div id="formfooter">
+ <div class="footerleft">
+ <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+ </div>
+ </div>
</div>
</body>