Skip to content

Commit

Permalink
use scenery-phet's measuring tape image, #306
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Sep 22, 2017
1 parent a75f6b4 commit f5e5d66
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
8 changes: 0 additions & 8 deletions images/license.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,6 @@
"Copyright 2002-2015 University of Colorado Boulder"
]
},
"measuringTape.png": {
"license": "contact [email protected]",
"notes": "copied from Gravity and Orbits",
"projectURL": "http://phet.colorado.edu",
"text": [
"Copyright 2002-2015 University of Colorado Boulder"
]
},
"mystery-pool-icon.png": {
"license": "contact [email protected]",
"notes": "created by Bryce Gruneich",
Expand Down
Binary file removed images/measuringTape.png
Binary file not shown.
3 changes: 1 addition & 2 deletions js/watertower/view/ToolsControlPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ define( function( require ) {
var rulerString = require( 'string!FLUID_PRESSURE_AND_FLOW/ruler' );

// images
//image
var measuringTapeImg = require( 'image!FLUID_PRESSURE_AND_FLOW/measuringTape.png' );
var measuringTapeImg = require( 'image!SCENERY_PHET/measuringTape.png' );
var nozzleImg = require( 'image!FLUID_PRESSURE_AND_FLOW/nozzle.png' );


Expand Down

0 comments on commit f5e5d66

Please sign in to comment.