From c4fe329985d4c77c752f34847a6acaefb28aa132 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 8 Mar 2015 15:20:28 +0400 Subject: [PATCH] fix +6401 language info icons are on top of breakpoints markers --- plugins/c9.ide.ace/style.less | 3 +++ plugins/c9.ide.layout.classic/less/lesshat.less | 4 ++-- plugins/c9.ide.layout.classic/themes/default-dark-gray.less | 1 + plugins/c9.ide.layout.classic/themes/default-dark.less | 1 + plugins/c9.ide.layout.classic/themes/default-flat-light.less | 1 + plugins/c9.ide.layout.classic/themes/default-light-gray.less | 1 + plugins/c9.ide.layout.classic/themes/default-light.less | 1 + plugins/c9.ide.layout.classic/themes/flat-light.less | 4 ---- 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/c9.ide.ace/style.less b/plugins/c9.ide.ace/style.less index 38f95c62..8d263c67 100644 --- a/plugins/c9.ide.ace/style.less +++ b/plugins/c9.ide.ace/style.less @@ -97,6 +97,9 @@ .image-2x(@ace-warning, 16px, 16px, no-repeat); background-position: 3px 0px; } +.ace_gutter-layer .ace_gutter-cell.ace_info when not (@ace-info = "") { + .image-2x(@ace-info, 16px, 16px, no-repeat); +} .ace_gutter-layer .ace_gutter-cell.ace_breakpoint { .image-2x(@ace-breakpoint, 16px, 16px, no-repeat); background-position: 3px center; diff --git a/plugins/c9.ide.layout.classic/less/lesshat.less b/plugins/c9.ide.layout.classic/less/lesshat.less index 3bc62a16..dba71862 100755 --- a/plugins/c9.ide.layout.classic/less/lesshat.less +++ b/plugins/c9.ide.layout.classic/less/lesshat.less @@ -2268,8 +2268,8 @@ } .image-2x(@image; @width; @height; @repeat: no-repeat; @important: false) { - @filename : ~`/(.*)\.(jpg|jpeg|png|gif)/.exec(@{image})[1]`; - @extension : ~`/(.*)\.(jpg|jpeg|png|gif)/.exec(@{image})[2]`; + @filename : ~`/(.*)\.(jpg|jpeg|png|gif)|$/.exec(@{image})[1] || ""`; + @extension : ~`/(.*)\.(jpg|jpeg|png|gif)|$/.exec(@{image})[2] || ""`; background-image: ~`(function(){ return "url(@{filename}.@{extension})" + ("@{important}" == "true" ? ' !important' : '');})()`; background-repeat: @repeat; 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 b7799839..fade7e71 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less @@ -69,6 +69,7 @@ @ace-status-label-hover-color: @ace-status-color; @ace-status-label-active-color: @ace-status-color; +@ace-info: ""; @ace-error: "@{image-path}/ace_error_light.png"; @ace-warning: "@{image-path}/ace_warning_light.png"; @ace-breakpoint: "@{icon-path}/debugger/brkp_obj.png"; diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less index 78de4079..0b161787 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark.less @@ -69,6 +69,7 @@ @ace-status-label-hover-color: @ace-status-color; @ace-status-label-active-color: @ace-status-color; +@ace-info: ""; @ace-error: "@{image-path}/ace_error_light.png"; @ace-warning: "@{image-path}/ace_warning_light.png"; @ace-breakpoint: "@{icon-path}/debugger/brkp_obj.png"; 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 94f91b0c..66c58b2c 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less @@ -69,6 +69,7 @@ @ace-status-label-hover-color: darken(#333, @darken-chrome); @ace-status-label-active-color: darken(#63acff, @darken-chrome); +@ace-info: "@{theme-image-path}/ace_info_flat_light.png"; @ace-error: "@{image-path}/ace_error_flat_light.png"; @ace-warning: "@{image-path}/ace_warning_flat_light.png"; @ace-breakpoint: "@{theme-icon-path}/debugger/brkp_obj_flat_light.png"; 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 e3accdc7..a4eaba3d 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-light-gray.less @@ -69,6 +69,7 @@ @ace-status-label-hover-color: @ace-status-color; @ace-status-label-active-color: @ace-status-color; +@ace-info: ""; @ace-error: "@{image-path}/ace_error_light.png"; @ace-warning: "@{image-path}/ace_warning_light.png"; @ace-breakpoint: "@{icon-path}/debugger/brkp_obj.png"; diff --git a/plugins/c9.ide.layout.classic/themes/default-light.less b/plugins/c9.ide.layout.classic/themes/default-light.less index 657a8a94..efd55c6d 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-light.less @@ -69,6 +69,7 @@ @ace-status-label-hover-color: @ace-status-color; @ace-status-label-active-color: @ace-status-color; +@ace-info: ""; @ace-error: "@{image-path}/ace_error_light.png"; @ace-warning: "@{image-path}/ace_warning_light.png"; @ace-breakpoint: "@{icon-path}/debugger/brkp_obj.png"; diff --git a/plugins/c9.ide.layout.classic/themes/flat-light.less b/plugins/c9.ide.layout.classic/themes/flat-light.less index 4d9e800e..4608a79a 100644 --- a/plugins/c9.ide.layout.classic/themes/flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/flat-light.less @@ -330,10 +330,6 @@ display: none; } -.ace_gutter-cell.ace_info{ - .image-2x("@{theme-image-path}/ace_info_flat_light.png", 16px, 16px, no-repeat, true); -} - .c9-toolbarbutton-glossy .c9-icon { height: 20px; }