Closed light-and-salt closed 8 years ago
there are some conflict .. so we can't merge.
@kanitw @domoritz
The merge conflicts are in shelves.html
and shelves.js
, basically the marktype-related lines that I changed. This is because I didn't checkout my zq/markicons
branch from the head of the master branch, which I should. However I cannot run the latest version of Pole*
on the master branch -- the data and the shelves are not showing up (please see screenshot below):
In my Mac terminal, I see a lot of test cases failed after npm start
(please see the log file below):
log.txt
And some errors in my Chrome console:
Could you help me figure out why this is happening? After that I can branch from the head of master
, make the icon changes and send a new pull request. Thanks!
FYI, this Pr might still be useful, but we have to re-do it for vega-lite-ui instead.
Added icons to marktype select using Drop.js.
HTML
<select>
doesn't support icons in its options so I used<div>
tag withng-repeat
to render the marktype options.Initially the
ng-repeat
options were not showing up in the pop up menu. I wrappednew Drop()
inside$timeout
to fix this problem. See this question for details.These are the icons used: point tick I'm not sure what's the difference between tick and point. Is tick "-" a shaped point? bar line area text
Icons for point and tick are custom-made because I couldn't find suitable ones on fontawesome. I put the icon files under "assets/fonts/"