From 1e4555fb134678237f6d7e8b6f2d24a2695ab5d5 Mon Sep 17 00:00:00 2001 From: georapbox Date: Sat, 16 May 2015 09:04:33 +0300 Subject: [PATCH] Minor CSS tweak to automatically update the shell's color when on Dark theme. Change toolbar's icon with SVG to be more compatible with Brackets Extension Icon Guidelines. --- README.md | 1 - images/hdy.brackets.shell.toolbar.on.png | Bin 270 -> 0 bytes images/hdy.brackets.shell.toolbar.on.svg | 4 ++++ images/hdy.brackets.shell.toolbar.png | Bin 432 -> 0 bytes images/hdy.brackets.shell.toolbar.svg | 4 ++++ main.js | 8 -------- shellPanel.js | 4 ---- styles/shellPanel.css | 12 ++++++------ 8 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 images/hdy.brackets.shell.toolbar.on.png create mode 100755 images/hdy.brackets.shell.toolbar.on.svg delete mode 100644 images/hdy.brackets.shell.toolbar.png create mode 100755 images/hdy.brackets.shell.toolbar.svg diff --git a/README.md b/README.md index 11cf988..d3a3527 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ Brackets-Shell adds a new icon on the right panel: click on it to toggle the she ##Options Brackets-Shell adds the following options to your brackets.json file: -* `hdy.brackets-shell.dark`: set to true if you are using Bracket's dark theme (defaults to false) * `hdy.brackets-shell.trackProject`: set to true if you want to have the Bracket's shell automatically be set to your project's root directory * `hdy.brackets-shell.shell`: set to the path of your shell (i.e "/bin/sh" or "/bin/bash"). For Windows this should be set to "cmd.exe" diff --git a/images/hdy.brackets.shell.toolbar.on.png b/images/hdy.brackets.shell.toolbar.on.png deleted file mode 100644 index aca012382f0ec8e3026bf49ea1c37f3c80190a83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvi9y zE{-7{-ditkrmC8C;8n-PC*hB<9ZA zAS<}(-SsaO-`s^u3iMX~)$ci{DxoUgqjzwIjJHA9VsC?G7Z0;8w&0tt_JYlKuj}Ri z%(^Q+YXJ4$fAakG%J-*oe< + + + diff --git a/images/hdy.brackets.shell.toolbar.png b/images/hdy.brackets.shell.toolbar.png deleted file mode 100644 index 6116bcd06e19ebe6630ea5cdc84509c3a1015225..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmV;h0Z;ykP)pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00AsXL_t(YOSO&7YQjJig?*}a)kiWJLpJsS>{=lYkX2T79ZTHQ zRdHjg_>-0>g)B@LH3|)`PHzOI!(24#IPh^e-#suD05^q|I$@O>Ji5Wx3+ zG@C7|^6e57;dvg#;VJiXVP(7hOmTSZrYx*1=yn4NAkTk`U^iu8<(_{3ZTCT%E~)aH zQ?T+sS@whNHb>{BLzUkggOz*2aDerCh0!pi%5P4=%7R|+6`Rcp^Z6%Lep3cT+}%IG zbzP*(1aTaZlJDoD2*+`dW#3pVKB&sKOHf3k@kAlJYha~LSb2;z{X!ItFq;iAoxT$x zCX*23@c>B@(?s4&r404@BP`2;sMR2ZfN2UChKXv`fNk3}k@r%$1+3HwD|Nz3ov>0L asQdvUXvYsm< + + + diff --git a/main.js b/main.js index 963b852..4e43f70 100644 --- a/main.js +++ b/main.js @@ -14,14 +14,6 @@ define(function (require, exports, module) { .attr("title", "Shell") .appendTo($("#main-toolbar .buttons")); - - // Default theme if not defined - if(Preferences.get("dark") === undefined) { - Preferences.definePreference("dark", "boolean", false); - Preferences.set("dark", false); - Preferences.save(); - } - // Default projectTracking if not defined if(Preferences.get("trackProject") === undefined) { Preferences.definePreference("trackProject", "boolean", true); diff --git a/shellPanel.js b/shellPanel.js index a76d388..82fdfc6 100644 --- a/shellPanel.js +++ b/shellPanel.js @@ -176,10 +176,6 @@ define(function (require, exports, module) { currentCommandResult.append($("
"));
         }
 
-        if (_preferences.get("dark")) {
-            $("pre", currentCommandResult).addClass('hdy-dark-theme');
-        }
-
         if(ansiFormat.hasAceptedAnsiFormat(data)){
             ansiFormat.formattedText(data, currentCommandResult);
         } else {
diff --git a/styles/shellPanel.css b/styles/shellPanel.css
index 72339f0..f562349 100644
--- a/styles/shellPanel.css
+++ b/styles/shellPanel.css
@@ -15,6 +15,10 @@
     background: transparent;
 }
 
+.dark .hdy-command-result pre {
+    color: #AAAAAA;
+}
+
 .hdy-error {
     color: #ff0000;
     color: rgba(255, 0, 0, 0.6);
@@ -45,15 +49,11 @@ div:focus {
 }
 
 .hdy-shell-icon-off {
-    background: url(../images/hdy.brackets.shell.toolbar.png);
+    background: url(../images/hdy.brackets.shell.toolbar.svg) no-repeat center;
 }
 
 .hdy-shell-icon-on {
-    background: url(../images/hdy.brackets.shell.toolbar.on.png);
-}
-
-.hdy-dark-theme {
-    color:#AAAAAA;
+    background: url(../images/hdy.brackets.shell.toolbar.on.svg) no-repeat center;
 }
 
 .hdy-red {