From c5ead64c2b930e0794031ea999df9dca62bcf0e1 Mon Sep 17 00:00:00 2001
From: ramiAbdou <38056800+ramiAbdou@users.noreply.github.com>
Date: Mon, 25 Feb 2019 23:06:00 -0500
Subject: [PATCH] Made trashcan image black by adding new image and changing
 opacity

* Added cursor pointer abilities to the zoom buttons.
* Blacked out zoom buttons.
* Changed the opacity of the trashcan to make it black.
* Shifted positioning of zoom elements to eliminate small mishaps.
---
 core/css.js            |   6 +++---
 core/trashcan.js       |   2 +-
 core/zoom_controls.js  |   7 +++++--
 media/sprites-copy.png | Bin 0 -> 4146 bytes
 media/sprites.png      | Bin 4146 -> 3660 bytes
 5 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 media/sprites-copy.png

diff --git a/core/css.js b/core/css.js
index cc8715061..cab828df9 100644
--- a/core/css.js
+++ b/core/css.js
@@ -535,15 +535,15 @@ Blockly.Css.CONTENT = [
   '}',
 
   '.blocklyZoom>image {',
-    'opacity: .4;',
+    'opacity: 0.9;',
   '}',
 
   '.blocklyZoom>image:hover {',
-    'opacity: .6;',
+    'opacity: 1;',
   '}',
 
   '.blocklyZoom>image:active {',
-    'opacity: .8;',
+    'opacity: 1;',
   '}',
 
   /* Darken flyout scrollbars due to being on a grey background. */
diff --git a/core/trashcan.js b/core/trashcan.js
index 7373a0b93..2a298cd6b 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -304,7 +304,7 @@ Blockly.Trashcan.prototype.animateLid_ = function() {
       (this.workspace_.RTL ? -lidAngle : lidAngle) + ',' +
       (this.workspace_.RTL ? 4 : this.WIDTH_ - 4) + ',' +
       (this.LID_HEIGHT_ - 2) + ')');
-  var opacity = goog.math.lerp(0.4, 0.8, this.lidOpen_);
+  var opacity = goog.math.lerp(0.9, 1.0, this.lidOpen_);
   this.svgGroup_.style.opacity = opacity;
   if (this.lidOpen_ > 0 && this.lidOpen_ < 1) {
     this.lidTask_ = goog.Timer.callOnce(this.animateLid_, 20, this);
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 0c827b31f..812b9d6e4 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -131,6 +131,7 @@ Blockly.ZoomControls.prototype.createDom = function() {
       this.svgGroup_);
   zoomoutSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href',
       workspace.options.pathToMedia + Blockly.SPRITE.url);
+  zoomoutSvg.setAttribute('class', 'blocklyZoomButton');
 
   var clip = Blockly.utils.createSvgElement('clipPath',
       {'id': 'blocklyZoominClipPath' + rnd},
@@ -142,11 +143,12 @@ Blockly.ZoomControls.prototype.createDom = function() {
       {'width': Blockly.SPRITE.width,
        'height': Blockly.SPRITE.height,
        'x': -32,
-       'y': -49,
+       'y': -49.5,
        'clip-path': 'url(#blocklyZoominClipPath' + rnd + ')'},
       this.svgGroup_);
   zoominSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href',
       workspace.options.pathToMedia + Blockly.SPRITE.url);
+  zoominSvg.setAttribute('class', 'blocklyZoomButton');
 
   var clip = Blockly.utils.createSvgElement('clipPath',
       {'id': 'blocklyZoomresetClipPath' + rnd},
@@ -156,11 +158,12 @@ Blockly.ZoomControls.prototype.createDom = function() {
       clip);
   var zoomresetSvg = Blockly.utils.createSvgElement('image',
       {'width': Blockly.SPRITE.width,
-       'height': Blockly.SPRITE.height, 'y': -92,
+       'height': Blockly.SPRITE.height, 'x': 1, 'y': -93,
        'clip-path': 'url(#blocklyZoomresetClipPath' + rnd + ')'},
       this.svgGroup_);
   zoomresetSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href',
       workspace.options.pathToMedia + Blockly.SPRITE.url);
+  zoomresetSvg.setAttribute('class', 'blocklyZoomButton');
 
   // Attach event listeners.
   Blockly.bindEventWithChecks_(zoomresetSvg, 'mousedown', null, function(e) {
diff --git a/media/sprites-copy.png b/media/sprites-copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f704a5f1ff6b99c6877e40d4d87729bd58bf42f
GIT binary patch
literal 4146
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

literal 0
HcmV?d00001

diff --git a/media/sprites.png b/media/sprites.png
index 7f704a5f1ff6b99c6877e40d4d87729bd58bf42f..c6d39175248167d939d81806d7e4869ef16138ff 100644
GIT binary patch
literal 3660
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

literal 4146
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