Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Icon on FilterTool Button to something filter-y #2156

Merged
merged 3 commits into from
Oct 27, 2017

Conversation

politas
Copy link
Member

@politas politas commented Oct 20, 2017

Replace the magnifying glass with something better (I refuse to accept the funnel = filter idea)
filter
Closes #2009

@HebaruSan
Copy link
Member

I'd like to help review, but there are conflicts now. Can you rebase?

@politas politas force-pushed the fix/2009-filter-icon branch from 09e315a to 59eef26 Compare October 26, 2017 13:21
@politas
Copy link
Member Author

politas commented Oct 26, 2017

Rebased

@HebaruSan
Copy link
Member

Can the old old search.png file be removed? I don't think it's being used anymore.

@politas
Copy link
Member Author

politas commented Oct 27, 2017

Good point

@politas
Copy link
Member Author

politas commented Oct 27, 2017

I'm tempted to leave it in, since it may come in useful in the future, and it's only 1493 bytes.

@HebaruSan
Copy link
Member

I suppose it's not important, and the new icon definitely works fine. I'll take a stab at following the full merge process, including change log updates...

@HebaruSan HebaruSan merged commit 59eef26 into KSP-CKAN:master Oct 27, 2017
@politas
Copy link
Member Author

politas commented Oct 27, 2017

We've been putting "Merge # Blah blah blah" as the comment on the Merge commit, to make the merge commits stand out in the history. Other than that, <3<3<3!!!!

@HebaruSan
Copy link
Member

That's a good idea; I've added it to the wiki's merging notes to help me remember for next time. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants