From f9ece5fec1a7ea2af7ace28f7b2cb3c1f71ffaa1 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Dec 2017 16:12:57 +0400 Subject: [PATCH] remove uses of staticPrefix and add validation for image paths --- node_modules/architect-build/build.js | 105 +++++++++++------- plugins/c9.ide.ace.gotoline/skin.xml | 20 ---- plugins/c9.ide.help/skin.xml | 4 +- plugins/c9.ide.imgeditor/style.css | 2 +- .../c9.ide.layout.classic/less/button.less | 3 +- .../c9.ide.layout.classic/less/datagrid.less | 4 +- plugins/c9.ide.layout.classic/less/frame.less | 4 +- .../c9.ide.layout.classic/less/searchbox.less | 2 +- .../themes/default-dark-gray.less | 36 +++--- .../themes/default-dark.less | 36 +++--- .../themes/default-flat-dark.less | 38 +++---- .../themes/default-flat-light.less | 34 +++--- .../themes/default-light-gray.less | 30 ++--- .../themes/default-light.less | 30 ++--- .../themes/flat-dark.less | 2 +- .../themes/flat-light.less | 2 +- plugins/c9.ide.terminal/style.css | 2 +- plugins/c9.ide.test/style.css | 22 ++-- plugins/c9.ide.upload/upload.css | 2 +- plugins/c9.ide.welcome/style.css | 6 +- 20 files changed, 195 insertions(+), 189 deletions(-) diff --git a/node_modules/architect-build/build.js b/node_modules/architect-build/build.js index 2c0dd3ac..99901df1 100644 --- a/node_modules/architect-build/build.js +++ b/node_modules/architect-build/build.js @@ -163,27 +163,32 @@ function compileLess(opts, sources, callback) { cache.less = Object.create(null); if (cache && !cache.images) cache.images = Object.create(null); + + + function expandVariables(code, variables, plugin) { + variables["base-path"] = "/static/" + libs.staticPrefix; + variables["icon-path"] = variables["base-path"] + "/icons"; + variables["image-path"] = variables["base-path"] + "/images"; + variables["plugin-path"] = plugin + ? "/static/" + path.dirname(plugin.packagePath) + : "plugin-path"; + + return code.replace(/@({([\w-]+)}|[\w-]+)/g, function(_, m, m1) { + var name = m1 || m; + return variables[name] || _; + }); + } + + // function var libs = opts.lessLibs; less.forEach(function(file) { - var plugin = file.pkg.parent.plugin || {}; - if (file.pkg.id.match(/(keyframes|font-awesome)\.css$/)) { - cssCode.push(file.code - .replace(/@\{image-path\}/g, plugin.staticPrefix + "/images") - .replace(/@\{icon-path\}/g, plugin.staticPrefix + "/icons") - .replace(/@\{base-path\}/g, plugin.staticPrefix) - ); - return; - } + var plugin = file.pkg.parent.plugin; - var staticPrefix = plugin.staticPrefix || libs.staticPrefix; var id = file.pkg.id.replace(/^[^!]+!/, ""); - // Complete paths, but not subdirectories like foo/images/bar.png - var lessCode = file.code.replace(/(["(])(images|icons)\//g, "$1" + staticPrefix + "/$2/"); code.push( "/* @file " + id + " */\nß{" - + lessPathLib(staticPrefix) - + lessCode + + expandVariables(file.code, Object.create(null), plugin) + "}" ); }); @@ -193,7 +198,7 @@ function compileLess(opts, sources, callback) { filename: opts.basepath + '/unknown.less', compress: !!opts.compress }; - code = lessPathLib("/static/" + libs.staticPrefix) + libs.join("\n") + code.join("\n"); + code = expandVariables(libs.join("\n"), Object.create(null)) + code.join("\n"); var lessParser = require("less"); return lessParser.parse(code, ctx, function(err, tree, imports, options) { @@ -202,36 +207,69 @@ function compileLess(opts, sources, callback) { toCss(tree, imports, options, function(err, css) { if (err) return callback(err); css = css.replace(/ß /g, "").replace(/^ +/gm, "\t"); - css = checkImages(css, cache); + css = checkImages(css, libs, cache); + css = addCssPrefixes(css); callback(null, { code: css }); }); }); } -function checkImages(css, cache) { +function checkImages(css, libs, cache) { var images = cache && cache.images || Object.create(null); var root = __dirname + "/../../"; var t = Date.now(); - css = css.replace(/(url\(['"]?\/static\/)([^"')]+)/g, function(_, prefix, imagePath) { + var file; + var count = 0; + var missingCount = 0; + css = css.replace(/(url\(['"]?)(?:\/static\/)?([^"')]+)|@file (\S+)/g, function(_, prefix, imagePath, fileId) { + if (fileId) { + file = fileId; + return _; + } + if (/^data:|^#/.test(imagePath)) + return _; + count++; + + if (/^(images|icons)/.test(imagePath)) + imagePath = libs.staticPrefix + "/" + imagePath; + var dir = path.dirname(imagePath); var name = path.basename(imagePath); try { if (!images[dir]) images[dir] = fs.readdirSync(root + dir); - } catch(e) { + } catch (e) { images[dir] = []; } - if (images[dir].indexOf(name) != -1) - return prefix + imagePath; - var name1 = name.replace("@1x", ""); - if (images[dir].indexOf(name1) != -1) - return prefix + dir + name1; + var nameNx = name.replace("@1x", ""); + var name1x = nameNx.replace(/\.\w+$/, "@1x$&"); + var name2x = nameNx.replace(/\.\w+$/, "@2x$&"); - console.log("missing image:" + imagePath); - return prefix + undefined + imagePath; + var hasNx = images[dir].indexOf(nameNx) != -1; + var has1x = images[dir].indexOf(name1x) != -1; + var has2x = images[dir].indexOf(name2x) != -1; + + if (hasNx) { + name = nameNx; + } else if (has1x) { + name = name1x; + if (!has2x) + reportError(imagePath + " 2x"); + } + else { + reportError(imagePath); + } + + // todo check image sizes + return prefix + "/static/" + dir + "/" + name; }); - console.log(t- Date.now()); - return css + + function reportError(imagePath) { + missingCount++; + console.log("" + missingCount + " missing image: " + imagePath, "from /" + file); + } + console.log("checked " + count + " images in " + (t - Date.now()) + "ms"); + return css; } function addCssPrefixes(css) { @@ -260,20 +298,9 @@ function toCss(tree, imports, options, callback) { catch (err) { return callback(err); } - css = addCssPrefixes(css); callback(null, css); } -function lessPathLib(staticPrefix) { - if (!staticPrefix) return ""; - - staticPrefix = staticPrefix.replace(/^(\/static\/)?(plugins\/)?/, "/static/plugins/"); - - return "@base-path : \"" + staticPrefix + "\";\n" - + "@image-path : \"" + staticPrefix + "/images\";\n" - + "@icon-path : \"" + staticPrefix + "/icons\";\n"; -} - function stripLess(sources) { var less = []; diff --git a/plugins/c9.ide.ace.gotoline/skin.xml b/plugins/c9.ide.ace.gotoline/skin.xml index 50c6a237..7214d244 100644 --- a/plugins/c9.ide.ace.gotoline/skin.xml +++ b/plugins/c9.ide.ace.gotoline/skin.xml @@ -86,30 +86,10 @@ border: @gotoline-border-dark; border-left: 0; } - .brGtlContent { - } - .barGotoline .brGtlTop { - background: url(images/barGotoLineCorners.png) no-repeat 0 0; - height: 3px; - width: 4px; - position: absolute; - top: -3px; - left:0; - } - .barGotoline .brGtlBottom { - background: url(images/barGotoLineCorners.png) no-repeat 0 -3px; - height: 3px; - width: 4px; - position: absolute; - bottom: -3px; - left:0; - } ]]>
-
-
diff --git a/plugins/c9.ide.help/skin.xml b/plugins/c9.ide.help/skin.xml index 08977e4a..97b0a444 100644 --- a/plugins/c9.ide.help/skin.xml +++ b/plugins/c9.ide.help/skin.xml @@ -15,7 +15,7 @@ .aboutDialogBox .aboutImage { position:relative; color: white; - background: url(images/about_cloud.png) no-repeat 0 0; + background: url(@plugin-path/images/about_cloud.png) no-repeat 0 0; width: 515px; height: 339px; } @@ -29,7 +29,7 @@ .win-help-about .buttons .close { height: 20px; width: 19px; - background: url(images/close.png) no-repeat 4px 3px; + background: url(@plugin-path/images/close.png) no-repeat 4px 3px; } .win-help-about .buttons .close.hover { diff --git a/plugins/c9.ide.imgeditor/style.css b/plugins/c9.ide.imgeditor/style.css index a41bc9af..13ff6dda 100644 --- a/plugins/c9.ide.imgeditor/style.css +++ b/plugins/c9.ide.imgeditor/style.css @@ -42,7 +42,7 @@ } .imgeditor canvas{ - background: url("@{image-path}/background.png"); + background: url("@{plugin-path}/images/background.png"); cursor: crosshair; box-shadow: 0 0 8px rgba(0,0,0,0.5); display: inline-block; diff --git a/plugins/c9.ide.layout.classic/less/button.less b/plugins/c9.ide.layout.classic/less/button.less index 4bab093e..48d5c467 100644 --- a/plugins/c9.ide.layout.classic/less/button.less +++ b/plugins/c9.ide.layout.classic/less/button.less @@ -450,10 +450,9 @@ .submenu .lbl .btnArrow { display : inline-block; - background-image : url("@{image-path}/arrow_small.png"); + background-image : url("@{image-path}/btn-arrow.png"); background-repeat : no-repeat; } - .btn .lbl { margin : 0; diff --git a/plugins/c9.ide.layout.classic/less/datagrid.less b/plugins/c9.ide.layout.classic/less/datagrid.less index 1efbbb10..2b961978 100644 --- a/plugins/c9.ide.layout.classic/less/datagrid.less +++ b/plugins/c9.ide.layout.classic/less/datagrid.less @@ -413,7 +413,7 @@ } .datagrid .loading>.treecell strong{ - background : url("@{image-path}/file-tree-load-spinner.gif") no-repeat 0 0; + .image-2x("@{tree-spinner}", @tree-spinner-width, @tree-spinner-height); width : 16px; height : 16px; top : -2px !important; @@ -422,7 +422,7 @@ margin-right : -3px !important; } .datagrid .loading.selected>.treecell strong{ - background : url("@{image-path}/file-tree-load-spinner-selected.gif") no-repeat 0 0; + .image-2x("@{tree-selected-focus-spinner}", @tree-spinner-width, @tree-spinner-height); } .datagrid .row>span{ vertical-align : top; diff --git a/plugins/c9.ide.layout.classic/less/frame.less b/plugins/c9.ide.layout.classic/less/frame.less index 735fc232..70833dff 100644 --- a/plugins/c9.ide.layout.classic/less/frame.less +++ b/plugins/c9.ide.layout.classic/less/frame.less @@ -59,11 +59,11 @@ position : absolute; right : 5px; top : 4px; - background : url("@{image-path}/@{frame-close-button}") no-repeat 0 -14px; + background : url("@{image-path}/@{frame-close-button}") 0 -14px/42px 28px no-repeat; cursor : pointer; z-index : 10; } - + .frame .buttons div.close:hover { background-position : -14px -14px; } .frame .buttons div.close:active { background-position : -28px -14px; } diff --git a/plugins/c9.ide.layout.classic/less/searchbox.less b/plugins/c9.ide.layout.classic/less/searchbox.less index 461ec5aa..60e51805 100644 --- a/plugins/c9.ide.layout.classic/less/searchbox.less +++ b/plugins/c9.ide.layout.classic/less/searchbox.less @@ -114,7 +114,7 @@ font-smoothing: true; } .searchbox.dark .btnclose{ - background-image: url("@{image-path}/btnclose_flat_light.png"); + .image-2x("@{image-path}/btnclose_flat_light.png", 14px, 28px); } .searchbox.dark .ace-tm .ace_cursor{ color : #919191 !important; diff --git a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less index a92f9b3d..49b067d2 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less @@ -230,8 +230,8 @@ @time-slider-play-border: 3px solid black; @time-slider-play-gradient: linear-gradient(to bottom, rgb(63, 63, 63), rgb(39, 39, 39)); @time-slider-play-box-shadow: 4px 6px 13px 0px rgba(0, 0, 0, 0.65), 0 1px rgba(255, 255, 255, 0.08); -@time-slider-play-icon-image: "@{image-path}/play.png"; -@time-slider-play-icon-pause-image: "@{image-path}/pause.png"; +@time-slider-play-icon-image: "plugins/c9.ide.collab/timeslider/images/play.png"; +@time-slider-play-icon-pause-image: "plugins/c9.ide.collab/timeslider/images/pause.png"; @time-slider-play-icon-image-width: 47px; @time-slider-play-icon-image-height: 47px; @time-slider-play-icon-background-position: -7px -6px; @@ -272,7 +272,7 @@ @time-slider-stepper-top: 20px; @time-slider-stepper-width: 25px; @time-slider-stepper-height: 20px; -@time-slider-stepper-image: "@{image-path}/stepper_buttons.png"; +@time-slider-stepper-image: "plugins/c9.ide.collab/timeslider/images/stepper_buttons.png"; @time-slider-stepper-image-width: 23px; @time-slider-stepper-image-height: 14px; @@ -328,7 +328,7 @@ @time-slider-revert-active-gradient: linear-gradient(to bottom, rgb(43, 43, 43) 0%, rgb(36, 36, 36) 100%); @time-slider-revert-active-padding: 2px 0px 0px 1px; -@time-slider-close-image: "@{image-path}/close_tab_btn.png"; +@time-slider-close-image: "plugins/c9.ide.collab/timeslider/images/close_tab_btn.png"; @time-slider-close-image-width: 42px; @time-slider-close-image-height: 28px; @time-slider-close-idle-position: 0 -14px; @@ -465,7 +465,7 @@ @pane-menu-upward-active-box-shadow: 0 1px lighten(#3d3d3d, @lighten-chrome), inset 0 -1px lighten(#525356, @lighten-chrome); @pane-menu-upward-active-gradient: linear-gradient(to bottom, lighten(#494949, @lighten-chrome) 0%, lighten(#4b4b4c, @lighten-chrome) 100%); -@pane-menu-splits-image: "@{image-path}/splits.png"; +@pane-menu-splits-image: "plugins/c9.ide.behaviors/images/splits.png"; @pane-menu-splits-image-width: 138px; @pane-menu-splits-image-height: 54px; @@ -1094,15 +1094,15 @@ @preview-chooser-font-size: 11px; @preview-chooser-font-weight: bold; -@preview-icon-close: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-close: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-close-width: 23px; @preview-icon-close-height: 280px; @preview-icon-close-position: 0 -66px; -@preview-icon-refresh: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-refresh: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-refresh-width: 23px; @preview-icon-refresh-height: 280px; @preview-icon-refresh-position: 0 -89px;; -@preview-icon-popout: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-popout: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-popout-width: 23px; @preview-icon-popout-height: 280px; @preview-icon-popout-position: 0 -114px; @@ -1110,12 +1110,12 @@ @preview-icon-settings-width: @c9-repeat-x-width; @preview-icon-settings-height: @c9-repeat-x-height; @preview-icon-settings-position: 50% -366px; -@preview-icon-goforward: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goforward: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goforward-width: 23px; @preview-icon-goforward-height: 280px; @preview-icon-goforward-position: 0 -185px; @preview-icon-goforward-disabled-position: 0 -209px; -@preview-icon-goback: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goback: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goback-width: 23px; @preview-icon-goback-height: 280px; @preview-icon-goback-position: 0 -137px; @@ -1387,23 +1387,23 @@ @complete-dark-paramhelp: lighten(#FFFFFF, @lighten-chrome); // Complete Icons -@complete-icon-event: "@{image-path}/event.png"; -@complete-icon-method: "@{image-path}/method.png"; -@complete-icon-method2: "@{image-path}/method2.png"; -@complete-icon-package: "@{image-path}/package.png"; -@complete-icon-property: "@{image-path}/property.png"; -@complete-icon-property2: "@{image-path}/property2.png"; +@complete-icon-event: "plugins/c9.ide.language/images/event.png"; +@complete-icon-method: "plugins/c9.ide.language/images/method.png"; +@complete-icon-method2: "plugins/c9.ide.language/images/method2.png"; +@complete-icon-package: "plugins/c9.ide.language/images/package.png"; +@complete-icon-property: "plugins/c9.ide.language/images/property.png"; +@complete-icon-property2: "plugins/c9.ide.language/images/property2.png"; // Welcome @welcome-color: #333; -@welcome-background: lighten(#193342, @lighten-chrome) url("@{image-path}/welcome-cover.png"); +@welcome-background: lighten(#193342, @lighten-chrome) url("plugins/c9.ide.welcome/images/welcome-cover.png"); @welcome-top-border: lighten(rgba(255,255,255,0.03), @lighten-chrome); @welcome-color: lighten(#f1f1f1, @lighten-chrome); @welcome-font-smoothing: true; @welcome-highlight-color: lighten(#9BB11D, @lighten-chrome); @welcome-panel-border-color: lighten(rgba(255, 255, 255, 0.09), @lighten-chrome); @welcome-panel-background: lighten(rgba(255, 255, 255, 0.08), @lighten-chrome); -@welcome-logo-image: "@{image-path}/welcome-logo.png"; +@welcome-logo-image: "plugins/c9.ide.welcome/images/welcome-logo.png"; @welcome-logo-image-width: 155px; @welcome-logo-image-height: 103px; @welcome-alter-widgets: true; diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less index 651e18f2..810924b8 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark.less @@ -230,8 +230,8 @@ @time-slider-play-border: 3px solid black; @time-slider-play-gradient: linear-gradient(to bottom, rgb(63, 63, 63), rgb(39, 39, 39)); @time-slider-play-box-shadow: 4px 6px 13px 0px rgba(0, 0, 0, 0.65), 0 1px rgba(255, 255, 255, 0.08); -@time-slider-play-icon-image: "@{image-path}/play.png"; -@time-slider-play-icon-pause-image: "@{image-path}/pause.png"; +@time-slider-play-icon-image: "plugins/c9.ide.collab/timeslider/images/play.png"; +@time-slider-play-icon-pause-image: "plugins/c9.ide.collab/timeslider/images/pause.png"; @time-slider-play-icon-image-width: 47px; @time-slider-play-icon-image-height: 47px; @time-slider-play-icon-background-position: -7px -6px; @@ -272,7 +272,7 @@ @time-slider-stepper-top: 20px; @time-slider-stepper-width: 25px; @time-slider-stepper-height: 20px; -@time-slider-stepper-image: "@{image-path}/stepper_buttons.png"; +@time-slider-stepper-image: "plugins/c9.ide.collab/timeslider/images/stepper_buttons.png"; @time-slider-stepper-image-width: 23px; @time-slider-stepper-image-height: 14px; @@ -328,7 +328,7 @@ @time-slider-revert-active-gradient: linear-gradient(to bottom, rgb(43, 43, 43) 0%, rgb(36, 36, 36) 100%); @time-slider-revert-active-padding: 2px 0px 0px 1px; -@time-slider-close-image: "@{image-path}/close_tab_btn.png"; +@time-slider-close-image: "plugins/c9.ide.collab/timeslider/images/close_tab_btn.png"; @time-slider-close-image-width: 42px; @time-slider-close-image-height: 28px; @time-slider-close-idle-position: 0 -14px; @@ -465,7 +465,7 @@ @pane-menu-upward-active-box-shadow: 0 1px lighten(#3d3d3d, @lighten-chrome), inset 0 -1px lighten(#525356, @lighten-chrome); @pane-menu-upward-active-gradient: linear-gradient(to bottom, lighten(#494949, @lighten-chrome) 0%, lighten(#4b4b4c, @lighten-chrome) 100%); -@pane-menu-splits-image: "@{image-path}/splits.png"; +@pane-menu-splits-image: "plugins/c9.ide.behaviors/images/splits.png"; @pane-menu-splits-image-width: 138px; @pane-menu-splits-image-height: 54px; @@ -1094,15 +1094,15 @@ @preview-chooser-font-size: 11px; @preview-chooser-font-weight: bold; -@preview-icon-close: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-close: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-close-width: 23px; @preview-icon-close-height: 280px; @preview-icon-close-position: 0 -66px; -@preview-icon-refresh: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-refresh: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-refresh-width: 23px; @preview-icon-refresh-height: 280px; @preview-icon-refresh-position: 0 -89px;; -@preview-icon-popout: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-popout: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-popout-width: 23px; @preview-icon-popout-height: 280px; @preview-icon-popout-position: 0 -114px; @@ -1110,12 +1110,12 @@ @preview-icon-settings-width: @c9-repeat-x-width; @preview-icon-settings-height: @c9-repeat-x-height; @preview-icon-settings-position: 50% -366px; -@preview-icon-goforward: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goforward: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goforward-width: 23px; @preview-icon-goforward-height: 280px; @preview-icon-goforward-position: 0 -185px; @preview-icon-goforward-disabled-position: 0 -209px; -@preview-icon-goback: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goback: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goback-width: 23px; @preview-icon-goback-height: 280px; @preview-icon-goback-position: 0 -137px; @@ -1387,23 +1387,23 @@ @complete-dark-paramhelp: lighten(#FFFFFF, @lighten-chrome); // Complete Icons -@complete-icon-event: "@{image-path}/event.png"; -@complete-icon-method: "@{image-path}/method.png"; -@complete-icon-method2: "@{image-path}/method2.png"; -@complete-icon-package: "@{image-path}/package.png"; -@complete-icon-property: "@{image-path}/property.png"; -@complete-icon-property2: "@{image-path}/property2.png"; +@complete-icon-event: "plugins/c9.ide.language/images/event.png"; +@complete-icon-method: "plugins/c9.ide.language/images/method.png"; +@complete-icon-method2: "plugins/c9.ide.language/images/method2.png"; +@complete-icon-package: "plugins/c9.ide.language/images/package.png"; +@complete-icon-property: "plugins/c9.ide.language/images/property.png"; +@complete-icon-property2: "plugins/c9.ide.language/images/property2.png"; // Welcome @welcome-color: #333; -@welcome-background: lighten(#193342, @lighten-chrome) url("@{image-path}/welcome-cover.png"); +@welcome-background: lighten(#193342, @lighten-chrome) url("plugins/c9.ide.welcome/images/welcome-cover.png"); @welcome-top-border: lighten(rgba(255,255,255,0.03), @lighten-chrome); @welcome-color: lighten(#f1f1f1, @lighten-chrome); @welcome-font-smoothing: true; @welcome-highlight-color: lighten(#9BB11D, @lighten-chrome); @welcome-panel-border-color: lighten(rgba(255, 255, 255, 0.09), @lighten-chrome); @welcome-panel-background: lighten(rgba(255, 255, 255, 0.08), @lighten-chrome); -@welcome-logo-image: "@{image-path}/welcome-logo.png"; +@welcome-logo-image: "plugins/c9.ide.welcome/images/welcome-logo.png"; @welcome-logo-image-width: 155px; @welcome-logo-image-height: 103px; @welcome-alter-widgets: true; diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less index b9a60c8d..33afc183 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less @@ -230,8 +230,8 @@ @time-slider-play-border: 0; @time-slider-play-gradient: linear-gradient(to bottom, #757574, #757574); @time-slider-play-box-shadow: none; -@time-slider-play-icon-image: "@{image-path}/play_flat_dark.png"; -@time-slider-play-icon-pause-image: "@{image-path}/pause_flat_dark.png"; +@time-slider-play-icon-image: "plugins/c9.ide.collab/timeslider/images/play_flat_dark.png"; +@time-slider-play-icon-pause-image: "plugins/c9.ide.collab/timeslider/images/pause_flat_dark.png"; @time-slider-play-icon-image-width: 5px; @time-slider-play-icon-image-height: 8px; @time-slider-play-icon-background-position: 50% 50%; @@ -272,7 +272,7 @@ @time-slider-stepper-top: 39px; @time-slider-stepper-width: 16px; @time-slider-stepper-height: 16px; -@time-slider-stepper-image: "@{image-path}/stepper_buttons_flat_light.png"; +@time-slider-stepper-image: "plugins/c9.ide.collab/timeslider/images/stepper_buttons_flat_light.png"; @time-slider-stepper-image-width: 21px; @time-slider-stepper-image-height: 8px; @@ -328,7 +328,7 @@ @time-slider-revert-active-gradient: linear-gradient(to bottom, #98c878 0%, #98c878 100%); @time-slider-revert-active-padding: @time-slider-revert-padding; -@time-slider-close-image: "@{image-path}/close_tab_btn_flat_light.png"; +@time-slider-close-image: "plugins/c9.ide.collab/timeslider/images/close_tab_btn_flat_light.png"; @time-slider-close-image-width: 42px; @time-slider-close-image-height: 28px; @time-slider-close-idle-position: 0 0; @@ -465,7 +465,7 @@ @pane-menu-upward-active-box-shadow: 0 1px darken(rgba(255, 255, 255, 0.6), @darken-chrome), inset 0 -1px darken(rgb(255, 255, 255), @darken-chrome); @pane-menu-upward-active-gradient: linear-gradient(to bottom, @menu-background 0%, @menu-background 100%); -@pane-menu-splits-image: "@{image-path}/splits_flat_dark.png"; +@pane-menu-splits-image: "plugins/c9.ide.behaviors/images/splits_flat_dark.png"; @pane-menu-splits-image-width: 138px; @pane-menu-splits-image-height: 53px; @@ -1094,28 +1094,28 @@ @preview-chooser-font-size: 12px; @preview-chooser-font-weight: normal; -@preview-icon-close: "@{image-path}/c9-preview-repeat_flat_dark.png"; +@preview-icon-close: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png"; @preview-icon-close-width: 23px; @preview-icon-close-height: 280px; @preview-icon-close-position: 0 -65px; -@preview-icon-refresh: "@{image-path}/c9-preview-repeat_flat_dark.png"; +@preview-icon-refresh: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png"; @preview-icon-refresh-width: 23px; @preview-icon-refresh-height: 280px; @preview-icon-refresh-position: 0 -88px;; -@preview-icon-popout: "@{image-path}/c9-preview-repeat_flat_dark.png"; +@preview-icon-popout: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png"; @preview-icon-popout-width: 23px; @preview-icon-popout-height: 280px; @preview-icon-popout-position: 0 -113px; -@preview-icon-settings: "@{image-path}/c9-preview-repeat_flat_dark.png"; +@preview-icon-settings: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png"; @preview-icon-settings-width: 23px; @preview-icon-settings-height: 280px; @preview-icon-settings-position: -1px -33px; -@preview-icon-goforward: "@{image-path}/c9-preview-repeat_flat_dark.png"; +@preview-icon-goforward: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png"; @preview-icon-goforward-width: 23px; @preview-icon-goforward-height: 280px; @preview-icon-goforward-position: 0 -184px; @preview-icon-goforward-disabled-position: 0 -209px; -@preview-icon-goback: "@{image-path}/c9-preview-repeat_flat_dark.png"; +@preview-icon-goback: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_dark.png"; @preview-icon-goback-width: 23px; @preview-icon-goback-height: 280px; @preview-icon-goback-position: 0 -136px; @@ -1387,23 +1387,23 @@ @complete-dark-paramhelp: darken(#494949, @darken-chrome); // Complete Icons -@complete-icon-event: "@{image-path}/event_flat_light.png"; -@complete-icon-method: "@{image-path}/method_flat_light.png"; -@complete-icon-method2: "@{image-path}/method2_flat_light.png"; -@complete-icon-package: "@{image-path}/package_flat_light.png"; -@complete-icon-property: "@{image-path}/property_flat_light.png"; -@complete-icon-property2: "@{image-path}/property2_flat_light.png"; +@complete-icon-event: "plugins/c9.ide.language/images/event_flat_light.png"; +@complete-icon-method: "plugins/c9.ide.language/images/method_flat_light.png"; +@complete-icon-method2: "plugins/c9.ide.language/images/method2_flat_light.png"; +@complete-icon-package: "plugins/c9.ide.language/images/package_flat_light.png"; +@complete-icon-property: "plugins/c9.ide.language/images/property_flat_light.png"; +@complete-icon-property2: "plugins/c9.ide.language/images/property2_flat_light.png"; // Welcome @welcome-color: #333; -@welcome-background: darken(#193342, @darken-chrome) url("@{image-path}/welcome-cover.png"); +@welcome-background: darken(#193342, @darken-chrome) url("plugins/c9.ide.welcome/images/welcome-cover.png"); @welcome-top-border: darken(rgba(255,255,255,0.03), @darken-chrome); @welcome-color: darken(#f1f1f1, @darken-chrome); @welcome-font-smoothing: true; @welcome-highlight-color: darken(#9BB11D, @darken-chrome); @welcome-panel-border-color: darken(rgba(255, 255, 255, 0.09), @darken-chrome); @welcome-panel-background: darken(rgba(255, 255, 255, 0.08), @darken-chrome); -@welcome-logo-image: "@{image-path}/welcome-logo.png"; +@welcome-logo-image: "plugins/c9.ide.welcome/images/welcome-logo.png"; @welcome-logo-image-width: 155px; @welcome-logo-image-height: 103px; @welcome-alter-widgets: true; diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less index 64b6e66f..75534499 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less @@ -230,8 +230,8 @@ @time-slider-play-border: 0; @time-slider-play-gradient: linear-gradient(to bottom, #757574, #757574); @time-slider-play-box-shadow: none; -@time-slider-play-icon-image: "@{image-path}/play_flat_light.png"; -@time-slider-play-icon-pause-image: "@{image-path}/pause_flat_light.png"; +@time-slider-play-icon-image: "plugins/c9.ide.collab/timeslider/images/play_flat_light.png"; +@time-slider-play-icon-pause-image: "plugins/c9.ide.collab/timeslider/images/pause_flat_light.png"; @time-slider-play-icon-image-width: 5px; @time-slider-play-icon-image-height: 8px; @time-slider-play-icon-background-position: 50% 50%; @@ -272,7 +272,7 @@ @time-slider-stepper-top: 39px; @time-slider-stepper-width: 16px; @time-slider-stepper-height: 16px; -@time-slider-stepper-image: "@{image-path}/stepper_buttons_flat_light.png"; +@time-slider-stepper-image: "plugins/c9.ide.collab/timeslider/images/stepper_buttons_flat_light.png"; @time-slider-stepper-image-width: 21px; @time-slider-stepper-image-height: 8px; @@ -328,7 +328,7 @@ @time-slider-revert-active-gradient: linear-gradient(to bottom, #98c878 0%, #98c878 100%); @time-slider-revert-active-padding: @time-slider-revert-padding; -@time-slider-close-image: "@{image-path}/close_tab_btn.png"; +@time-slider-close-image: "plugins/c9.ide.collab/timeslider/images/close_tab_btn.png"; @time-slider-close-image-width: 42px; @time-slider-close-image-height: 28px; @time-slider-close-idle-position: 0 0; @@ -465,7 +465,7 @@ @pane-menu-upward-active-box-shadow: 0 1px darken(rgba(255, 255, 255, 0.6), @darken-chrome), inset 0 -1px darken(rgb(255, 255, 255), @darken-chrome); @pane-menu-upward-active-gradient: linear-gradient(to bottom, white 0%, white 100%); -@pane-menu-splits-image: "@{image-path}/splits_flat_light.png"; +@pane-menu-splits-image: "plugins/c9.ide.behaviors/images/splits_flat_light.png"; @pane-menu-splits-image-width: 138px; @pane-menu-splits-image-height: 53px; @@ -1094,28 +1094,28 @@ @preview-chooser-font-size: 12px; @preview-chooser-font-weight: normal; -@preview-icon-close: "@{image-path}/c9-preview-repeat_flat_light.png"; +@preview-icon-close: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png"; @preview-icon-close-width: 23px; @preview-icon-close-height: 280px; @preview-icon-close-position: 0 -65px; -@preview-icon-refresh: "@{image-path}/c9-preview-repeat_flat_light.png"; +@preview-icon-refresh: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png"; @preview-icon-refresh-width: 23px; @preview-icon-refresh-height: 280px; @preview-icon-refresh-position: 0 -88px;; -@preview-icon-popout: "@{image-path}/c9-preview-repeat_flat_light.png"; +@preview-icon-popout: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png"; @preview-icon-popout-width: 23px; @preview-icon-popout-height: 280px; @preview-icon-popout-position: 0 -113px; -@preview-icon-settings: "@{image-path}/c9-preview-repeat_flat_light.png"; +@preview-icon-settings: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png"; @preview-icon-settings-width: 23px; @preview-icon-settings-height: 280px; @preview-icon-settings-position: -1px -33px; -@preview-icon-goforward: "@{image-path}/c9-preview-repeat_flat_light.png"; +@preview-icon-goforward: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png"; @preview-icon-goforward-width: 23px; @preview-icon-goforward-height: 280px; @preview-icon-goforward-position: 0 -184px; @preview-icon-goforward-disabled-position: 0 -209px; -@preview-icon-goback: "@{image-path}/c9-preview-repeat_flat_light.png"; +@preview-icon-goback: "plugins/c9.ide.preview/images/c9-preview-repeat_flat_light.png"; @preview-icon-goback-width: 23px; @preview-icon-goback-height: 280px; @preview-icon-goback-position: 0 -136px; @@ -1387,12 +1387,12 @@ @complete-dark-paramhelp: darken(#FFFFFF, @darken-chrome); // Complete Icons -@complete-icon-event: "@{image-path}/event_flat_light.png"; -@complete-icon-method: "@{image-path}/method_flat_light.png"; -@complete-icon-method2: "@{image-path}/method2_flat_light.png"; -@complete-icon-package: "@{image-path}/package_flat_light.png"; -@complete-icon-property: "@{image-path}/property_flat_light.png"; -@complete-icon-property2: "@{image-path}/property2_flat_light.png"; +@complete-icon-event: "plugins/c9.ide.language/images/event_flat_light.png"; +@complete-icon-method: "plugins/c9.ide.language/images/method_flat_light.png"; +@complete-icon-method2: "plugins/c9.ide.language/images/method2_flat_light.png"; +@complete-icon-package: "plugins/c9.ide.language/images/package_flat_light.png"; +@complete-icon-property: "plugins/c9.ide.language/images/property_flat_light.png"; +@complete-icon-property2: "plugins/c9.ide.language/images/property2_flat_light.png"; // Welcome @welcome-color: #31a6d7; diff --git a/plugins/c9.ide.layout.classic/themes/default-light-gray.less b/plugins/c9.ide.layout.classic/themes/default-light-gray.less index 86d50691..ee67dea6 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-light-gray.less @@ -272,7 +272,7 @@ @time-slider-stepper-top: 20px; @time-slider-stepper-width: 25px; @time-slider-stepper-height: 20px; -@time-slider-stepper-image: "@{image-path}/stepper_buttons.png"; +@time-slider-stepper-image: "plugins/c9.ide.collab/timeslider/images/stepper_buttons.png"; @time-slider-stepper-image-width: 23px; @time-slider-stepper-image-height: 14px; @@ -465,7 +465,7 @@ @pane-menu-upward-active-box-shadow: 0 1px darken(rgba(255, 255, 255, 0.6), @darken-chrome), inset 0 -1px darken(rgb(255, 255, 255), @darken-chrome); @pane-menu-upward-active-gradient: linear-gradient(to bottom, white 0%, white 100%); -@pane-menu-splits-image: "@{image-path}/splits.png"; +@pane-menu-splits-image: "plugins/c9.ide.behaviors/images/splits.png"; @pane-menu-splits-image-width: 138px; @pane-menu-splits-image-height: 54px; @@ -1094,15 +1094,15 @@ @preview-chooser-font-size: 11px; @preview-chooser-font-weight: bold; -@preview-icon-close: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-close: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-close-width: 23px; @preview-icon-close-height: 280px; @preview-icon-close-position: 0 -66px; -@preview-icon-refresh: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-refresh: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-refresh-width: 23px; @preview-icon-refresh-height: 280px; @preview-icon-refresh-position: 0 -89px;; -@preview-icon-popout: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-popout: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-popout-width: 23px; @preview-icon-popout-height: 280px; @preview-icon-popout-position: 0 -114px; @@ -1110,12 +1110,12 @@ @preview-icon-settings-width: @c9-repeat-x-width; @preview-icon-settings-height: @c9-repeat-x-height; @preview-icon-settings-position: 50% -366px; -@preview-icon-goforward: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goforward: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goforward-width: 23px; @preview-icon-goforward-height: 280px; @preview-icon-goforward-position: 0 -185px; @preview-icon-goforward-disabled-position: 0 -209px; -@preview-icon-goback: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goback: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goback-width: 23px; @preview-icon-goback-height: 280px; @preview-icon-goback-position: 0 -137px; @@ -1387,23 +1387,23 @@ @complete-dark-paramhelp: darken(#FFFFFF, @darken-chrome); // Complete Icons -@complete-icon-event: "@{image-path}/event.png"; -@complete-icon-method: "@{image-path}/method.png"; -@complete-icon-method2: "@{image-path}/method2.png"; -@complete-icon-package: "@{image-path}/package.png"; -@complete-icon-property: "@{image-path}/property.png"; -@complete-icon-property2: "@{image-path}/property2.png"; +@complete-icon-event: "plugins/c9.ide.language/images/event.png"; +@complete-icon-method: "plugins/c9.ide.language/images/method.png"; +@complete-icon-method2: "plugins/c9.ide.language/images/method2.png"; +@complete-icon-package: "plugins/c9.ide.language/images/package.png"; +@complete-icon-property: "plugins/c9.ide.language/images/property.png"; +@complete-icon-property2: "plugins/c9.ide.language/images/property2.png"; // Welcome @welcome-color: #333; -@welcome-background: darken(#C1D4E0, @darken-chrome) url("@{image-path}/welcome-cover-light.png"); +@welcome-background: darken(#C1D4E0, @darken-chrome) url("plugins/c9.ide.welcome/images/welcome-cover-light.png"); @welcome-top-border: darken(rgba(0,0,0, 0.06), @darken-chrome); @welcome-color: darken(#333333, @darken-chrome); @welcome-font-smoothing: false; @welcome-highlight-color: @highlight-color; @welcome-panel-border-color: darken(rgba(0, 0, 0, 0.04), @darken-chrome); @welcome-panel-background: darken(rgba(0, 0, 0, 0.03), @darken-chrome); -@welcome-logo-image: "@{image-path}/welcome-logo.png"; +@welcome-logo-image: "plugins/c9.ide.welcome/images/welcome-logo.png"; @welcome-logo-image-width: 155px; @welcome-logo-image-height: 103px; @welcome-alter-widgets: true; diff --git a/plugins/c9.ide.layout.classic/themes/default-light.less b/plugins/c9.ide.layout.classic/themes/default-light.less index fe4a1801..e35b47e0 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-light.less @@ -272,7 +272,7 @@ @time-slider-stepper-top: 20px; @time-slider-stepper-width: 25px; @time-slider-stepper-height: 20px; -@time-slider-stepper-image: "@{image-path}/stepper_buttons.png"; +@time-slider-stepper-image: "plugins/c9.ide.collab/timeslider/images/stepper_buttons.png"; @time-slider-stepper-image-width: 23px; @time-slider-stepper-image-height: 14px; @@ -465,7 +465,7 @@ @pane-menu-upward-active-box-shadow: 0 1px darken(rgba(255, 255, 255, 0.6), @darken-chrome), inset 0 -1px darken(rgb(255, 255, 255), @darken-chrome); @pane-menu-upward-active-gradient: linear-gradient(to bottom, white 0%, white 100%); -@pane-menu-splits-image: "@{image-path}/splits.png"; +@pane-menu-splits-image: "plugins/c9.ide.behaviors/images/splits.png"; @pane-menu-splits-image-width: 138px; @pane-menu-splits-image-height: 54px; @@ -1094,15 +1094,15 @@ @preview-chooser-font-size: 11px; @preview-chooser-font-weight: bold; -@preview-icon-close: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-close: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-close-width: 23px; @preview-icon-close-height: 280px; @preview-icon-close-position: 0 -66px; -@preview-icon-refresh: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-refresh: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-refresh-width: 23px; @preview-icon-refresh-height: 280px; @preview-icon-refresh-position: 0 -89px;; -@preview-icon-popout: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-popout: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-popout-width: 23px; @preview-icon-popout-height: 280px; @preview-icon-popout-position: 0 -114px; @@ -1110,12 +1110,12 @@ @preview-icon-settings-width: @c9-repeat-x-width; @preview-icon-settings-height: @c9-repeat-x-height; @preview-icon-settings-position: 50% -366px; -@preview-icon-goforward: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goforward: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goforward-width: 23px; @preview-icon-goforward-height: 280px; @preview-icon-goforward-position: 0 -185px; @preview-icon-goforward-disabled-position: 0 -209px; -@preview-icon-goback: "@{image-path}/c9-preview-repeat.png"; +@preview-icon-goback: "plugins/c9.ide.preview/images/c9-preview-repeat.png"; @preview-icon-goback-width: 23px; @preview-icon-goback-height: 280px; @preview-icon-goback-position: 0 -137px; @@ -1387,23 +1387,23 @@ @complete-dark-paramhelp: darken(#FFFFFF, @darken-chrome); // Complete Icons -@complete-icon-event: "@{image-path}/event.png"; -@complete-icon-method: "@{image-path}/method.png"; -@complete-icon-method2: "@{image-path}/method2.png"; -@complete-icon-package: "@{image-path}/package.png"; -@complete-icon-property: "@{image-path}/property.png"; -@complete-icon-property2: "@{image-path}/property2.png"; +@complete-icon-event: "plugins/c9.ide.language/images/event.png"; +@complete-icon-method: "plugins/c9.ide.language/images/method.png"; +@complete-icon-method2: "plugins/c9.ide.language/images/method2.png"; +@complete-icon-package: "plugins/c9.ide.language/images/package.png"; +@complete-icon-property: "plugins/c9.ide.language/images/property.png"; +@complete-icon-property2: "plugins/c9.ide.language/images/property2.png"; // Welcome @welcome-color: #333; -@welcome-background: darken(#C1D4E0, @darken-chrome) url("@{image-path}/welcome-cover-light.png"); +@welcome-background: darken(#C1D4E0, @darken-chrome) url("plugins/c9.ide.welcome/images/welcome-cover-light.png"); @welcome-top-border: darken(rgba(0,0,0, 0.06), @darken-chrome); @welcome-color: darken(#333333, @darken-chrome); @welcome-font-smoothing: false; @welcome-highlight-color: @highlight-color; @welcome-panel-border-color: darken(rgba(0, 0, 0, 0.04), @darken-chrome); @welcome-panel-background: darken(rgba(0, 0, 0, 0.03), @darken-chrome); -@welcome-logo-image: "@{image-path}/welcome-logo.png"; +@welcome-logo-image: "plugins/c9.ide.welcome/images/welcome-logo.png"; @welcome-logo-image-width: 155px; @welcome-logo-image-height: 103px; @welcome-alter-widgets: true; diff --git a/plugins/c9.ide.layout.classic/themes/flat-dark.less b/plugins/c9.ide.layout.classic/themes/flat-dark.less index cc216f1c..af152a01 100644 --- a/plugins/c9.ide.layout.classic/themes/flat-dark.less +++ b/plugins/c9.ide.layout.classic/themes/flat-dark.less @@ -102,7 +102,7 @@ } .loading-spinner { - .image-2x("/static/@{pane-button-save-image}", @pane-button-save-image-width, @pane-button-save-image-height); + .image-2x("@{pane-button-save-image}", @pane-button-save-image-width, @pane-button-save-image-height); animation: loading-24-spinner 1.2s steps(24) infinite !important; } diff --git a/plugins/c9.ide.layout.classic/themes/flat-light.less b/plugins/c9.ide.layout.classic/themes/flat-light.less index 244ae508..0dd0e871 100644 --- a/plugins/c9.ide.layout.classic/themes/flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/flat-light.less @@ -389,7 +389,7 @@ } .loading-spinner { - .image-2x("/static/@{pane-button-save-image}", @pane-button-save-image-width, @pane-button-save-image-height); + .image-2x("@{pane-button-save-image}", @pane-button-save-image-width, @pane-button-save-image-height); animation: loading-24-spinner 1.2s steps(24) infinite !important; } diff --git a/plugins/c9.ide.terminal/style.css b/plugins/c9.ide.terminal/style.css index 0441981b..1d5a2c84 100644 --- a/plugins/c9.ide.terminal/style.css +++ b/plugins/c9.ide.terminal/style.css @@ -74,7 +74,7 @@ left: 0; right: 0; bottom: 0; - background: url("@{image-path}/tile.png"); + background: url("@{plugin-path}/images/tile.png"); } .c9terminalcontainer.bottom.cover:after { background-position: 0px -1px; diff --git a/plugins/c9.ide.test/style.css b/plugins/c9.ide.test/style.css index 2123809c..47db6740 100644 --- a/plugins/c9.ide.test/style.css +++ b/plugins/c9.ide.test/style.css @@ -1,19 +1,19 @@ -/* .image-2x("@{icon-path}/@{tree-folder-icon}", @tree-folder-icon-width, @tree-folder-icon-height); */ -.test-in-progress{ .image-2x("@{icon-path}/testInProgress1.png", 16px, 16px); } -.test-notran{ .image-2x("@{icon-path}/testPrepare.png", 16px, 16px); } +/* .image-2x("@{plugin-path}/icons/@{tree-folder-icon}", @tree-folder-icon-width, @tree-folder-icon-height); */ +/*.test-in-progress{ .image-2x("@{plugin-path}/icons/testInProgress1.png", 16px, 16px); }*/ +.test-notran{ .image-2x("@{plugin-path}/icons/testPrepare.png", 16px, 16px); } -.test-failed, .test-0 { .image-2x("@{icon-path}/testFailed.png", 16px, 16px); } -.test-passed, .test-1 { .image-2x("@{icon-path}/testPassed.png", 16px, 16px); } -.test-error, .test-2 { .image-2x("@{icon-path}/testError.png", 16px, 16px); } -.test-terminated, .test-3 { .image-2x("@{icon-path}/testTerminated.png", 16px, 16px); } -.test-ignored, .test-4 { .image-2x("@{icon-path}/testIgnored.png", 16px, 16px); } +.test-failed, .test-0 { .image-2x("@{plugin-path}/icons/testFailed.png", 16px, 16px); } +.test-passed, .test-1 { .image-2x("@{plugin-path}/icons/testPassed.png", 16px, 16px); } +.test-error, .test-2 { .image-2x("@{plugin-path}/icons/testError.png", 16px, 16px); } +.test-terminated, .test-3 { .image-2x("@{plugin-path}/icons/testTerminated.png", 16px, 16px); } +.test-ignored, .test-4 { .image-2x("@{plugin-path}/icons/testIgnored.png", 16px, 16px); } .test-0, .test-2, .test-3, .test-4 { background-position-x: 4px; } .test-1 { background-position-x: 2px; } -.test-prepare { .image-2x("@{icon-path}/testPrepare.png", 16px, 16px); } -.test-set { .image-2x("@{icon-path}/testNotRan.png", 16px, 16px); } -.test-file { .image-2x("@{icon-path}/testPrepare.png", 16px, 16px); } +.test-prepare { .image-2x("@{plugin-path}/icons/testPrepare.png", 16px, 16px); } +.test-set { .image-2x("@{plugin-path}/icons/testNotRan.png", 16px, 16px); } +.test-file { .image-2x("@{plugin-path}/icons/testPrepare.png", 16px, 16px); } .stack-message{ border-radius: 4px; diff --git a/plugins/c9.ide.upload/upload.css b/plugins/c9.ide.upload/upload.css index 6153896c..f89d9016 100644 --- a/plugins/c9.ide.upload/upload.css +++ b/plugins/c9.ide.upload/upload.css @@ -11,7 +11,7 @@ width: 335px; top: 11px; left: 10px; - background: url("@{image-path}/upload-droparea-box.png") no-repeat 0 0; + background: url("@{plugin-path}/images/upload-droparea-box.png") no-repeat 0 0; } .uploadDropArea when(@upload-win-flat = false) { diff --git a/plugins/c9.ide.welcome/style.css b/plugins/c9.ide.welcome/style.css index 3b7bc223..624be3c9 100644 --- a/plugins/c9.ide.welcome/style.css +++ b/plugins/c9.ide.welcome/style.css @@ -269,11 +269,11 @@ } .welcome .preset_container .preset#default{ - background-image : url("@{image-path}/fullide.png"); + background-image : url("@{plugin-path}/images/fullide.png"); } .welcome .preset_container .preset#minimal{ - background-image : url("@{image-path}/minimal.png"); + background-image : url("@{plugin-path}/images/minimal.png"); } .welcome .preset_container .preset#sublime{ - background-image : url("@{image-path}/sublime.png"); + background-image : url("@{plugin-path}/images/sublime.png"); } \ No newline at end of file