Changeset 1fe450b in github

Timestamp:

Jun 20, 2012 10:12:08 AM (11 months ago)

Author:

Thomas Bruederli <thomas@…>

Branches:

master, HEAD

Children:

6bb44a6

Parents:

dae0b79 (diff), 24baf62 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:roundcube/roundcubemail

Location:

skins/default

Files:

• settings.css (modified) (2 diffs)
• common.css (modified) (1 diff)
• images/icons/groupactions.gif (modified) (previous)
• images/icons/groupactions.png (modified) (previous)
• templates/identities.html (modified) (1 diff)
• templates/identityedit.html (modified) (1 diff)

skins/default/settings.css

@@ -135 +135 @@
 #formfooter .footerleft
 {
-  padding-left: 15px;
+  padding-left: 2px;
   white-space: nowrap;
   float: left;
@@ -142 +142 @@
 #formfooter .footerright
 {
-  padding-right: 15px;
+  padding-right: 2px;
   white-space: nowrap;
   text-align: right;

skins/default/common.css

@@ -369 +369 @@
 {
   background-position: 0 -26px;
+}
+
+.boxfooter a.delgroup {
+  background-position: 0 -49px;
 }
 

skins/default/templates/identities.html

@@ -28 +28 @@
 </div>
 <div class="boxfooter">
-<roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" />
+<roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="buttonPas delgroup" classAct="button delgroup" content=" " condition="config:identities_level:0<2" />
 </div>
 </div>

skins/default/templates/identityedit.html

@@ -23 +23 @@
 
 <div id="formfooter">
-<div class="footerleft">
   <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
 </div>
 </div>