From 4115f792e4a3859043fb04037cff9dd34a4b3b0b Mon Sep 17 00:00:00 2001
From: Sebastian Castro <90scastro@gmail.com>
Date: Thu, 8 Nov 2018 21:55:34 +0100
Subject: [PATCH] ace.js: prioritize the skin style over the plugin style

Preparatory work for introducing colibris skin
---
 src/static/js/ace.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 16689c0a..038ead7c 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -230,7 +230,6 @@ function Ace2Editor()
       // disableCustomScriptsAndStyles can be used to disable loading of custom scripts
       if(!clientVars.disableCustomScriptsAndStyles){
         $$INCLUDE_CSS("../static/css/pad.css");
-        $$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
       }
 
       var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){
@@ -240,6 +239,7 @@ function Ace2Editor()
         return '../static/plugins/' + path;
       });
       includedCSS = includedCSS.concat(additionalCSS);
+      $$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
 
       pushStyleTagsFor(iframeHTML, includedCSS);
 
@@ -314,7 +314,6 @@ window.onload = function () {\n\
       var $$INCLUDE_CSS = function(filename) {includedCSS.push(filename)};
       $$INCLUDE_CSS("../static/css/iframe_editor.css");
       $$INCLUDE_CSS("../static/css/pad.css");
-      $$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
 
 
       var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){
@@ -324,6 +323,7 @@ window.onload = function () {\n\
         return '../static/plugins/' + path }
       );
       includedCSS = includedCSS.concat(additionalCSS);
+      $$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
 
       pushStyleTagsFor(outerHTML, includedCSS);