From 7fb568a569cd461b7a744e2063961bf652cc152a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Sun, 11 Mar 2018 10:11:55 +0000
Subject: [PATCH] Elastic: Don't replace already-existing id attribute of a
 nav-tab, small improvements in .file-upload

---
 skins/elastic/styles/widgets/forms.less | 9 +++++++++
 skins/elastic/ui.js                     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 8e31e66c1..4e38a1e2c 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -787,11 +787,20 @@ html.touch .popupmenu.form {
     border-radius: .5rem;
     border: .2rem dashed @color-table-border;
 
+    fieldset & {
+        margin: 0;
+    }
+
     // TODO background image
 
     .upload-form {
         text-align: center;
         padding-bottom: 1em;
+
+        a.btn,
+        button {
+            margin-bottom: .25rem;
+        }
     }
 
    .hint {
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index dcd5189c8..71f931338 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -792,7 +792,7 @@ function rcube_elastic_ui()
             var tabs = [], nav = $('<ul>').attr({'class': 'nav nav-tabs', role: 'tablist'});
 
             $(this).addClass('tab-content').children('fieldset').each(function(i, fieldset) {
-                var tab, id = 'tab' + idx + '-' + i;
+                var tab, id = fieldset.id || ('tab' + idx + '-' + i);
 
                 $(fieldset).addClass('tab-pane').attr({id: id, role: 'tabpanel'});