From 5eb1d87839165446a1a813489e3eec3d3a04b6b8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Sat, 28 Apr 2018 11:42:22 +0000
Subject: [PATCH] Elastic: Simplify skin extending

---
 plugins/libkolab/skins/elastic/include/calendar.less    | 2 +-
 plugins/libkolab/skins/elastic/include/kolab_files.less | 2 +-
 plugins/libkolab/skins/elastic/libkolab.less            | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index 45d3c068..7a31d188 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -1760,7 +1760,7 @@ body.task-calendar {
     padding-top: 36vh;
     max-width: 500px;
     width: 95%;
-    background: url(../../../../skins/elastic/images/watermark.jpg) center -20px no-repeat;
+    background: url("@{skin-path}/images/watermark.jpg") center -20px no-repeat;
     background-size: auto 40%;
 
     .invitebox {
diff --git a/plugins/libkolab/skins/elastic/include/kolab_files.less b/plugins/libkolab/skins/elastic/include/kolab_files.less
index 35b025ed..bd0f4c86 100644
--- a/plugins/libkolab/skins/elastic/include/kolab_files.less
+++ b/plugins/libkolab/skins/elastic/include/kolab_files.less
@@ -413,7 +413,7 @@ a.button.saveas:before {
         height: 48px;
         min-width: 48px;
         overflow: hidden;
-        background: url(../../../../skins/elastic/images/contactpic.png) center center no-repeat #fff;
+        background: url("@{skin-path}/images/contactpic.png") center center no-repeat #fff;
         background-size: cover;
         border-radius: 50%;
         border: solid 3px #eee;
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index e6bb24e7..a767127b 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -21,8 +21,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-@import (reference) "../../../../skins/elastic/styles/variables";
-@import (reference) "../../../../skins/elastic/styles/mixins";
+@skin: "elastic";
+@skin-path: "../../../../skins/@{skin}";
+
+@import (reference) "@{skin-path}/styles/variables";
+@import (reference) "@{skin-path}/styles/mixins";
 
 
 /*** Common folders list extensions ***/